diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__addf_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__addf_1.gds
index 2c5019c..947cab7 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__addf_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__addf_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__addf_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__addf_l.gds
index a21aac5..619ba51 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__addf_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__addf_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__addh_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__addh_1.gds
index 73bc4bf..3bdf530 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__addh_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__addh_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__addh_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__addh_l.gds
index d8ec6cf..641d89d 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__addh_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__addh_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__and2_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__and2_1.gds
index 7dd0618..e357f1b 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__and2_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__and2_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__and2_2.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__and2_2.gds
index eacc6fa..321feab 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__and2_2.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__and2_2.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__and2_4.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__and2_4.gds
index 5e0c991..e188721 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__and2_4.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__and2_4.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__and2_6.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__and2_6.gds
index 1645065..643daaa 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__and2_6.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__and2_6.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__and2_8.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__and2_8.gds
index c3d210d..be02e1b 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__and2_8.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__and2_8.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__and2_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__and2_l.gds
index 80a6bf7..bae25f9 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__and2_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__and2_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__ant.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__ant.gds
index 5795b5b..8a75138 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__ant.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__ant.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__antfill.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__antfill.gds
index a1bf09a..eca203b 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__antfill.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__antfill.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__aoi21_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__aoi21_l.gds
index cf6f3f1..66e61a8 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__aoi21_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__aoi21_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__aoi22_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__aoi22_l.gds
index bd49d2e..b210d9f 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__aoi22_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__aoi22_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__buf_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__buf_1.gds
index 97025eb..cce1eae 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__buf_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__buf_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__buf_2.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__buf_2.gds
index c808023..5feed6f 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__buf_2.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__buf_2.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__buf_4.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__buf_4.gds
index 69c0e7e..ee45120 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__buf_4.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__buf_4.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__buf_6.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__buf_6.gds
index 1b52aa5..eea7463 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__buf_6.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__buf_6.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__buf_8.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__buf_8.gds
index 9bbbdaf..3c69496 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__buf_8.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__buf_8.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__buf_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__buf_l.gds
index d78a302..7a77207 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__buf_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__buf_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__decap_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__decap_1.gds
index 0e8daa5..9b57070 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__decap_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__decap_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__decap_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__decap_l.gds
index c416b53..299b74a 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__decap_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__decap_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__dff_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__dff_1.gds
index 488b4f6..bd78c9b 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__dff_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__dff_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__dff_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__dff_l.gds
index 41898e0..ae01e84 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__dff_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__dff_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__dffr_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__dffr_1.gds
index e948a76..6ca3cfd 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__dffr_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__dffr_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__dffr_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__dffr_l.gds
index 7de1f10..ed9e38f 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__dffr_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__dffr_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__dffs_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__dffs_1.gds
index 8802275..2926a35 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__dffs_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__dffs_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__dffs_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__dffs_l.gds
index 0e52be3..af03074 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__dffs_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__dffs_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__dffsr_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__dffsr_1.gds
index 6ab1565..f5bfb93 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__dffsr_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__dffsr_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__dffsr_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__dffsr_l.gds
index f8cf983..11ea91c 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__dffsr_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__dffsr_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__fill_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__fill_1.gds
index ff35527..d123093 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__fill_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__fill_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__fill_16.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__fill_16.gds
index b86a6b6..cc4d70d 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__fill_16.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__fill_16.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__fill_2.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__fill_2.gds
index ac9ab19..4720690 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__fill_2.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__fill_2.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__fill_32.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__fill_32.gds
index 37cd407..4f44b90 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__fill_32.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__fill_32.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__fill_4.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__fill_4.gds
index b9c66c4..807971c 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__fill_4.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__fill_4.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__fill_8.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__fill_8.gds
index 8d4017c..4267747 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__fill_8.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__fill_8.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__inv_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__inv_1.gds
index 4a7155d..c5f82a0 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__inv_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__inv_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__inv_10.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__inv_10.gds
index 0b15f9d..d8afee5 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__inv_10.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__inv_10.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__inv_2.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__inv_2.gds
index b5be9a5..da04b4d 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__inv_2.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__inv_2.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__inv_3.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__inv_3.gds
index b323b7c..f9b1e4e 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__inv_3.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__inv_3.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__inv_4.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__inv_4.gds
index 1f32922..d9c3919 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__inv_4.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__inv_4.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__inv_6.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__inv_6.gds
index 9f3306d..ff8b78c 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__inv_6.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__inv_6.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__inv_8.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__inv_8.gds
index ba43de8..68cd1af 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__inv_8.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__inv_8.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__inv_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__inv_l.gds
index 09cd77f..39eec48 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__inv_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__inv_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__mux2_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__mux2_1.gds
index e11856b..0951e86 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__mux2_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__mux2_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__nand2_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__nand2_1.gds
index 22f4fc8..12cf16b 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__nand2_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__nand2_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__nand2_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__nand2_l.gds
index 403c0d3..82c5410 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__nand2_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__nand2_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__nor2_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__nor2_1.gds
index d04da3c..51071dd 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__nor2_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__nor2_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__nor2_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__nor2_l.gds
index dd92bb2..8e3ff9a 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__nor2_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__nor2_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__oai21_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__oai21_l.gds
index a015e17..4d86f30 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__oai21_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__oai21_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__oai22_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__oai22_l.gds
index b5e093c..7e4ae9e 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__oai22_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__oai22_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__or2_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__or2_1.gds
index c03f18a..8f03b6f 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__or2_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__or2_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__or2_2.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__or2_2.gds
index e98eff4..cd0e27b 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__or2_2.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__or2_2.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__or2_4.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__or2_4.gds
index f3e4878..7d83db3 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__or2_4.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__or2_4.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__or2_8.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__or2_8.gds
index 354c360..01efc9a 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__or2_8.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__or2_8.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__or2_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__or2_l.gds
index bfdf37b..5959849 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__or2_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__or2_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__tbufi_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__tbufi_1.gds
index 55bb311..442072d 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__tbufi_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__tbufi_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__tbufi_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__tbufi_l.gds
index b704c7b..52c9f53 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__tbufi_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__tbufi_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__tiehi.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__tiehi.gds
index f4c30f7..51b6de6 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__tiehi.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__tiehi.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__tielo.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__tielo.gds
index 2ae81ac..04de9e2 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__tielo.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__tielo.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__tnbufi_1.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__tnbufi_1.gds
index 8c3863c..5aab333 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__tnbufi_1.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__tnbufi_1.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__tnbufi_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__tnbufi_l.gds
index 8630582..a50247b 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__tnbufi_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__tnbufi_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__xnor2_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__xnor2_l.gds
index 1301c9c..0269fae 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__xnor2_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__xnor2_l.gds
Binary files differ
diff --git a/18T_hs/gds/sky130_osu_sc_18T_hs__xor2_l.gds b/18T_hs/gds/sky130_osu_sc_18T_hs__xor2_l.gds
index e43da7d..c61f228 100644
--- a/18T_hs/gds/sky130_osu_sc_18T_hs__xor2_l.gds
+++ b/18T_hs/gds/sky130_osu_sc_18T_hs__xor2_l.gds
Binary files differ
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__addf_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__addf_1.mag
index 6868a3c..5814314 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__addf_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__addf_1.mag
@@ -1,24 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603838866
+timestamp 1606864610
+<< checkpaint >>
+rect -1209 -1243 2569 2575
 << nwell >>
 rect -9 581 1435 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 410 115 440 315
-rect 496 115 526 315
-rect 582 115 612 315
-rect 668 115 698 315
-rect 754 115 784 315
-rect 840 115 870 315
-rect 922 115 952 315
-rect 1004 115 1034 315
-rect 1102 115 1132 315
-rect 1292 115 1322 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
@@ -34,6 +21,21 @@
 rect 1004 617 1034 1217
 rect 1102 617 1132 1217
 rect 1292 617 1322 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
+rect 338 115 368 315
+rect 410 115 440 315
+rect 496 115 526 315
+rect 582 115 612 315
+rect 668 115 698 315
+rect 754 115 784 315
+rect 840 115 870 315
+rect 922 115 952 315
+rect 1004 115 1034 315
+rect 1102 115 1132 315
+rect 1292 115 1322 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -367,18 +369,18 @@
 rect 1265 531 1299 565
 rect 1014 353 1048 387
 << locali >>
-rect 0 1315 1408 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 1003 1315
-rect 1037 1271 1139 1315
-rect 1173 1271 1275 1315
-rect 1309 1271 1408 1315
+rect 0 1311 1408 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 1003 1311
+rect 1037 1271 1139 1311
+rect 1173 1271 1275 1311
+rect 1309 1271 1408 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -482,39 +484,39 @@
 rect 1247 199 1281 215
 rect 1247 61 1281 131
 rect 1333 115 1367 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 1003 61
-rect 1037 17 1139 61
-rect 1173 17 1275 61
-rect 1309 17 1408 61
-rect 0 0 1408 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 1003 61
+rect 1037 21 1139 61
+rect 1173 21 1275 61
+rect 1309 21 1408 61
+rect 0 0 1408 21
 << viali >>
-rect 51 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
-rect 1003 1305 1037 1315
-rect 1003 1281 1037 1305
-rect 1139 1305 1173 1315
-rect 1139 1281 1173 1305
-rect 1275 1305 1309 1315
-rect 1275 1281 1309 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
+rect 1003 1305 1037 1311
+rect 1003 1277 1037 1305
+rect 1139 1305 1173 1311
+rect 1139 1277 1173 1305
+rect 1275 1305 1309 1311
+rect 1275 1277 1309 1305
 rect 80 501 114 535
 rect 248 427 282 461
 rect 80 353 114 387
@@ -530,40 +532,40 @@
 rect 1014 353 1048 387
 rect 1211 279 1245 313
 rect 1333 575 1367 609
-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 1315 1408 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 1003 1315
-rect 1037 1281 1139 1315
-rect 1173 1281 1275 1315
-rect 1309 1281 1408 1315
-rect 0 1271 1408 1281
+rect 0 1311 1408 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 1003 1311
+rect 1037 1277 1139 1311
+rect 1173 1277 1275 1311
+rect 1309 1277 1408 1311
+rect 0 1271 1408 1277
 rect 1131 684 1189 690
 rect 1109 650 1143 684
 rect 1177 650 1189 684
@@ -617,32 +619,32 @@
 rect 281 273 339 279
 rect 765 273 823 279
 rect 1199 273 1257 279
-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 68 44 68 44 1 gnd
 rlabel metal1 97 370 97 370 1 A
 port 1 n
 rlabel metal1 265 444 265 444 1 CI
 port 2 n
 rlabel metal1 129 518 129 518 1 B
 port 3 n
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 1228 296 1228 296 1 CON
 port 4 n
 rlabel metal1 1160 667 1160 667 1 S
 port 5 n
 rlabel metal1 1350 592 1350 592 1 CO
 port 6 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__addf_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__addf_l.mag
index 6ff0d31..264268a 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__addf_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__addf_l.mag
@@ -1,24 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603839028
+timestamp 1606864611
+<< checkpaint >>
+rect -1209 -1243 2569 2575
 << nwell >>
 rect -9 581 1435 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 410 115 440 315
-rect 496 115 526 315
-rect 582 115 612 315
-rect 668 115 698 315
-rect 754 115 784 315
-rect 840 115 870 315
-rect 922 115 952 315
-rect 1004 115 1034 315
-rect 1102 115 1132 263
-rect 1292 115 1322 263
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
@@ -34,6 +21,21 @@
 rect 1004 617 1034 1217
 rect 1102 817 1132 1217
 rect 1292 817 1322 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
+rect 338 115 368 315
+rect 410 115 440 315
+rect 496 115 526 315
+rect 582 115 612 315
+rect 668 115 698 315
+rect 754 115 784 315
+rect 840 115 870 315
+rect 922 115 952 315
+rect 1004 115 1034 315
+rect 1102 115 1132 263
+rect 1292 115 1322 263
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -369,18 +371,18 @@
 rect 1265 531 1299 565
 rect 1014 353 1048 387
 << locali >>
-rect 0 1315 1408 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 1003 1315
-rect 1037 1271 1139 1315
-rect 1173 1271 1275 1315
-rect 1309 1271 1408 1315
+rect 0 1311 1408 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 1003 1311
+rect 1037 1271 1139 1311
+rect 1173 1271 1275 1311
+rect 1309 1271 1408 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -484,39 +486,39 @@
 rect 1247 61 1281 131
 rect 1333 199 1367 575
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
-rect 1003 1305 1037 1315
-rect 1003 1281 1037 1305
-rect 1139 1305 1173 1315
-rect 1139 1281 1173 1305
-rect 1275 1305 1309 1315
-rect 1275 1281 1309 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
+rect 1003 1305 1037 1311
+rect 1003 1277 1037 1305
+rect 1139 1305 1173 1311
+rect 1139 1277 1173 1305
+rect 1275 1305 1309 1311
+rect 1275 1277 1309 1305
 rect 80 501 114 535
 rect 248 427 282 461
 rect 80 353 114 387
@@ -532,40 +534,40 @@
 rect 1014 353 1048 387
 rect 1211 279 1245 313
 rect 1333 575 1367 609
-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 1315 1408 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 1003 1315
-rect 1037 1281 1139 1315
-rect 1173 1281 1275 1315
-rect 1309 1281 1408 1315
-rect 0 1271 1408 1281
+rect 0 1311 1408 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 1003 1311
+rect 1037 1277 1139 1311
+rect 1173 1277 1275 1311
+rect 1309 1277 1408 1311
+rect 0 1271 1408 1277
 rect 1131 690 1189 696
 rect 1109 656 1143 690
 rect 1177 656 1189 690
@@ -619,32 +621,32 @@
 rect 281 273 339 279
 rect 765 273 823 279
 rect 1199 273 1257 279
-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 68 44 68 44 1 gnd
 rlabel metal1 97 370 97 370 1 A
 port 1 n
 rlabel metal1 265 444 265 444 1 CI
 port 2 n
 rlabel metal1 129 518 129 518 1 B
 port 3 n
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 1350 592 1350 592 1 CO
 port 5 n
 rlabel metal1 1160 673 1160 673 1 S
 port 6 n
 rlabel metal1 1228 296 1228 296 1 CON
 port 4 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__addh_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__addh_1.mag
index 0a2088c..382f266 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__addh_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__addh_1.mag
@@ -1,17 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861324
+timestamp 1606864611
+<< checkpaint >>
+rect -1209 -1243 2025 2575
 << nwell >>
 rect -9 581 837 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 178 115 208 315
-rect 250 115 280 315
-rect 442 115 472 315
-rect 540 115 570 315
-rect 626 115 656 315
-rect 712 115 742 315
 << pmos >>
 rect 80 617 110 1217
 rect 178 617 208 1217
@@ -20,6 +14,14 @@
 rect 552 617 582 1217
 rect 638 617 668 1217
 rect 710 617 740 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 178 115 208 315
+rect 250 115 280 315
+rect 442 115 472 315
+rect 540 115 570 315
+rect 626 115 656 315
+rect 712 115 742 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -210,14 +212,14 @@
 rect 624 427 658 461
 rect 348 374 382 408
 << locali >>
-rect 0 1315 836 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 836 1315
+rect 0 1311 836 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 836 1311
 rect 35 1201 69 1217
 rect 35 623 69 649
 rect 133 1201 167 1271
@@ -272,27 +274,27 @@
 rect 753 267 787 283
 rect 615 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
 rect 35 657 69 683
 rect 35 649 69 657
 rect 260 501 294 535
@@ -304,28 +306,28 @@
 rect 624 427 658 461
 rect 507 353 541 387
 rect 667 353 701 387
-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 1315 836 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 836 1315
-rect 0 1271 836 1281
+rect 0 1311 836 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 836 1311
+rect 0 1271 836 1277
 rect 23 683 81 689
 rect 23 649 35 683
 rect 69 649 81 683
@@ -366,18 +368,16 @@
 rect 23 278 35 312
 rect 69 278 81 312
 rect 23 272 81 278
-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 viali 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 50 477 50 477 1 S
 port 1 n
 rlabel metal1 737 518 737 518 1 A
@@ -388,4 +388,6 @@
 port 4 n
 rlabel metal1 684 370 684 370 1 CON
 port 5 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__addh_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__addh_l.mag
index fe914fd..09bd484 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__addh_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__addh_l.mag
@@ -1,17 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861428
+timestamp 1606864611
+<< checkpaint >>
+rect -1209 -1243 2025 2575
 << nwell >>
 rect -9 581 837 1341
-<< nmoslvt >>
-rect 80 115 110 243
-rect 178 115 208 315
-rect 250 115 280 315
-rect 442 115 472 243
-rect 540 115 570 315
-rect 626 115 656 315
-rect 712 115 742 315
 << pmos >>
 rect 80 887 110 1217
 rect 178 617 208 1217
@@ -20,6 +14,14 @@
 rect 552 617 582 1217
 rect 638 617 668 1217
 rect 710 617 740 1217
+<< nmoslvt >>
+rect 80 115 110 243
+rect 178 115 208 315
+rect 250 115 280 315
+rect 442 115 472 243
+rect 540 115 570 315
+rect 626 115 656 315
+rect 712 115 742 315
 << ndiff >>
 rect 125 267 178 315
 rect 125 243 133 267
@@ -214,14 +216,14 @@
 rect 624 427 658 461
 rect 348 374 382 408
 << locali >>
-rect 0 1315 836 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 836 1315
+rect 0 1311 836 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 836 1311
 rect 35 1201 69 1217
 rect 35 683 69 929
 rect 133 1201 167 1271
@@ -276,27 +278,27 @@
 rect 753 267 787 283
 rect 615 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
 rect 35 649 69 683
 rect 260 501 294 535
 rect 164 427 198 461
@@ -307,28 +309,28 @@
 rect 624 427 658 461
 rect 507 353 541 387
 rect 667 353 701 387
-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 1315 836 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 836 1315
-rect 0 1271 836 1281
+rect 0 1311 836 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 836 1311
+rect 0 1271 836 1277
 rect 23 683 81 689
 rect 23 649 35 683
 rect 69 649 81 683
@@ -369,17 +371,16 @@
 rect 23 278 35 312
 rect 69 278 81 312
 rect 23 272 81 278
-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 viali 68 1288 68 1288 1 vdd
 rlabel metal1 50 477 50 477 1 S
 port 1 n
 rlabel metal1 737 518 737 518 1 A
@@ -390,5 +391,6 @@
 port 4 n
 rlabel metal1 684 370 684 370 1 CON
 port 5 n
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__and2_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__and2_1.mag
index 6f8948d..efba011 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__and2_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__and2_1.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861476
+timestamp 1606864611
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
 rect 252 617 282 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 152 115 182 315
+rect 252 115 282 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -101,10 +103,10 @@
 rect 173 468 207 502
 rect 269 370 303 404
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -127,29 +129,29 @@
 rect 193 61 227 131
 rect 293 267 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 37 649 71 683
 rect 173 575 207 609
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 105 683
@@ -167,18 +169,18 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 55 666 55 666 1 A
 port 2 n
 rlabel metal1 191 592 191 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__and2_2.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__and2_2.mag
index 6a27835..c05171d 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__and2_2.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__and2_2.mag
@@ -1,19 +1,21 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861504
+timestamp 1606864611
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 462 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 338 115 368 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
 rect 252 617 282 1217
 rect 338 617 368 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 152 115 182 315
+rect 252 115 282 315
+rect 338 115 368 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -124,11 +126,11 @@
 rect 173 468 207 502
 rect 269 370 303 404
 << locali >>
-rect 0 1315 462 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 462 1315
+rect 0 1311 462 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 462 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -155,35 +157,35 @@
 rect 293 115 327 131
 rect 379 267 413 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 37 649 71 683
 rect 173 575 207 609
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 462 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 462 1315
-rect 0 1271 462 1281
+rect 0 1311 462 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 462 1311
+rect 0 1271 462 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 105 683
@@ -201,19 +203,19 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 191 592 191 592 1 B
 port 1 n
 rlabel metal1 55 666 55 666 1 A
 port 2 n
 rlabel metal1 311 444 311 444 1 Y
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__and2_4.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__and2_4.mag
index 9466cf4..893fdce 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__and2_4.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__and2_4.mag
@@ -1,16 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861536
+timestamp 1606864612
+<< checkpaint >>
+rect -1209 -1243 1753 2575
 << nwell >>
 rect -9 581 638 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
@@ -18,6 +13,13 @@
 rect 338 617 368 1217
 rect 424 617 454 1217
 rect 510 617 540 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 152 115 182 315
+rect 252 115 282 315
+rect 338 115 368 315
+rect 424 115 454 315
+rect 510 115 540 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -162,12 +164,12 @@
 rect 173 468 207 502
 rect 269 370 303 404
 << locali >>
-rect 0 1315 638 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 638 1315
+rect 0 1311 638 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 638 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -202,43 +204,43 @@
 rect 465 115 499 131
 rect 551 267 585 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 37 649 71 683
 rect 173 575 207 609
 rect 293 501 327 535
 rect 465 501 499 535
 rect 293 279 327 313
 rect 465 279 499 313
-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 1315 638 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 638 1315
-rect 0 1271 638 1281
+rect 0 1311 638 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 638 1311
+rect 0 1271 638 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 105 683
@@ -263,20 +265,20 @@
 rect 499 279 511 313
 rect 281 273 339 279
 rect 453 273 511 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 55 666 55 666 1 A
 port 2 n
 rlabel metal1 191 592 191 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__and2_6.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__and2_6.mag
index 79c58b1..1f235e9 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__and2_6.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__and2_6.mag
@@ -2,17 +2,10 @@
 tech sky130A
 magscale 1 2
 timestamp 1600380937
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 581 814 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
@@ -22,6 +15,15 @@
 rect 510 617 540 1217
 rect 596 617 626 1217
 rect 682 617 712 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 152 115 182 315
+rect 252 115 282 315
+rect 338 115 368 315
+rect 424 115 454 315
+rect 510 115 540 315
+rect 596 115 626 315
+rect 682 115 712 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__and2_8.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__and2_8.mag
index d73df53..a2c19d0 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__and2_8.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__and2_8.mag
@@ -1,20 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861577
+timestamp 1606864612
+<< checkpaint >>
+rect -1209 -1243 2161 2575
 << nwell >>
 rect -9 581 990 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-rect 768 115 798 315
-rect 854 115 884 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
@@ -26,6 +17,17 @@
 rect 682 617 712 1217
 rect 768 617 798 1217
 rect 854 617 884 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 152 115 182 315
+rect 252 115 282 315
+rect 338 115 368 315
+rect 424 115 454 315
+rect 510 115 540 315
+rect 596 115 626 315
+rect 682 115 712 315
+rect 768 115 798 315
+rect 854 115 884 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -245,15 +247,15 @@
 rect 173 468 207 502
 rect 269 370 303 404
 << locali >>
-rect 0 1315 990 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 990 1315
+rect 0 1311 990 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 990 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -304,30 +306,30 @@
 rect 809 115 843 131
 rect 895 267 929 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
 rect 37 649 71 683
 rect 173 575 207 609
 rect 293 501 327 535
@@ -338,31 +340,31 @@
 rect 465 279 499 313
 rect 637 279 671 313
 rect 809 279 843 313
-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 1315 990 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 990 1315
-rect 0 1271 990 1281
+rect 0 1311 990 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 990 1311
+rect 0 1271 990 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 105 683
@@ -402,23 +404,23 @@
 rect 453 273 511 279
 rect 625 273 683 279
 rect 797 273 855 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 191 592 191 592 1 B
 port 1 n
 rlabel metal1 55 666 55 666 1 A
 port 2 n
 rlabel metal1 311 444 311 444 1 Y
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__and2_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__and2_l.mag
index 45f7f51..8bff734 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__and2_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__and2_l.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603992067
+timestamp 1606864612
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
 << pmos >>
 rect 80 817 110 1217
 rect 166 817 196 1217
 rect 252 817 282 1217
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 252 115 282 263
 << ndiff >>
 rect 27 199 80 263
 rect 27 131 35 199
@@ -101,10 +103,10 @@
 rect 173 468 207 502
 rect 269 370 303 404
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1271
 rect 121 1201 155 1217
 rect 35 845 69 861
@@ -127,29 +129,29 @@
 rect 193 61 227 131
 rect 293 199 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 37 649 71 683
 rect 173 575 207 609
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 105 683
@@ -167,18 +169,18 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 55 666 55 666 1 A
 port 2 n
 rlabel metal1 191 592 191 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__ant.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__ant.mag
index f6afce8..ba7b69c 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__ant.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__ant.mag
@@ -1,13 +1,15 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861735
+timestamp 1606864612
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
-<< nmoslvt >>
-rect 80 115 110 315
 << pmos >>
 rect 80 617 110 1217
+<< nmoslvt >>
+rect 80 115 110 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -54,9 +56,9 @@
 << polycont >>
 rect 47 501 81 535
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1217
 rect 35 535 69 657
 rect 121 1201 155 1271
@@ -69,31 +71,31 @@
 rect 35 115 69 131
 rect 121 267 155 383
 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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 47 501 81 535
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 35 535 108 541
 rect 35 501 47 535
 rect 81 501 108 535
 rect 35 495 108 501
-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 metal1 64 518 64 518 1 A
 port 1 n
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__antfill.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__antfill.mag
index 2fd23c4..71b8c4a 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__antfill.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__antfill.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861660
+timestamp 1606864612
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << psubdiff >>
@@ -15,9 +17,9 @@
 << nsubdiffcont >>
 rect 51 1271 85 1305
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 535 69 1217
 rect 121 641 155 1271
 rect 31 501 47 535
@@ -26,31 +28,31 @@
 rect 35 383 155 417
 rect 35 115 69 383
 rect 121 115 155 383
-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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 47 501 81 535
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 35 535 108 541
 rect 35 501 47 535
 rect 81 501 108 535
 rect 35 495 108 501
-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 metal1 64 518 64 518 1 A
 port 1 n
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__aoi21_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__aoi21_l.mag
index 7963848..79d615d 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__aoi21_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__aoi21_l.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861837
+timestamp 1606864613
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 250 115 280 263
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
 rect 252 617 282 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 152 115 182 315
+rect 250 115 280 263
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -104,10 +106,10 @@
 rect 146 434 180 468
 rect 289 355 323 389
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 845 155 861
@@ -131,30 +133,30 @@
 rect 193 115 227 131
 rect 291 199 325 215
 rect 291 61 325 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 60 649 94 683
 rect 128 575 162 609
 rect 216 501 250 535
 rect 293 427 327 461
 rect 193 279 227 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 48 683 106 689
 rect 48 649 60 683
 rect 94 649 128 683
@@ -176,14 +178,12 @@
 rect 181 279 193 313
 rect 227 279 327 313
 rect 181 273 239 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 77 666 77 666 1 A0
 port 1 n
 rlabel metal1 233 518 233 518 1 B0
@@ -192,4 +192,6 @@
 port 3 n
 rlabel metal1 145 592 145 592 1 A1
 port 4 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__aoi22_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__aoi22_l.mag
index 4e478d4..127d3a7 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__aoi22_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__aoi22_l.mag
@@ -1,19 +1,21 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603913306
+timestamp 1606864613
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 462 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 324 115 354 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
 rect 252 617 282 1217
 rect 338 617 368 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 152 115 182 315
+rect 252 115 282 315
+rect 324 115 354 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -126,11 +128,11 @@
 rect 234 363 268 397
 rect 370 428 404 462
 << locali >>
-rect 0 1315 462 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 462 1315
+rect 0 1311 462 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 462 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 845 155 861
@@ -159,37 +161,37 @@
 rect 200 115 234 131
 rect 365 267 399 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 60 649 94 683
 rect 128 575 162 609
 rect 216 501 250 535
 rect 370 428 404 462
 rect 302 353 336 387
 rect 200 279 234 313
-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 1315 462 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 462 1315
-rect 0 1271 462 1281
+rect 0 1311 462 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 462 1311
+rect 0 1271 462 1277
 rect 48 683 106 689
 rect 48 649 60 683
 rect 94 649 128 683
@@ -215,14 +217,13 @@
 rect 188 279 200 313
 rect 234 279 338 313
 rect 188 273 246 279
-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 77 666 77 666 1 A0
 port 1 n
 rlabel metal1 233 518 233 518 1 B0
@@ -232,5 +233,6 @@
 rlabel viali 387 445 387 445 1 B1
 rlabel metal1 321 340 321 340 1 Y
 port 3 n
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__buf_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__buf_1.mag
index 78cde4a..58f8f46 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__buf_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__buf_1.mag
@@ -1,15 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861870
+timestamp 1606864613
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 288 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -83,10 +85,10 @@
 rect 110 479 144 513
 rect 176 370 210 404
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -104,28 +106,28 @@
 rect 121 61 155 131
 rect 207 267 241 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 110 649 144 683
 rect 207 575 241 609
 rect 207 279 241 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 98 683 156 689
 rect 64 649 110 683
 rect 144 649 156 683
@@ -139,16 +141,16 @@
 rect 195 279 207 313
 rect 241 279 253 313
 rect 195 273 253 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 127 666 127 666 1 A
 port 1 n
 rlabel metal1 213 455 213 455 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__buf_2.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__buf_2.mag
index f3845c8..d10e4e5 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__buf_2.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__buf_2.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861892
+timestamp 1606864613
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 376 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
 rect 252 617 282 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -100,10 +102,10 @@
 rect 110 479 144 513
 rect 176 370 210 404
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -125,28 +127,28 @@
 rect 207 115 241 131
 rect 293 267 327 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 110 649 144 683
 rect 207 575 241 609
 rect 207 279 241 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 98 683 156 689
 rect 64 649 110 683
 rect 144 649 156 683
@@ -160,16 +162,16 @@
 rect 195 279 207 313
 rect 241 279 253 313
 rect 195 273 253 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 127 666 127 666 1 A
 port 1 n
 rlabel metal1 211 454 211 454 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__buf_4.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__buf_4.mag
index 1219ba2..32f9e32 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__buf_4.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__buf_4.mag
@@ -1,21 +1,23 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861950
+timestamp 1606864613
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 552 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
 rect 252 617 282 1217
 rect 338 617 368 1217
 rect 424 617 454 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
+rect 338 115 368 315
+rect 424 115 454 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -138,11 +140,11 @@
 rect 110 479 144 513
 rect 176 370 210 404
 << locali >>
-rect 0 1315 550 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 550 1315
+rect 0 1311 550 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 550 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -174,36 +176,36 @@
 rect 379 115 413 131
 rect 465 267 499 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 110 649 144 683
 rect 207 575 241 609
 rect 379 575 413 609
 rect 207 279 241 313
 rect 379 279 413 313
-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 1315 550 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 550 1315
-rect 0 1271 550 1281
+rect 0 1311 550 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 550 1311
+rect 0 1271 550 1277
 rect 98 683 156 689
 rect 64 649 110 683
 rect 144 649 156 683
@@ -224,17 +226,17 @@
 rect 413 279 425 313
 rect 195 273 253 279
 rect 367 273 425 279
-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 metal1 127 666 127 666 1 A
 port 1 n
 rlabel metal1 211 454 211 454 1 Y
 port 2 n
-rlabel viali 68 1288 68 1288 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__buf_6.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__buf_6.mag
index 8e7b5d9..c815e16 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__buf_6.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__buf_6.mag
@@ -2,16 +2,10 @@
 tech sky130A
 magscale 1 2
 timestamp 1598479240
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 581 728 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
@@ -20,6 +14,14 @@
 rect 424 617 454 1217
 rect 510 617 540 1217
 rect 596 617 626 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
+rect 338 115 368 315
+rect 424 115 454 315
+rect 510 115 540 315
+rect 596 115 626 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__buf_8.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__buf_8.mag
index 1133d8e..19dba7a 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__buf_8.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__buf_8.mag
@@ -1,19 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862056
+timestamp 1606864614
+<< checkpaint >>
+rect -1209 -1243 2025 2575
 << nwell >>
 rect -9 581 904 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-rect 768 115 798 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
@@ -24,6 +16,16 @@
 rect 596 617 626 1217
 rect 682 617 712 1217
 rect 768 617 798 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
+rect 338 115 368 315
+rect 424 115 454 315
+rect 510 115 540 315
+rect 596 115 626 315
+rect 682 115 712 315
+rect 768 115 798 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -221,14 +223,14 @@
 rect 110 479 144 513
 rect 176 370 210 404
 << locali >>
-rect 0 1315 902 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 902 1315
+rect 0 1311 902 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 902 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -274,27 +276,27 @@
 rect 723 115 757 131
 rect 809 267 843 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
 rect 110 649 144 683
 rect 207 575 241 609
 rect 379 575 413 609
@@ -304,28 +306,28 @@
 rect 379 279 413 313
 rect 551 279 585 313
 rect 723 279 757 313
-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 1315 902 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 902 1315
-rect 0 1271 902 1281
+rect 0 1311 902 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 902 1311
+rect 0 1271 902 1277
 rect 98 683 156 689
 rect 64 649 110 683
 rect 144 649 156 683
@@ -360,20 +362,20 @@
 rect 367 273 425 279
 rect 539 273 597 279
 rect 711 273 769 279
-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 metal1 127 666 127 666 1 A
 port 1 n
 rlabel metal1 211 454 211 454 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__buf_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__buf_l.mag
index 35a6dfd..d60668a 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__buf_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__buf_l.mag
@@ -1,15 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862077
+timestamp 1606864614
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 288 1341
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
 << pmos >>
 rect 80 817 110 1217
 rect 166 817 196 1217
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
 << ndiff >>
 rect 27 199 80 263
 rect 27 131 35 199
@@ -83,10 +85,10 @@
 rect 110 479 144 513
 rect 176 370 210 404
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1217
 rect 35 404 69 861
 rect 121 1201 155 1271
@@ -104,28 +106,28 @@
 rect 121 61 155 131
 rect 207 199 241 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 110 649 144 683
 rect 207 575 241 609
 rect 207 279 241 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 98 683 156 689
 rect 64 649 110 683
 rect 144 649 156 683
@@ -139,16 +141,16 @@
 rect 195 279 207 313
 rect 241 279 253 313
 rect 195 273 253 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 127 666 127 666 1 A
 port 1 n
 rlabel metal1 214 452 214 452 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__decap_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__decap_1.mag
index e163b95..b4bc94b 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__decap_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__decap_1.mag
@@ -1,13 +1,15 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862105
+timestamp 1606864614
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
-<< nmoslvt >>
-rect 80 115 110 451
 << pmos >>
 rect 80 817 110 1217
+<< nmoslvt >>
+rect 80 115 110 451
 << ndiff >>
 rect 27 403 80 451
 rect 27 131 35 403
@@ -47,9 +49,9 @@
 rect 80 451 110 817
 rect 80 80 110 115
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 845 69 861
 rect 121 1201 155 1271
@@ -58,24 +60,24 @@
 rect 35 61 69 131
 rect 121 403 155 419
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
+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 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__decap_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__decap_l.mag
index 01be96f..bd3a274 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__decap_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__decap_l.mag
@@ -1,13 +1,15 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862119
+timestamp 1606864614
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
-<< nmoslvt >>
-rect 80 115 110 315
 << pmos >>
 rect 80 1017 110 1217
+<< nmoslvt >>
+rect 80 115 110 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -47,9 +49,9 @@
 rect 80 315 110 1017
 rect 80 80 110 115
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 1049 69 1065
 rect 121 1201 155 1271
@@ -58,24 +60,24 @@
 rect 35 61 69 131
 rect 121 267 155 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
+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 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__dff_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__dff_1.mag
index 2bcd480..9a3b896 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__dff_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__dff_1.mag
@@ -1,23 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862204
+timestamp 1606864614
+<< checkpaint >>
+rect -1209 -1243 2569 2575
 << nwell >>
 rect -9 581 1456 1341
-<< nmoslvt >>
-rect 85 115 115 315
-rect 171 115 201 315
-rect 243 115 273 315
-rect 363 115 393 315
-rect 435 115 465 315
-rect 521 115 551 315
-rect 593 115 623 315
-rect 713 115 743 315
-rect 785 115 815 315
-rect 871 115 901 315
-rect 1061 115 1091 315
-rect 1251 115 1281 315
-rect 1337 115 1367 315
 << pmos >>
 rect 85 617 115 1217
 rect 171 617 201 1217
@@ -32,6 +20,20 @@
 rect 1061 617 1091 1217
 rect 1251 617 1281 1217
 rect 1337 617 1367 1217
+<< nmoslvt >>
+rect 85 115 115 315
+rect 171 115 201 315
+rect 243 115 273 315
+rect 363 115 393 315
+rect 435 115 465 315
+rect 521 115 551 315
+rect 593 115 623 315
+rect 713 115 743 315
+rect 785 115 815 315
+rect 871 115 901 315
+rect 1061 115 1091 315
+rect 1251 115 1281 315
+rect 1337 115 1367 315
 << ndiff >>
 rect 32 267 85 315
 rect 32 131 40 267
@@ -366,18 +368,18 @@
 rect 1323 462 1357 496
 rect 1018 353 1052 387
 << locali >>
-rect 0 1315 1452 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 1003 1315
-rect 1037 1271 1139 1315
-rect 1173 1271 1275 1315
-rect 1309 1271 1452 1315
+rect 0 1311 1452 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 1003 1311
+rect 1037 1271 1139 1311
+rect 1173 1271 1275 1311
+rect 1309 1271 1452 1311
 rect 40 1201 74 1217
 rect 17 657 40 669
 rect 126 1201 160 1271
@@ -481,39 +483,39 @@
 rect 1292 61 1326 131
 rect 1378 267 1412 286
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
-rect 1003 1305 1037 1315
-rect 1003 1281 1037 1305
-rect 1139 1305 1173 1315
-rect 1139 1281 1173 1305
-rect 1275 1305 1309 1315
-rect 1275 1281 1309 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
+rect 1003 1305 1037 1311
+rect 1003 1277 1037 1305
+rect 1139 1305 1173 1311
+rect 1139 1277 1173 1305
+rect 1275 1305 1309 1311
+rect 1275 1277 1309 1305
 rect 40 353 74 387
 rect 253 501 287 535
 rect 181 427 215 461
@@ -528,40 +530,40 @@
 rect 1206 575 1240 609
 rect 1226 421 1260 455
 rect 1018 353 1052 387
-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 1315 1452 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 1003 1315
-rect 1037 1281 1139 1315
-rect 1173 1281 1275 1315
-rect 1309 1281 1452 1315
-rect 0 1271 1452 1281
+rect 0 1311 1452 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 1003 1311
+rect 1037 1277 1139 1311
+rect 1173 1277 1275 1311
+rect 1309 1277 1452 1311
+rect 0 1271 1452 1277
 rect 1366 683 1424 689
 rect 1343 649 1378 683
 rect 1412 649 1424 683
@@ -605,22 +607,20 @@
 rect 1052 353 1064 387
 rect 523 347 581 353
 rect 1006 347 1064 353
-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 68 45 68 45 1 gnd
-rlabel viali 68 1289 68 1289 1 vdd
 rlabel metal1 198 444 198 444 1 D
 port 1 n
 rlabel metal1 915 518 915 518 1 CK
@@ -629,4 +629,6 @@
 port 4 n
 rlabel metal1 1224 592 1224 592 1 QN
 port 2 n
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 1285 68 1285 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__dff_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__dff_l.mag
index 0da9682..fbbbcbd 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__dff_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__dff_l.mag
@@ -1,23 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862260
+timestamp 1606864615
+<< checkpaint >>
+rect -1209 -1243 2569 2575
 << nwell >>
 rect -9 581 1456 1341
-<< nmoslvt >>
-rect 85 115 115 315
-rect 171 115 201 315
-rect 243 115 273 315
-rect 363 115 393 315
-rect 435 115 465 315
-rect 521 115 551 315
-rect 593 115 623 315
-rect 713 115 743 315
-rect 785 115 815 315
-rect 871 115 901 315
-rect 1061 115 1091 315
-rect 1251 115 1281 263
-rect 1337 115 1367 263
 << pmos >>
 rect 85 617 115 1217
 rect 171 617 201 1217
@@ -32,6 +20,20 @@
 rect 1061 617 1091 1217
 rect 1251 817 1281 1217
 rect 1337 817 1367 1217
+<< nmoslvt >>
+rect 85 115 115 315
+rect 171 115 201 315
+rect 243 115 273 315
+rect 363 115 393 315
+rect 435 115 465 315
+rect 521 115 551 315
+rect 593 115 623 315
+rect 713 115 743 315
+rect 785 115 815 315
+rect 871 115 901 315
+rect 1061 115 1091 315
+rect 1251 115 1281 263
+rect 1337 115 1367 263
 << ndiff >>
 rect 32 267 85 315
 rect 32 131 40 267
@@ -366,18 +368,18 @@
 rect 1323 462 1357 496
 rect 1018 353 1052 387
 << locali >>
-rect 0 1315 1452 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 1003 1315
-rect 1037 1271 1139 1315
-rect 1173 1271 1275 1315
-rect 1309 1271 1452 1315
+rect 0 1311 1452 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 1003 1311
+rect 1037 1271 1139 1311
+rect 1173 1271 1275 1311
+rect 1309 1271 1452 1311
 rect 40 1201 74 1217
 rect 17 657 40 669
 rect 126 1201 160 1271
@@ -483,39 +485,39 @@
 rect 1292 61 1326 131
 rect 1378 199 1412 286
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
-rect 1003 1305 1037 1315
-rect 1003 1281 1037 1305
-rect 1139 1305 1173 1315
-rect 1139 1281 1173 1305
-rect 1275 1305 1309 1315
-rect 1275 1281 1309 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
+rect 1003 1305 1037 1311
+rect 1003 1277 1037 1305
+rect 1139 1305 1173 1311
+rect 1139 1277 1173 1305
+rect 1275 1305 1309 1311
+rect 1275 1277 1309 1305
 rect 40 353 74 387
 rect 253 501 287 535
 rect 181 427 215 461
@@ -529,40 +531,40 @@
 rect 1206 575 1240 609
 rect 1226 421 1260 455
 rect 1018 353 1052 387
-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 1315 1452 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 1003 1315
-rect 1037 1281 1139 1315
-rect 1173 1281 1275 1315
-rect 1309 1281 1452 1315
-rect 0 1271 1452 1281
+rect 0 1311 1452 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 1003 1311
+rect 1037 1277 1139 1311
+rect 1173 1277 1275 1311
+rect 1309 1277 1452 1311
+rect 0 1271 1452 1277
 rect 1365 683 1423 689
 rect 1343 649 1377 683
 rect 1411 649 1423 683
@@ -606,22 +608,20 @@
 rect 1052 353 1064 387
 rect 523 347 581 353
 rect 1006 347 1064 353
-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 68 45 68 45 1 gnd
-rlabel viali 68 1289 68 1289 1 vdd
 rlabel metal1 198 444 198 444 1 D
 port 1 n
 rlabel metal1 1394 666 1394 666 1 Q
@@ -630,4 +630,6 @@
 port 3 n
 rlabel metal1 915 518 915 518 1 CK
 port 4 n
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 1285 68 1285 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__dffr_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__dffr_1.mag
index 55b07c1..872c2ae 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__dffr_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__dffr_1.mag
@@ -1,26 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862408
+timestamp 1606864615
+<< checkpaint >>
+rect -1210 -1243 3112 2575
 << nwell >>
 rect -10 581 1917 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 270 115 300 263
-rect 356 115 386 263
-rect 546 115 576 315
-rect 618 115 648 315
-rect 738 115 768 315
-rect 810 115 840 315
-rect 896 115 926 315
-rect 968 115 998 315
-rect 1088 115 1118 315
-rect 1160 115 1190 315
-rect 1246 115 1276 315
-rect 1436 115 1466 263
-rect 1522 115 1552 263
-rect 1712 115 1742 315
-rect 1798 115 1828 315
 << pmos >>
 rect 80 617 110 1217
 rect 270 817 300 1217
@@ -38,6 +23,23 @@
 rect 1508 817 1538 1217
 rect 1712 617 1742 1217
 rect 1798 617 1828 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 270 115 300 263
+rect 356 115 386 263
+rect 546 115 576 315
+rect 618 115 648 315
+rect 738 115 768 315
+rect 810 115 840 315
+rect 896 115 926 315
+rect 968 115 998 315
+rect 1088 115 1118 315
+rect 1160 115 1190 315
+rect 1246 115 1276 315
+rect 1436 115 1466 263
+rect 1522 115 1552 263
+rect 1712 115 1742 315
+rect 1798 115 1828 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -465,22 +467,22 @@
 rect 1784 462 1818 496
 rect 1545 301 1579 335
 << locali >>
-rect 0 1315 1914 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1682 1315
-rect 1716 1271 1818 1315
-rect 1852 1271 1914 1315
+rect 0 1311 1914 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1682 1311
+rect 1716 1271 1818 1311
+rect 1852 1271 1914 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -609,51 +611,51 @@
 rect 1753 61 1787 131
 rect 1839 199 1873 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
-rect 1682 1305 1716 1315
-rect 1682 1281 1716 1305
-rect 1818 1305 1852 1315
-rect 1818 1281 1852 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
+rect 1682 1305 1716 1311
+rect 1682 1277 1716 1305
+rect 1818 1305 1852 1311
+rect 1818 1277 1852 1305
 rect 47 649 81 683
 rect 311 353 345 387
 rect 229 301 263 313
@@ -672,52 +674,52 @@
 rect 1409 353 1443 387
 rect 1545 301 1579 313
 rect 1545 279 1579 301
-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 1315 1914 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1682 1315
-rect 1716 1281 1818 1315
-rect 1852 1281 1914 1315
-rect 0 1271 1914 1281
+rect 0 1311 1914 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1682 1311
+rect 1716 1277 1818 1311
+rect 1852 1277 1914 1311
+rect 0 1271 1914 1277
 rect 35 683 93 689
 rect 1826 683 1884 689
 rect 35 649 47 683
@@ -772,30 +774,26 @@
 rect 1579 279 1591 313
 rect 217 273 275 279
 rect 1533 273 1591 279
-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 metal1 65 666 65 666 1 RN
 port 1 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1288 67 1288 1 vdd
-rlabel viali 67 1288 67 1288 1 vdd
 rlabel metal1 573 444 573 444 1 D
 port 2 n
 rlabel metal1 1290 518 1290 518 1 CK
@@ -804,4 +802,6 @@
 port 4 n
 rlabel metal1 1685 592 1685 592 1 QN
 port 5 n
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__dffr_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__dffr_l.mag
index 52071e4..0cd69ad 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__dffr_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__dffr_l.mag
@@ -1,26 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862567
+timestamp 1606864615
+<< checkpaint >>
+rect -1210 -1243 3112 2575
 << nwell >>
 rect -10 581 1917 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 270 115 300 263
-rect 356 115 386 263
-rect 546 115 576 315
-rect 618 115 648 315
-rect 738 115 768 315
-rect 810 115 840 315
-rect 896 115 926 315
-rect 968 115 998 315
-rect 1088 115 1118 315
-rect 1160 115 1190 315
-rect 1246 115 1276 315
-rect 1436 115 1466 263
-rect 1522 115 1552 263
-rect 1712 115 1742 263
-rect 1798 115 1828 263
 << pmos >>
 rect 80 617 110 1217
 rect 270 817 300 1217
@@ -38,6 +23,23 @@
 rect 1508 817 1538 1217
 rect 1712 817 1742 1217
 rect 1798 817 1828 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 270 115 300 263
+rect 356 115 386 263
+rect 546 115 576 315
+rect 618 115 648 315
+rect 738 115 768 315
+rect 810 115 840 315
+rect 896 115 926 315
+rect 968 115 998 315
+rect 1088 115 1118 315
+rect 1160 115 1190 315
+rect 1246 115 1276 315
+rect 1436 115 1466 263
+rect 1522 115 1552 263
+rect 1712 115 1742 263
+rect 1798 115 1828 263
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -465,22 +467,22 @@
 rect 1784 462 1818 496
 rect 1545 301 1579 335
 << locali >>
-rect 0 1315 1914 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1682 1315
-rect 1716 1271 1818 1315
-rect 1852 1271 1914 1315
+rect 0 1311 1914 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1682 1311
+rect 1716 1271 1818 1311
+rect 1852 1271 1914 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -609,51 +611,51 @@
 rect 1753 61 1787 131
 rect 1839 199 1873 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
-rect 1682 1305 1716 1315
-rect 1682 1281 1716 1305
-rect 1818 1305 1852 1315
-rect 1818 1281 1852 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
+rect 1682 1305 1716 1311
+rect 1682 1277 1716 1305
+rect 1818 1305 1852 1311
+rect 1818 1277 1852 1305
 rect 47 649 81 683
 rect 311 353 345 387
 rect 229 301 263 313
@@ -672,52 +674,52 @@
 rect 1409 353 1443 387
 rect 1545 301 1579 313
 rect 1545 279 1579 301
-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 1315 1914 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1682 1315
-rect 1716 1281 1818 1315
-rect 1852 1281 1914 1315
-rect 0 1271 1914 1281
+rect 0 1311 1914 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1682 1311
+rect 1716 1277 1818 1311
+rect 1852 1277 1914 1311
+rect 0 1271 1914 1277
 rect 35 683 93 689
 rect 1826 683 1884 689
 rect 35 649 47 683
@@ -772,30 +774,26 @@
 rect 1579 279 1591 313
 rect 217 273 275 279
 rect 1533 273 1591 279
-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 metal1 65 666 65 666 1 RN
 port 1 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1288 67 1288 1 vdd
-rlabel viali 67 1288 67 1288 1 vdd
 rlabel metal1 573 444 573 444 1 D
 port 2 n
 rlabel metal1 1290 518 1290 518 1 CK
@@ -804,4 +802,6 @@
 port 4 n
 rlabel metal1 1685 592 1685 592 1 QN
 port 5 n
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__dffs_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__dffs_1.mag
index e5f68d6..971eec1 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__dffs_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__dffs_1.mag
@@ -1,25 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862672
+timestamp 1606864615
+<< checkpaint >>
+rect -1210 -1243 2840 2575
 << nwell >>
 rect -10 581 1741 1341
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 356 115 386 315
-rect 428 115 458 315
-rect 548 115 578 315
-rect 620 115 650 315
-rect 706 115 736 315
-rect 778 115 808 315
-rect 898 115 928 315
-rect 970 115 1000 315
-rect 1056 115 1086 315
-rect 1246 115 1276 263
-rect 1318 115 1348 263
-rect 1522 115 1552 315
-rect 1608 115 1638 315
 << pmos >>
 rect 80 817 110 1217
 rect 166 817 196 1217
@@ -36,6 +22,22 @@
 rect 1332 817 1362 1217
 rect 1522 617 1552 1217
 rect 1608 617 1638 1217
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 356 115 386 315
+rect 428 115 458 315
+rect 548 115 578 315
+rect 620 115 650 315
+rect 706 115 736 315
+rect 778 115 808 315
+rect 898 115 928 315
+rect 970 115 1000 315
+rect 1056 115 1086 315
+rect 1246 115 1276 263
+rect 1318 115 1348 263
+rect 1522 115 1552 315
+rect 1608 115 1638 315
 << ndiff >>
 rect 303 267 356 315
 rect 27 199 80 263
@@ -420,20 +422,20 @@
 rect 1594 462 1628 496
 rect 1355 301 1389 335
 << locali >>
-rect 0 1315 1738 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1738 1315
+rect 0 1311 1738 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1738 1311
 rect 35 1201 69 1271
 rect 35 913 69 929
 rect 121 1201 155 1217
@@ -544,45 +546,45 @@
 rect 1563 61 1597 131
 rect 1649 199 1683 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
 rect 47 279 81 313
 rect 121 353 155 387
 rect 438 501 472 535
@@ -599,46 +601,46 @@
 rect 1203 353 1237 387
 rect 1355 301 1389 313
 rect 1355 279 1389 301
-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 1315 1738 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1738 1315
-rect 0 1271 1738 1281
+rect 0 1311 1738 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1738 1311
+rect 0 1271 1738 1277
 rect 1636 683 1694 689
 rect 1614 649 1648 683
 rect 1682 649 1694 683
@@ -689,24 +691,22 @@
 rect 1389 279 1401 313
 rect 35 273 93 279
 rect 1343 273 1401 279
-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 67 44 67 44 1 gnd
-rlabel viali 67 1288 67 1288 1 vdd
 rlabel viali 383 444 383 444 1 D
 port 1 n
 rlabel viali 1100 518 1100 518 1 CK
@@ -716,4 +716,6 @@
 rlabel viali 1495 592 1495 592 1 QN
 port 3 n
 rlabel viali 64 296 64 296 1 SN
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__dffs_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__dffs_l.mag
index 705ee0c..2c8e524 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__dffs_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__dffs_l.mag
@@ -1,25 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862745
+timestamp 1606864615
+<< checkpaint >>
+rect -1210 -1243 2840 2575
 << nwell >>
 rect -10 581 1741 1341
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 356 115 386 315
-rect 428 115 458 315
-rect 548 115 578 315
-rect 620 115 650 315
-rect 706 115 736 315
-rect 778 115 808 315
-rect 898 115 928 315
-rect 970 115 1000 315
-rect 1056 115 1086 315
-rect 1246 115 1276 263
-rect 1318 115 1348 263
-rect 1522 115 1552 263
-rect 1608 115 1638 263
 << pmos >>
 rect 80 817 110 1217
 rect 166 817 196 1217
@@ -36,6 +22,22 @@
 rect 1332 817 1362 1217
 rect 1522 817 1552 1217
 rect 1608 817 1638 1217
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 356 115 386 315
+rect 428 115 458 315
+rect 548 115 578 315
+rect 620 115 650 315
+rect 706 115 736 315
+rect 778 115 808 315
+rect 898 115 928 315
+rect 970 115 1000 315
+rect 1056 115 1086 315
+rect 1246 115 1276 263
+rect 1318 115 1348 263
+rect 1522 115 1552 263
+rect 1608 115 1638 263
 << ndiff >>
 rect 303 267 356 315
 rect 27 199 80 263
@@ -420,20 +422,20 @@
 rect 1594 462 1628 496
 rect 1355 301 1389 335
 << locali >>
-rect 0 1315 1738 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1738 1315
+rect 0 1311 1738 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1738 1311
 rect 35 1201 69 1271
 rect 35 913 69 929
 rect 121 1201 155 1217
@@ -544,45 +546,45 @@
 rect 1563 61 1597 131
 rect 1649 199 1683 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
 rect 47 279 81 313
 rect 121 353 155 387
 rect 438 501 472 535
@@ -599,46 +601,46 @@
 rect 1203 353 1237 387
 rect 1355 301 1389 313
 rect 1355 279 1389 301
-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 1315 1738 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1738 1315
-rect 0 1271 1738 1281
+rect 0 1311 1738 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1738 1311
+rect 0 1271 1738 1277
 rect 1636 683 1694 689
 rect 1614 649 1648 683
 rect 1682 649 1694 683
@@ -689,24 +691,22 @@
 rect 1389 279 1401 313
 rect 35 273 93 279
 rect 1343 273 1401 279
-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 67 44 67 44 1 gnd
-rlabel viali 67 1288 67 1288 1 vdd
 rlabel viali 383 444 383 444 1 D
 port 1 n
 rlabel viali 1100 518 1100 518 1 CK
@@ -716,4 +716,6 @@
 rlabel viali 1495 592 1495 592 1 QN
 port 3 n
 rlabel viali 64 296 64 296 1 SN
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__dffsr_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__dffsr_1.mag
index 649500b..01fca41 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__dffsr_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__dffsr_1.mag
@@ -1,28 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863488
+timestamp 1606864616
+<< checkpaint >>
+rect -1210 -1243 3248 2575
 << nwell >>
 rect -10 581 2090 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 272 115 302 263
-rect 370 115 400 315
-rect 442 115 472 315
-rect 632 115 662 315
-rect 704 115 734 315
-rect 824 115 854 315
-rect 896 115 926 315
-rect 982 115 1012 315
-rect 1054 115 1084 315
-rect 1174 115 1204 315
-rect 1246 115 1276 315
-rect 1332 115 1362 315
-rect 1522 115 1552 315
-rect 1594 115 1624 315
-rect 1692 115 1722 263
-rect 1884 115 1914 315
-rect 1970 115 2000 315
 << pmos >>
 rect 80 617 110 1217
 rect 270 617 300 1217
@@ -42,6 +25,25 @@
 rect 1694 617 1724 1217
 rect 1884 617 1914 1217
 rect 1970 617 2000 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 272 115 302 263
+rect 370 115 400 315
+rect 442 115 472 315
+rect 632 115 662 315
+rect 704 115 734 315
+rect 824 115 854 315
+rect 896 115 926 315
+rect 982 115 1012 315
+rect 1054 115 1084 315
+rect 1174 115 1204 315
+rect 1246 115 1276 315
+rect 1332 115 1362 315
+rect 1522 115 1552 315
+rect 1594 115 1624 315
+rect 1692 115 1722 263
+rect 1884 115 1914 315
+rect 1970 115 2000 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -526,23 +528,23 @@
 rect 1956 462 1990 496
 rect 1755 301 1789 335
 << locali >>
-rect 0 1315 2090 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1682 1315
-rect 1716 1271 1818 1315
-rect 1852 1271 1954 1315
-rect 1988 1271 2090 1315
+rect 0 1311 2090 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1682 1311
+rect 1716 1271 1818 1311
+rect 1852 1271 1954 1311
+rect 1988 1271 2090 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -683,54 +685,54 @@
 rect 1925 61 1959 131
 rect 2011 267 2045 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
-rect 1682 1305 1716 1315
-rect 1682 1281 1716 1305
-rect 1818 1305 1852 1315
-rect 1818 1281 1852 1305
-rect 1954 1305 1988 1315
-rect 1954 1281 1988 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
+rect 1682 1305 1716 1311
+rect 1682 1277 1716 1305
+rect 1818 1305 1852 1311
+rect 1818 1277 1852 1305
+rect 1954 1305 1988 1311
+rect 1954 1277 1988 1305
 rect 47 649 81 683
 rect 325 575 359 609
 rect 325 353 359 387
@@ -752,55 +754,55 @@
 rect 1502 353 1536 387
 rect 1755 301 1789 313
 rect 1755 279 1789 301
-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 1315 2090 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1682 1315
-rect 1716 1281 1818 1315
-rect 1852 1281 1954 1315
-rect 1988 1281 2090 1315
-rect 0 1271 2090 1281
+rect 0 1311 2090 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1682 1311
+rect 1716 1277 1818 1311
+rect 1852 1277 1954 1311
+rect 1988 1277 2090 1311
+rect 0 1271 2090 1277
 rect 35 683 93 689
 rect 1999 683 2057 689
 rect 35 649 47 683
@@ -862,24 +864,24 @@
 rect 1789 279 1801 313
 rect 217 273 275 279
 rect 1743 273 1801 279
-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 metal1 659 444 659 444 1 D
 port 1 n
@@ -893,6 +895,6 @@
 port 5 n
 rlabel metal1 2028 666 2028 666 1 Q
 port 6 n
-rlabel viali 67 1288 67 1288 1 vdd
-rlabel viali 67 44 67 44 1 gnd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__dffsr_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__dffsr_l.mag
index 20ca86e..deaac25 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__dffsr_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__dffsr_l.mag
@@ -1,28 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863586
+timestamp 1606864616
+<< checkpaint >>
+rect -1210 -1243 3248 2575
 << nwell >>
 rect -10 581 2090 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 272 115 302 263
-rect 370 115 400 315
-rect 442 115 472 315
-rect 632 115 662 315
-rect 704 115 734 315
-rect 824 115 854 315
-rect 896 115 926 315
-rect 982 115 1012 315
-rect 1054 115 1084 315
-rect 1174 115 1204 315
-rect 1246 115 1276 315
-rect 1332 115 1362 315
-rect 1522 115 1552 315
-rect 1594 115 1624 315
-rect 1692 115 1722 263
-rect 1884 115 1914 263
-rect 1970 115 2000 263
 << pmos >>
 rect 80 617 110 1217
 rect 270 617 300 1217
@@ -42,6 +25,25 @@
 rect 1694 617 1724 1217
 rect 1884 817 1914 1217
 rect 1970 817 2000 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 272 115 302 263
+rect 370 115 400 315
+rect 442 115 472 315
+rect 632 115 662 315
+rect 704 115 734 315
+rect 824 115 854 315
+rect 896 115 926 315
+rect 982 115 1012 315
+rect 1054 115 1084 315
+rect 1174 115 1204 315
+rect 1246 115 1276 315
+rect 1332 115 1362 315
+rect 1522 115 1552 315
+rect 1594 115 1624 315
+rect 1692 115 1722 263
+rect 1884 115 1914 263
+rect 1970 115 2000 263
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -524,23 +526,23 @@
 rect 1956 462 1990 496
 rect 1755 301 1789 335
 << locali >>
-rect 0 1315 2090 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1682 1315
-rect 1716 1271 1818 1315
-rect 1852 1271 1954 1315
-rect 1988 1271 2090 1315
+rect 0 1311 2090 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1682 1311
+rect 1716 1271 1818 1311
+rect 1852 1271 1954 1311
+rect 1988 1271 2090 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -683,54 +685,54 @@
 rect 1925 61 1959 131
 rect 2011 199 2045 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
-rect 1682 1305 1716 1315
-rect 1682 1281 1716 1305
-rect 1818 1305 1852 1315
-rect 1818 1281 1852 1305
-rect 1954 1305 1988 1315
-rect 1954 1281 1988 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
+rect 1682 1305 1716 1311
+rect 1682 1277 1716 1305
+rect 1818 1305 1852 1311
+rect 1818 1277 1852 1305
+rect 1954 1305 1988 1311
+rect 1954 1277 1988 1305
 rect 47 649 81 683
 rect 325 575 359 609
 rect 325 353 359 387
@@ -751,55 +753,55 @@
 rect 1502 353 1536 387
 rect 1755 301 1789 313
 rect 1755 279 1789 301
-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 1315 2090 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1682 1315
-rect 1716 1281 1818 1315
-rect 1852 1281 1954 1315
-rect 1988 1281 2090 1315
-rect 0 1271 2090 1281
+rect 0 1311 2090 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1682 1311
+rect 1716 1277 1818 1311
+rect 1852 1277 1954 1311
+rect 1988 1277 2090 1311
+rect 0 1271 2090 1277
 rect 35 683 93 689
 rect 1998 683 2056 689
 rect 35 649 47 683
@@ -861,24 +863,24 @@
 rect 1789 279 1801 313
 rect 217 273 275 279
 rect 1743 273 1801 279
-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 metal1 659 444 659 444 1 D
 port 1 n
@@ -892,6 +894,6 @@
 port 5 n
 rlabel metal1 65 666 65 666 1 RN
 port 6 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1288 67 1288 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__fill_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__fill_1.mag
index 95c509c..8d5ce0c 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__fill_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__fill_1.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548551
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << error_p >>
 rect 0 1271 34 1332
 rect 41 581 154 1341
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__fill_16.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__fill_16.mag
index 0359d8e..877376a 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__fill_16.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__fill_16.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548584
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 581 355 1341
 << locali >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__fill_2.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__fill_2.mag
index 6563ebf..65e2cf3 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__fill_2.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__fill_2.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548559
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << error_p >>
 rect 0 1271 44 1332
 rect 50 581 161 1341
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__fill_32.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__fill_32.mag
index 6fa9b88..bcb8614 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__fill_32.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__fill_32.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548594
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 581 707 1341
 << locali >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__fill_4.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__fill_4.mag
index 0304d99..b47e23b 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__fill_4.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__fill_4.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548567
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << error_p >>
 rect 96 581 159 1341
 << nwell >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__fill_8.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__fill_8.mag
index c59d34e..024779e 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__fill_8.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__fill_8.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548573
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 581 179 1341
 << locali >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__inv_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__inv_1.mag
index 4c8c04f..ddc1a20 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__inv_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__inv_1.mag
@@ -1,13 +1,15 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863700
+timestamp 1606864617
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
-<< nmoslvt >>
-rect 80 115 110 315
 << pmos >>
 rect 80 617 110 1217
+<< nmoslvt >>
+rect 80 115 110 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -68,22 +70,22 @@
 rect 35 61 69 131
 rect 121 267 155 279
 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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 121 279 155 313
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -97,15 +99,15 @@
 rect 109 279 121 313
 rect 155 279 167 313
 rect 109 273 167 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 151 441 151 441 1 Y
 port 1 n
 rlabel metal1 64 666 64 666 1 A
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__inv_10.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__inv_10.mag
index 7d6a27a..827ee0e 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__inv_10.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__inv_10.mag
@@ -1,20 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863912
+timestamp 1606864617
+<< checkpaint >>
+rect -1209 -1243 2161 2575
 << nwell >>
 rect -9 581 990 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-rect 768 115 798 315
-rect 854 115 884 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
@@ -26,6 +17,17 @@
 rect 682 617 712 1217
 rect 768 617 798 1217
 rect 854 617 884 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
+rect 338 115 368 315
+rect 424 115 454 315
+rect 510 115 540 315
+rect 596 115 626 315
+rect 682 115 712 315
+rect 768 115 798 315
+rect 854 115 884 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -239,15 +241,15 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 990 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 990 1315
+rect 0 1311 990 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 990 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -295,30 +297,30 @@
 rect 809 115 843 131
 rect 895 267 929 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 293 575 327 609
@@ -330,31 +332,31 @@
 rect 465 279 499 313
 rect 637 279 671 313
 rect 809 279 843 313
-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 1315 990 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 990 1315
-rect 0 1271 990 1281
+rect 0 1311 990 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 990 1311
+rect 0 1271 990 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -396,21 +398,21 @@
 rect 453 273 511 279
 rect 625 273 683 279
 rect 797 273 855 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 152 440 152 440 1 Y
 port 1 n
 rlabel metal1 64 665 64 665 1 A
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__inv_2.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__inv_2.mag
index 3ca7d24..1b95287 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__inv_2.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__inv_2.mag
@@ -1,15 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863719
+timestamp 1606864617
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 287 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -80,10 +82,10 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -99,28 +101,28 @@
 rect 121 115 155 131
 rect 207 267 241 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 121 279 155 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -134,16 +136,16 @@
 rect 109 279 121 313
 rect 155 279 167 313
 rect 109 273 167 279
-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 440 152 440 1 Y
 port 1 n
 rlabel metal1 64 665 64 665 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__inv_3.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__inv_3.mag
index 674f792..2b006d4 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__inv_3.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__inv_3.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863791
+timestamp 1606864618
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 375 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
 rect 252 617 282 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -96,10 +98,10 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -119,30 +121,30 @@
 rect 207 61 241 131
 rect 293 267 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 293 575 327 609
 rect 121 279 155 313
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -163,16 +165,16 @@
 rect 327 279 339 313
 rect 109 273 167 279
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 152 440 152 440 1 Y
 port 1 n
 rlabel metal1 64 665 64 665 1 A
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__inv_4.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__inv_4.mag
index dbfcbd9..23660e8 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__inv_4.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__inv_4.mag
@@ -1,19 +1,21 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863747
+timestamp 1606864618
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 463 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
 rect 252 617 282 1217
 rect 338 617 368 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
+rect 338 115 368 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -118,11 +120,11 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 462 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 462 1315
+rect 0 1311 462 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 462 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -146,36 +148,36 @@
 rect 293 115 327 131
 rect 379 267 413 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 293 575 327 609
 rect 121 279 155 313
 rect 293 279 327 313
-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 1315 462 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 462 1315
-rect 0 1271 462 1281
+rect 0 1311 462 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 462 1311
+rect 0 1271 462 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -196,17 +198,17 @@
 rect 327 279 339 313
 rect 109 273 167 279
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 64 665 64 665 1 A
 port 1 n
 rlabel metal1 152 440 152 440 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__inv_6.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__inv_6.mag
index 05cba07..fc7b91b 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__inv_6.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__inv_6.mag
@@ -1,16 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863829
+timestamp 1606864618
+<< checkpaint >>
+rect -1209 -1243 1753 2575
 << nwell >>
 rect -9 581 639 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
@@ -18,6 +13,13 @@
 rect 338 617 368 1217
 rect 424 617 454 1217
 rect 510 617 540 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
+rect 338 115 368 315
+rect 424 115 454 315
+rect 510 115 540 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -157,12 +159,12 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 638 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 638 1315
+rect 0 1311 638 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 638 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -194,21 +196,21 @@
 rect 465 115 499 131
 rect 551 267 585 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 293 575 327 609
@@ -216,22 +218,22 @@
 rect 121 279 155 313
 rect 293 279 327 313
 rect 465 279 499 313
-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 1315 638 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 638 1315
-rect 0 1271 638 1281
+rect 0 1311 638 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 638 1311
+rect 0 1271 638 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -259,18 +261,18 @@
 rect 109 273 167 279
 rect 281 273 339 279
 rect 453 273 511 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 64 665 64 665 1 A
 port 1 n
 rlabel metal1 152 440 152 440 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__inv_8.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__inv_8.mag
index 8e4bb8d..a78d844 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__inv_8.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__inv_8.mag
@@ -1,18 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863864
+timestamp 1606864618
+<< checkpaint >>
+rect -1209 -1243 1889 2575
 << nwell >>
 rect -9 581 814 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
@@ -22,6 +15,15 @@
 rect 510 617 540 1217
 rect 596 617 626 1217
 rect 682 617 712 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
+rect 338 115 368 315
+rect 424 115 454 315
+rect 510 115 540 315
+rect 596 115 626 315
+rect 682 115 712 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -195,13 +197,13 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 814 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 814 1315
+rect 0 1311 814 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 814 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -241,24 +243,24 @@
 rect 637 115 671 131
 rect 723 267 757 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 293 575 327 609
@@ -268,25 +270,25 @@
 rect 293 279 327 313
 rect 465 279 499 313
 rect 637 279 671 313
-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 1315 814 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 814 1315
-rect 0 1271 814 1281
+rect 0 1311 814 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 814 1311
+rect 0 1271 814 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -321,19 +323,19 @@
 rect 281 273 339 279
 rect 453 273 511 279
 rect 625 273 683 279
-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 viali 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 152 440 152 440 1 Y
 port 1 n
 rlabel metal1 64 665 64 665 1 A
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__inv_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__inv_l.mag
index 312b80e..f2529fb 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__inv_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__inv_l.mag
@@ -1,13 +1,15 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863931
+timestamp 1606864618
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
-<< nmoslvt >>
-rect 80 115 110 263
 << pmos >>
 rect 80 817 110 1217
+<< nmoslvt >>
+rect 80 115 110 263
 << ndiff >>
 rect 27 199 80 263
 rect 27 131 35 199
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 913 69 929
 rect 121 1201 155 1217
@@ -68,22 +70,22 @@
 rect 35 61 69 131
 rect 121 199 155 279
 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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 121 279 155 313
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -97,15 +99,15 @@
 rect 109 279 121 313
 rect 155 279 167 313
 rect 109 273 167 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 64 666 64 666 1 A
 port 1 n
 rlabel metal1 151 441 151 441 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__mux2_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__mux2_1.mag
index 941ab66..37a9bbf 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__mux2_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__mux2_1.mag
@@ -1,17 +1,20 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864309
+timestamp 1606864618
+<< checkpaint >>
+rect -801 1315 1753 2575
+rect -1209 -1243 1753 1315
 << nwell >>
 rect -9 581 553 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 270 115 300 315
-rect 356 115 386 315
 << pmos >>
 rect 80 617 110 1217
 rect 270 617 300 1217
 rect 356 617 386 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 270 115 300 315
+rect 356 115 386 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -120,9 +123,9 @@
 rect 37 444 71 478
 rect 168 353 202 387
 << locali >>
-rect 0 1315 550 1332
-rect 0 1271 459 1315
-rect 493 1271 550 1315
+rect 0 1311 550 1332
+rect 0 1271 459 1311
+rect 493 1271 550 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -154,33 +157,33 @@
 rect 311 115 345 131
 rect 397 267 431 501
 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 1305 493 1315
-rect 459 1281 493 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 37 649 71 683
 rect 236 575 270 609
 rect 311 427 345 461
 rect 397 501 431 535
 rect 311 279 345 313
-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 1315 550 1332
-rect 0 1281 459 1315
-rect 493 1281 550 1315
-rect 0 1271 550 1281
+rect 0 1311 550 1332
+rect 0 1277 459 1311
+rect 493 1277 550 1311
+rect 0 1271 550 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 117 683
@@ -202,24 +205,22 @@
 rect 299 279 311 313
 rect 345 279 357 313
 rect 299 273 357 279
-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 metal1 54 666 54 666 1 S0
 port 1 n
 rlabel metal1 328 444 328 444 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 476 1288 476 1288 1 vdd
-rlabel viali 476 1288 476 1288 1 vdd
 rlabel metal1 253 592 253 592 1 A0
 port 3 n
 rlabel metal1 414 518 414 518 1 A1
 port 4 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 476 1284 476 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__nand2_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__nand2_1.mag
index bac968a..df67fd4 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__nand2_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__nand2_1.mag
@@ -1,15 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864337
+timestamp 1606864619
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 286 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 152 115 182 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 152 115 182 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -77,10 +79,10 @@
 rect 47 520 81 554
 rect 166 427 200 461
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -96,29 +98,29 @@
 rect 35 115 69 131
 rect 193 267 227 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 47 649 81 683
 rect 121 501 155 535
 rect 195 575 229 609
 rect 35 279 69 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 115 683
@@ -136,18 +138,18 @@
 rect 23 279 35 313
 rect 69 279 155 313
 rect 23 273 81 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 136 470 136 470 1 Y
 port 1 n
 rlabel metal1 64 666 64 666 1 A
 port 2 n
 rlabel metal1 212 592 212 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__nand2_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__nand2_l.mag
index 820cc41..a85b105 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__nand2_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__nand2_l.mag
@@ -1,15 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864354
+timestamp 1606864619
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 286 1341
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
 << pmos >>
 rect 80 817 110 1217
 rect 166 817 196 1217
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
 << ndiff >>
 rect 27 199 80 263
 rect 27 131 35 199
@@ -77,10 +79,10 @@
 rect 47 520 81 554
 rect 166 370 200 404
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1271
 rect 35 913 69 929
 rect 121 1201 155 1217
@@ -96,29 +98,29 @@
 rect 35 115 69 131
 rect 193 199 227 215
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 47 649 81 683
 rect 121 501 155 535
 rect 195 575 229 609
 rect 35 279 69 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 115 683
@@ -136,18 +138,18 @@
 rect 23 279 35 313
 rect 69 279 155 313
 rect 23 273 81 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 136 470 136 470 1 Y
 port 1 n
 rlabel metal1 212 592 212 592 1 B
 port 2 n
 rlabel metal1 64 666 64 666 1 A
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__nor2_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__nor2_1.mag
index f09986a..9cc21e8 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__nor2_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__nor2_1.mag
@@ -1,15 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864375
+timestamp 1606864619
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 286 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
 << pmos >>
 rect 80 617 110 1217
 rect 152 617 182 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -77,10 +79,10 @@
 rect 181 534 215 568
 rect 66 401 100 435
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1217
 rect 193 1201 227 1271
 rect 193 777 227 793
@@ -96,29 +98,29 @@
 rect 121 115 155 131
 rect 207 267 241 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 181 649 215 683
 rect 35 501 69 535
 rect 113 575 147 609
 rect 121 279 155 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 169 683 227 689
 rect 148 649 181 683
 rect 215 649 227 683
@@ -136,18 +138,18 @@
 rect 109 279 121 313
 rect 155 279 167 313
 rect 109 273 167 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 137 393 137 393 1 Y
 port 1 n
 rlabel metal1 130 592 130 592 1 B
 port 2 n
 rlabel metal1 198 666 198 666 1 A
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__nor2_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__nor2_l.mag
index 265ea27..d8a7f8d 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__nor2_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__nor2_l.mag
@@ -1,15 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864393
+timestamp 1606864619
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 286 1341
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
 << pmos >>
 rect 80 817 110 1217
 rect 152 817 182 1217
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
 << ndiff >>
 rect 27 199 80 263
 rect 27 131 35 199
@@ -77,10 +79,10 @@
 rect 181 534 215 568
 rect 66 401 100 435
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1217
 rect 35 535 69 861
 rect 193 1201 227 1271
@@ -96,29 +98,29 @@
 rect 121 115 155 131
 rect 207 199 241 215
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 181 649 215 683
 rect 35 501 69 535
 rect 113 575 147 609
 rect 121 279 155 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 169 683 227 689
 rect 148 649 181 683
 rect 215 649 227 683
@@ -136,18 +138,18 @@
 rect 109 279 121 313
 rect 155 279 167 313
 rect 109 273 167 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 137 393 137 393 1 Y
 port 1 n
 rlabel metal1 198 666 198 666 1 A
 port 2 n
 rlabel metal1 130 592 130 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__oai21_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__oai21_l.mag
index cdba70d..bd48446 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__oai21_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__oai21_l.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864420
+timestamp 1606864619
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
 << pmos >>
 rect 80 617 110 1217
 rect 152 617 182 1217
 rect 250 817 280 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -101,10 +103,10 @@
 rect 152 427 186 461
 rect 262 359 296 393
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 193 1201 227 1271
 rect 193 845 227 861
@@ -128,30 +130,30 @@
 rect 207 115 241 131
 rect 293 266 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 66 649 100 683
 rect 162 575 196 609
 rect 223 501 257 535
 rect 291 427 325 461
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 54 683 112 689
 rect 54 649 66 683
 rect 100 649 134 683
@@ -173,14 +175,12 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 83 666 83 666 1 A0
 port 1 n
 rlabel metal1 179 592 179 592 1 A1
@@ -189,4 +189,6 @@
 port 3 n
 rlabel metal1 240 518 240 518 1 B0
 port 4 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__oai22_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__oai22_l.mag
index 5c2d141..b457add 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__oai22_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__oai22_l.mag
@@ -1,19 +1,21 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603913328
+timestamp 1606864620
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 462 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
 << pmos >>
 rect 80 617 110 1217
 rect 152 617 182 1217
 rect 252 617 282 1217
 rect 324 617 354 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
+rect 338 115 368 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -125,11 +127,11 @@
 rect 384 428 418 462
 rect 248 359 282 393
 << locali >>
-rect 0 1315 462 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 462 1315
+rect 0 1311 462 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 462 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 200 1201 234 1217
@@ -160,37 +162,37 @@
 rect 379 199 413 215
 rect 241 131 379 149
 rect 207 115 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 66 649 100 683
 rect 162 575 196 609
 rect 223 501 257 535
 rect 384 428 418 462
 rect 316 353 350 387
 rect 316 279 350 313
-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 1315 462 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 462 1315
-rect 0 1271 462 1281
+rect 0 1311 462 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 462 1311
+rect 0 1271 462 1277
 rect 54 683 112 689
 rect 54 649 66 683
 rect 100 649 134 683
@@ -216,14 +218,13 @@
 rect 304 279 316 313
 rect 350 279 362 313
 rect 304 273 362 279
-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 metal1 240 518 240 518 1 B0
 port 4 n
 rlabel viali 179 592 179 592 1 A1
@@ -233,5 +234,6 @@
 rlabel viali 333 370 333 370 1 Y
 port 3 n
 rlabel viali 401 445 401 445 1 B1
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__or2_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__or2_1.mag
index 1fa91ff..72e7419 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__or2_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__or2_1.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864446
+timestamp 1606864620
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
 rect 252 617 282 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -101,10 +103,10 @@
 rect 173 460 207 494
 rect 269 370 303 404
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 207 1201 241 1271
 rect 207 777 241 793
@@ -127,29 +129,29 @@
 rect 207 61 241 131
 rect 293 267 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 37 575 71 609
 rect 173 649 207 683
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 161 683 219 689
 rect 140 649 173 683
 rect 207 649 219 683
@@ -167,18 +169,18 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 190 666 190 666 1 A
 port 2 n
 rlabel metal1 54 592 54 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__or2_2.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__or2_2.mag
index b74bb73..7b11f3d 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__or2_2.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__or2_2.mag
@@ -1,19 +1,21 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864470
+timestamp 1606864620
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 462 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
 rect 252 617 282 1217
 rect 338 617 368 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
+rect 338 115 368 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -124,11 +126,11 @@
 rect 173 460 207 494
 rect 269 370 303 404
 << locali >>
-rect 0 1315 462 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 462 1315
+rect 0 1311 462 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 462 1311
 rect 35 1201 69 1217
 rect 207 1201 241 1271
 rect 207 777 241 793
@@ -155,35 +157,35 @@
 rect 293 115 327 131
 rect 379 267 413 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 37 575 71 609
 rect 173 649 207 683
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 462 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 462 1315
-rect 0 1271 462 1281
+rect 0 1311 462 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 462 1311
+rect 0 1271 462 1277
 rect 161 683 219 689
 rect 140 649 173 683
 rect 207 649 219 683
@@ -201,19 +203,19 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 190 666 190 666 1 A
 port 2 n
 rlabel metal1 54 592 54 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__or2_4.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__or2_4.mag
index eb5d24b..539cea1 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__or2_4.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__or2_4.mag
@@ -1,16 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864501
+timestamp 1606864620
+<< checkpaint >>
+rect -1209 -1243 1753 2575
 << nwell >>
 rect -9 581 638 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
@@ -18,6 +13,13 @@
 rect 338 617 368 1217
 rect 424 617 454 1217
 rect 510 617 540 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
+rect 338 115 368 315
+rect 424 115 454 315
+rect 510 115 540 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -162,12 +164,12 @@
 rect 173 460 207 494
 rect 269 370 303 404
 << locali >>
-rect 0 1315 638 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 638 1315
+rect 0 1311 638 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 638 1311
 rect 35 1201 69 1217
 rect 207 1201 241 1271
 rect 207 777 241 793
@@ -202,43 +204,43 @@
 rect 465 115 499 131
 rect 551 267 585 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 37 575 71 609
 rect 173 649 207 683
 rect 293 501 327 535
 rect 465 501 499 535
 rect 293 279 327 313
 rect 465 279 499 313
-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 1315 638 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 638 1315
-rect 0 1271 638 1281
+rect 0 1311 638 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 638 1311
+rect 0 1271 638 1277
 rect 161 683 219 689
 rect 140 649 173 683
 rect 207 649 219 683
@@ -263,20 +265,20 @@
 rect 499 279 511 313
 rect 281 273 339 279
 rect 453 273 511 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 190 666 190 666 1 A
 port 2 n
 rlabel metal1 54 592 54 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__or2_8.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__or2_8.mag
index eb385c1..66efa1f 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__or2_8.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__or2_8.mag
@@ -1,20 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864544
+timestamp 1606864620
+<< checkpaint >>
+rect -1209 -1243 2161 2575
 << nwell >>
 rect -9 581 990 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-rect 768 115 798 315
-rect 854 115 884 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
@@ -26,6 +17,17 @@
 rect 682 617 712 1217
 rect 768 617 798 1217
 rect 854 617 884 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 252 115 282 315
+rect 338 115 368 315
+rect 424 115 454 315
+rect 510 115 540 315
+rect 596 115 626 315
+rect 682 115 712 315
+rect 768 115 798 315
+rect 854 115 884 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -245,15 +247,15 @@
 rect 173 460 207 494
 rect 269 370 303 404
 << locali >>
-rect 0 1315 990 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 990 1315
+rect 0 1311 990 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 990 1311
 rect 35 1201 69 1217
 rect 207 1201 241 1271
 rect 207 777 241 793
@@ -304,30 +306,30 @@
 rect 809 115 843 131
 rect 895 267 929 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
 rect 37 575 71 609
 rect 173 649 207 683
 rect 293 501 327 535
@@ -338,31 +340,31 @@
 rect 465 279 499 313
 rect 637 279 671 313
 rect 809 279 843 313
-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 1315 990 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 990 1315
-rect 0 1271 990 1281
+rect 0 1311 990 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 990 1311
+rect 0 1271 990 1277
 rect 161 683 219 689
 rect 140 649 173 683
 rect 207 649 219 683
@@ -402,23 +404,23 @@
 rect 453 273 511 279
 rect 625 273 683 279
 rect 797 273 855 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 190 666 190 666 1 A
 port 2 n
 rlabel metal1 54 592 54 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__or2_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__or2_l.mag
index f56cc72..41c0178 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__or2_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__or2_l.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864574
+timestamp 1606864621
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
 << pmos >>
 rect 80 817 110 1217
 rect 166 817 196 1217
 rect 252 817 282 1217
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
 << ndiff >>
 rect 27 199 80 263
 rect 27 131 35 199
@@ -101,10 +103,10 @@
 rect 173 460 207 494
 rect 269 370 303 404
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 35 743 69 929
 rect 207 1201 241 1271
@@ -127,29 +129,29 @@
 rect 207 61 241 131
 rect 293 199 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 37 575 71 609
 rect 173 649 207 683
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 161 683 219 689
 rect 140 649 173 683
 rect 207 649 219 683
@@ -167,18 +169,18 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 54 592 54 592 1 B
 port 2 n
 rlabel metal1 190 666 190 666 1 A
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__tbufi_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__tbufi_1.mag
index a1de1cc..50ea52e 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__tbufi_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__tbufi_1.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864606
+timestamp 1606864621
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 375 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 238 115 268 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
 rect 238 617 268 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 238 115 268 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -98,10 +100,10 @@
 rect 121 353 155 387
 rect 248 401 282 435
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 709 155 725
@@ -122,29 +124,29 @@
 rect 121 61 155 131
 rect 279 267 313 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 211 649 245 683
 rect 279 501 313 535
 rect 121 353 155 387
 rect 279 279 313 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 199 683 257 689
 rect 177 649 211 683
 rect 245 649 257 683
@@ -166,18 +168,18 @@
 rect 267 279 279 313
 rect 313 279 325 313
 rect 267 273 325 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 305 364 305 364 1 Y
 port 1 n
 rlabel metal1 228 666 228 666 1 A
 port 2 n
 rlabel metal1 138 592 138 592 1 OE
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__tbufi_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__tbufi_l.mag
index 87e0e26..aabfe8a 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__tbufi_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__tbufi_l.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864958
+timestamp 1606864621
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 375 1341
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
 << pmos >>
 rect 80 817 110 1217
 rect 166 817 196 1217
 rect 238 817 268 1217
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 238 115 268 263
 << ndiff >>
 rect 27 199 80 263
 rect 27 131 35 199
@@ -98,10 +100,10 @@
 rect 121 353 155 387
 rect 248 401 282 435
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 35 513 69 861
 rect 121 1201 155 1271
@@ -122,29 +124,29 @@
 rect 121 61 155 131
 rect 279 199 313 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 211 649 245 683
 rect 279 501 313 535
 rect 121 353 155 387
 rect 279 279 313 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 199 683 257 689
 rect 177 649 211 683
 rect 245 649 257 683
@@ -166,18 +168,18 @@
 rect 267 279 279 313
 rect 313 279 325 313
 rect 267 273 325 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 305 364 305 364 1 Y
 port 1 n
 rlabel metal1 228 666 228 666 1 A
 port 2 n
 rlabel metal1 138 592 138 592 1 OE
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__tiehi.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__tiehi.mag
index 7b1a610..6038968 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__tiehi.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__tiehi.mag
@@ -1,13 +1,15 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865006
+timestamp 1606864621
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
-<< nmoslvt >>
-rect 80 115 110 315
 << pmos >>
 rect 80 617 110 1217
+<< nmoslvt >>
+rect 80 115 110 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 383 124 417
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 641 69 657
 rect 121 1201 155 1217
@@ -67,31 +69,31 @@
 rect 35 61 69 131
 rect 121 267 155 383
 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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 121 575 155 609
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 94 609 167 615
 rect 94 575 121 609
 rect 155 575 167 609
 rect 94 569 167 575
-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 68 1288 68 1288 1 vdd
 rlabel metal1 138 592 138 592 1 Y
 port 1 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__tielo.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__tielo.mag
index 6c3d70c..aeb905f 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__tielo.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__tielo.mag
@@ -1,13 +1,15 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865020
+timestamp 1606864621
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
-<< nmoslvt >>
-rect 80 115 110 315
 << pmos >>
 rect 80 617 110 1217
+<< nmoslvt >>
+rect 80 115 110 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 515 124 549
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 641 69 657
 rect 121 1201 155 1217
@@ -67,31 +69,31 @@
 rect 35 61 69 131
 rect 121 267 155 353
 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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 121 353 155 387
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 94 387 167 393
 rect 94 353 121 387
 rect 155 353 167 387
 rect 94 347 167 353
-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 68 1288 68 1288 1 vdd
 rlabel metal1 138 370 138 370 1 Y
 port 1 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__tnbufi_1.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__tnbufi_1.mag
index 9e93942..8c5575a 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__tnbufi_1.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__tnbufi_1.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865046
+timestamp 1606864621
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 375 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 238 115 268 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
 rect 238 617 268 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 238 115 268 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -97,10 +99,10 @@
 rect 121 418 155 452
 rect 248 401 282 435
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 709 155 725
@@ -121,29 +123,29 @@
 rect 121 61 155 131
 rect 279 267 313 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 211 649 245 683
 rect 121 575 155 609
 rect 279 501 313 535
 rect 279 279 313 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 199 683 257 689
 rect 177 649 211 683
 rect 245 649 257 683
@@ -161,18 +163,18 @@
 rect 267 279 279 313
 rect 313 279 325 313
 rect 267 273 325 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 305 364 305 364 1 Y
 port 1 n
 rlabel metal1 228 666 228 666 1 A
 port 2 n
 rlabel metal1 138 592 138 592 1 OE
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__tnbufi_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__tnbufi_l.mag
index 5540167..08076a3 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__tnbufi_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__tnbufi_l.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865067
+timestamp 1606864622
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 375 1341
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
 << pmos >>
 rect 80 817 110 1217
 rect 166 817 196 1217
 rect 238 817 268 1217
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 238 115 268 263
 << ndiff >>
 rect 27 199 80 263
 rect 27 131 35 199
@@ -97,10 +99,10 @@
 rect 121 418 155 452
 rect 248 401 282 435
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 35 452 69 861
 rect 121 1201 155 1271
@@ -121,29 +123,29 @@
 rect 121 61 155 131
 rect 279 199 313 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 211 649 245 683
 rect 121 575 155 609
 rect 279 501 313 535
 rect 279 279 313 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 199 683 257 689
 rect 177 649 211 683
 rect 245 649 257 683
@@ -161,18 +163,18 @@
 rect 267 279 279 313
 rect 313 279 325 313
 rect 267 273 325 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 305 364 305 364 1 Y
 port 1 n
 rlabel metal1 228 666 228 666 1 A
 port 2 n
 rlabel metal1 138 592 138 592 1 OE
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__xnor2_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__xnor2_l.mag
index bd6dd05..4862a64 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__xnor2_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__xnor2_l.mag
@@ -1,16 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865125
+timestamp 1606864622
+<< checkpaint >>
+rect -1209 -1243 1753 2575
 << nwell >>
 rect -9 581 638 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 238 115 268 315
-rect 358 115 388 315
-rect 430 115 460 315
-rect 516 115 546 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
@@ -18,6 +13,13 @@
 rect 358 617 388 1217
 rect 430 617 460 1217
 rect 516 617 546 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 238 115 268 315
+rect 358 115 388 315
+rect 430 115 460 315
+rect 516 115 546 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -169,12 +171,12 @@
 rect 336 353 370 387
 rect 489 353 523 387
 << locali >>
-rect 0 1315 638 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 638 1315
+rect 0 1311 638 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 638 1311
 rect 35 1201 69 1217
 rect 35 495 69 657
 rect 121 1201 155 1271
@@ -212,21 +214,21 @@
 rect 471 199 505 215
 rect 471 61 505 131
 rect 557 115 591 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 268 657 279 683
 rect 279 657 302 683
 rect 268 649 302 657
@@ -234,22 +236,22 @@
 rect 268 353 302 387
 rect 489 353 523 387
 rect 412 279 446 313
-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 1315 638 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 638 1315
-rect 0 1271 638 1281
+rect 0 1311 638 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 638 1311
+rect 0 1271 638 1277
 rect 256 683 314 689
 rect 256 649 268 683
 rect 302 649 314 683
@@ -270,20 +272,20 @@
 rect 446 279 458 313
 rect 140 273 198 279
 rect 400 273 458 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 170 296 170 296 1 A
 port 1 n
 rlabel metal1 506 370 506 370 1 B
 port 2 n
 rlabel metal1 284 427 284 427 1 Y
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_hs/magic/sky130_osu_sc_18T_hs__xor2_l.mag b/18T_hs/magic/sky130_osu_sc_18T_hs__xor2_l.mag
index c68f0a2..6233dae 100644
--- a/18T_hs/magic/sky130_osu_sc_18T_hs__xor2_l.mag
+++ b/18T_hs/magic/sky130_osu_sc_18T_hs__xor2_l.mag
@@ -1,16 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865151
+timestamp 1606864622
+<< checkpaint >>
+rect -1209 -1243 1753 2575
 << nwell >>
 rect -9 581 638 1341
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 238 115 268 315
-rect 358 115 388 315
-rect 430 115 460 315
-rect 516 115 546 315
 << pmos >>
 rect 80 617 110 1217
 rect 166 617 196 1217
@@ -18,6 +13,13 @@
 rect 358 617 388 1217
 rect 430 617 460 1217
 rect 516 617 546 1217
+<< nmoslvt >>
+rect 80 115 110 315
+rect 166 115 196 315
+rect 238 115 268 315
+rect 358 115 388 315
+rect 430 115 460 315
+rect 516 115 546 315
 << ndiff >>
 rect 27 267 80 315
 rect 27 131 35 267
@@ -168,12 +170,12 @@
 rect 430 427 464 461
 rect 248 353 282 387
 << locali >>
-rect 0 1315 638 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 638 1315
+rect 0 1311 638 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 638 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -213,42 +215,42 @@
 rect 471 61 505 131
 rect 557 267 591 353
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 200 649 234 683
 rect 412 649 446 683
 rect 268 501 302 535
 rect 489 575 523 609
 rect 296 279 330 313
-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 1315 638 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 638 1315
-rect 0 1271 638 1281
+rect 0 1311 638 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 638 1311
+rect 0 1271 638 1277
 rect 188 683 246 689
 rect 400 683 458 689
 rect 188 649 200 683
@@ -269,20 +271,20 @@
 rect 268 279 296 313
 rect 330 279 342 313
 rect 284 273 342 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 218 666 218 666 1 A
 port 1 n
 rlabel metal1 285 486 285 486 1 Y
 port 2 n
 rlabel metal1 506 592 506 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__addf_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__addf_1.gds
index ee24bd4..e7eede3 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__addf_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__addf_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__addf_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__addf_l.gds
index 26fd857..3984080 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__addf_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__addf_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__addh_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__addh_1.gds
index 0246249..4c2bbce 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__addh_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__addh_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__addh_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__addh_l.gds
index f0aaf8b..22381be 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__addh_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__addh_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__and2_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__and2_1.gds
index 2693741..8a2e4b6 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__and2_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__and2_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__and2_2.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__and2_2.gds
index 258e1d0..7d6616e 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__and2_2.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__and2_2.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__and2_4.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__and2_4.gds
index d7b51e6..c7466c3 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__and2_4.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__and2_4.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__and2_6.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__and2_6.gds
index 2d2d54d..3134b92 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__and2_6.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__and2_6.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__and2_8.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__and2_8.gds
index 36de6c8..6538cf1 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__and2_8.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__and2_8.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__and2_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__and2_l.gds
index 92cbc62..32c88c9 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__and2_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__and2_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__ant.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__ant.gds
index e8c4c60..73f2a69 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__ant.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__ant.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__antfill.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__antfill.gds
index bbd1bf3..81a8eab 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__antfill.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__antfill.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__aoi21_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__aoi21_l.gds
index 0edab2e..c4f24f6 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__aoi21_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__aoi21_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__aoi22_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__aoi22_l.gds
index aa8e850..158ce86 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__aoi22_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__aoi22_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__buf_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__buf_1.gds
index c5273e9..4da69d1 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__buf_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__buf_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__buf_2.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__buf_2.gds
index 9a46d1c..2c2a4e9 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__buf_2.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__buf_2.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__buf_4.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__buf_4.gds
index aeccac4..0b611de 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__buf_4.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__buf_4.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__buf_6.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__buf_6.gds
index 20fe1e6..85fcc4c 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__buf_6.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__buf_6.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__buf_8.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__buf_8.gds
index 48611af..508537e 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__buf_8.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__buf_8.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__buf_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__buf_l.gds
index eef714c..c7cc2d3 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__buf_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__buf_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__decap_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__decap_1.gds
index 17f6536..94c3456 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__decap_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__decap_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__decap_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__decap_l.gds
index 776c962..2d6a58e 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__decap_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__decap_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__dff_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__dff_1.gds
index 26404b0..2dcf274 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__dff_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__dff_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__dff_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__dff_l.gds
index 94cd95b..1edc889 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__dff_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__dff_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__dffr_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__dffr_1.gds
index c7f5b01..3470125 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__dffr_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__dffr_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__dffr_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__dffr_l.gds
index 1cc16ab..7904618 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__dffr_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__dffr_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__dffs_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__dffs_1.gds
index d82533e..94c2d1c 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__dffs_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__dffs_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__dffs_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__dffs_l.gds
index 5147528..1dd04c5 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__dffs_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__dffs_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__dffsr_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__dffsr_1.gds
index 1b484d7..2b63ad4 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__dffsr_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__dffsr_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__dffsr_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__dffsr_l.gds
index 8833115..5490f3d 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__dffsr_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__dffsr_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__fill_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__fill_1.gds
index 586d279..f8b3731 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__fill_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__fill_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__fill_16.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__fill_16.gds
index ce15b9f..09ce84a 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__fill_16.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__fill_16.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__fill_2.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__fill_2.gds
index c65456b..823529e 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__fill_2.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__fill_2.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__fill_32.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__fill_32.gds
index 1b1992f..e85c3df 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__fill_32.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__fill_32.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__fill_4.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__fill_4.gds
index add6d79..85717ff 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__fill_4.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__fill_4.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__fill_8.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__fill_8.gds
index 50c52b3..1d1937b 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__fill_8.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__fill_8.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__inv_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__inv_1.gds
index 55d41a2..0f3bc7a 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__inv_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__inv_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__inv_10.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__inv_10.gds
index 05950af..4a120cd 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__inv_10.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__inv_10.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__inv_2.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__inv_2.gds
index 58c3f1c..d68fa46 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__inv_2.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__inv_2.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__inv_3.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__inv_3.gds
index 4ec225c..4985142 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__inv_3.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__inv_3.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__inv_4.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__inv_4.gds
index a581593..47211f9 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__inv_4.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__inv_4.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__inv_6.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__inv_6.gds
index 4cb4d73..08a3be4 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__inv_6.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__inv_6.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__inv_8.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__inv_8.gds
index e7f4fee..5c150ea 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__inv_8.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__inv_8.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__inv_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__inv_l.gds
index 5041dd8..0f8fc87 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__inv_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__inv_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__mux2_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__mux2_1.gds
index dca8034..d667b0e 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__mux2_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__mux2_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__nand2_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__nand2_1.gds
index b48642d..b5bafd5 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__nand2_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__nand2_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__nand2_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__nand2_l.gds
index 06f57b4..4407894 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__nand2_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__nand2_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__nor2_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__nor2_1.gds
index 855829b..e4271b3 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__nor2_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__nor2_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__nor2_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__nor2_l.gds
index b49b6dd..d6affe4 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__nor2_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__nor2_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__oai21_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__oai21_l.gds
index 5d6036a..39eefb3 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__oai21_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__oai21_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__oai22_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__oai22_l.gds
index d59ffc6..317ee5c 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__oai22_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__oai22_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__or2_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__or2_1.gds
index 763eb6d..93c8d2a 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__or2_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__or2_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__or2_2.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__or2_2.gds
index a89dece..7ca014b 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__or2_2.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__or2_2.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__or2_4.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__or2_4.gds
index 52469ff..d26a8fd 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__or2_4.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__or2_4.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__or2_8.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__or2_8.gds
index 8edccea..a623e34 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__or2_8.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__or2_8.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__or2_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__or2_l.gds
index c00875a..3cc0399 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__or2_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__or2_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__tbufi_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__tbufi_1.gds
index 675ad0e..bc8b7bd 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__tbufi_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__tbufi_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__tbufi_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__tbufi_l.gds
index a1e4e08..ef00637 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__tbufi_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__tbufi_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__tiehi.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__tiehi.gds
index 70ab800..9f0a81e 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__tiehi.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__tiehi.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__tielo.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__tielo.gds
index 797f778..05be078 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__tielo.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__tielo.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__tnbufi_1.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__tnbufi_1.gds
index ecdf623..36361c8 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__tnbufi_1.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__tnbufi_1.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__tnbufi_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__tnbufi_l.gds
index a2a2b18..6fd99af 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__tnbufi_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__tnbufi_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__xnor2_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__xnor2_l.gds
index ab9ea77..dd34f9f 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__xnor2_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__xnor2_l.gds
Binary files differ
diff --git a/18T_ls/gds/sky130_osu_sc_18T_ls__xor2_l.gds b/18T_ls/gds/sky130_osu_sc_18T_ls__xor2_l.gds
index 83cb311..185e75d 100644
--- a/18T_ls/gds/sky130_osu_sc_18T_ls__xor2_l.gds
+++ b/18T_ls/gds/sky130_osu_sc_18T_ls__xor2_l.gds
Binary files differ
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__addf_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__addf_1.mag
index 4ce11c2..db3d720 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__addf_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__addf_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603838866
+timestamp 1606864588
+<< checkpaint >>
+rect -1209 -1243 2569 2575
 << nwell >>
 rect -9 581 1435 1341
 << nmos >>
@@ -367,18 +369,18 @@
 rect 1265 531 1299 565
 rect 1014 353 1048 387
 << locali >>
-rect 0 1315 1408 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 1003 1315
-rect 1037 1271 1139 1315
-rect 1173 1271 1275 1315
-rect 1309 1271 1408 1315
+rect 0 1311 1408 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 1003 1311
+rect 1037 1271 1139 1311
+rect 1173 1271 1275 1311
+rect 1309 1271 1408 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -482,39 +484,39 @@
 rect 1247 199 1281 215
 rect 1247 61 1281 131
 rect 1333 115 1367 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 1003 61
-rect 1037 17 1139 61
-rect 1173 17 1275 61
-rect 1309 17 1408 61
-rect 0 0 1408 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 1003 61
+rect 1037 21 1139 61
+rect 1173 21 1275 61
+rect 1309 21 1408 61
+rect 0 0 1408 21
 << viali >>
-rect 51 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
-rect 1003 1305 1037 1315
-rect 1003 1281 1037 1305
-rect 1139 1305 1173 1315
-rect 1139 1281 1173 1305
-rect 1275 1305 1309 1315
-rect 1275 1281 1309 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
+rect 1003 1305 1037 1311
+rect 1003 1277 1037 1305
+rect 1139 1305 1173 1311
+rect 1139 1277 1173 1305
+rect 1275 1305 1309 1311
+rect 1275 1277 1309 1305
 rect 80 501 114 535
 rect 248 427 282 461
 rect 80 353 114 387
@@ -530,40 +532,40 @@
 rect 1014 353 1048 387
 rect 1211 279 1245 313
 rect 1333 575 1367 609
-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 1315 1408 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 1003 1315
-rect 1037 1281 1139 1315
-rect 1173 1281 1275 1315
-rect 1309 1281 1408 1315
-rect 0 1271 1408 1281
+rect 0 1311 1408 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 1003 1311
+rect 1037 1277 1139 1311
+rect 1173 1277 1275 1311
+rect 1309 1277 1408 1311
+rect 0 1271 1408 1277
 rect 1131 684 1189 690
 rect 1109 650 1143 684
 rect 1177 650 1189 684
@@ -617,32 +619,32 @@
 rect 281 273 339 279
 rect 765 273 823 279
 rect 1199 273 1257 279
-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 68 44 68 44 1 gnd
 rlabel metal1 97 370 97 370 1 A
 port 1 n
 rlabel metal1 265 444 265 444 1 CI
 port 2 n
 rlabel metal1 129 518 129 518 1 B
 port 3 n
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 1228 296 1228 296 1 CON
 port 4 n
 rlabel metal1 1160 667 1160 667 1 S
 port 5 n
 rlabel metal1 1350 592 1350 592 1 CO
 port 6 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__addf_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__addf_l.mag
index 230fa05..1cfbf83 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__addf_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__addf_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603839028
+timestamp 1606864589
+<< checkpaint >>
+rect -1209 -1243 2569 2575
 << nwell >>
 rect -9 581 1435 1341
 << nmos >>
@@ -369,18 +371,18 @@
 rect 1265 531 1299 565
 rect 1014 353 1048 387
 << locali >>
-rect 0 1315 1408 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 1003 1315
-rect 1037 1271 1139 1315
-rect 1173 1271 1275 1315
-rect 1309 1271 1408 1315
+rect 0 1311 1408 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 1003 1311
+rect 1037 1271 1139 1311
+rect 1173 1271 1275 1311
+rect 1309 1271 1408 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -484,39 +486,39 @@
 rect 1247 61 1281 131
 rect 1333 199 1367 575
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
-rect 1003 1305 1037 1315
-rect 1003 1281 1037 1305
-rect 1139 1305 1173 1315
-rect 1139 1281 1173 1305
-rect 1275 1305 1309 1315
-rect 1275 1281 1309 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
+rect 1003 1305 1037 1311
+rect 1003 1277 1037 1305
+rect 1139 1305 1173 1311
+rect 1139 1277 1173 1305
+rect 1275 1305 1309 1311
+rect 1275 1277 1309 1305
 rect 80 501 114 535
 rect 248 427 282 461
 rect 80 353 114 387
@@ -532,40 +534,40 @@
 rect 1014 353 1048 387
 rect 1211 279 1245 313
 rect 1333 575 1367 609
-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 1315 1408 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 1003 1315
-rect 1037 1281 1139 1315
-rect 1173 1281 1275 1315
-rect 1309 1281 1408 1315
-rect 0 1271 1408 1281
+rect 0 1311 1408 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 1003 1311
+rect 1037 1277 1139 1311
+rect 1173 1277 1275 1311
+rect 1309 1277 1408 1311
+rect 0 1271 1408 1277
 rect 1131 690 1189 696
 rect 1109 656 1143 690
 rect 1177 656 1189 690
@@ -619,32 +621,32 @@
 rect 281 273 339 279
 rect 765 273 823 279
 rect 1199 273 1257 279
-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 68 44 68 44 1 gnd
 rlabel metal1 97 370 97 370 1 A
 port 1 n
 rlabel metal1 265 444 265 444 1 CI
 port 2 n
 rlabel metal1 129 518 129 518 1 B
 port 3 n
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 1350 592 1350 592 1 CO
 port 5 n
 rlabel metal1 1160 673 1160 673 1 S
 port 6 n
 rlabel metal1 1228 296 1228 296 1 CON
 port 4 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__addh_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__addh_1.mag
index 38d9856..27d7d4d 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__addh_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__addh_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861324
+timestamp 1606864589
+<< checkpaint >>
+rect -1209 -1243 2025 2575
 << nwell >>
 rect -9 581 837 1341
 << nmos >>
@@ -210,14 +212,14 @@
 rect 624 427 658 461
 rect 348 374 382 408
 << locali >>
-rect 0 1315 836 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 836 1315
+rect 0 1311 836 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 836 1311
 rect 35 1201 69 1217
 rect 35 623 69 649
 rect 133 1201 167 1271
@@ -272,27 +274,27 @@
 rect 753 267 787 283
 rect 615 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
 rect 35 657 69 683
 rect 35 649 69 657
 rect 260 501 294 535
@@ -304,28 +306,28 @@
 rect 624 427 658 461
 rect 507 353 541 387
 rect 667 353 701 387
-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 1315 836 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 836 1315
-rect 0 1271 836 1281
+rect 0 1311 836 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 836 1311
+rect 0 1271 836 1277
 rect 23 683 81 689
 rect 23 649 35 683
 rect 69 649 81 683
@@ -366,18 +368,16 @@
 rect 23 278 35 312
 rect 69 278 81 312
 rect 23 272 81 278
-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 viali 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 50 477 50 477 1 S
 port 1 n
 rlabel metal1 737 518 737 518 1 A
@@ -388,4 +388,6 @@
 port 4 n
 rlabel metal1 684 370 684 370 1 CON
 port 5 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__addh_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__addh_l.mag
index 4bd1e90..a545426 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__addh_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__addh_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861428
+timestamp 1606864589
+<< checkpaint >>
+rect -1209 -1243 2025 2575
 << nwell >>
 rect -9 581 837 1341
 << nmos >>
@@ -214,14 +216,14 @@
 rect 624 427 658 461
 rect 348 374 382 408
 << locali >>
-rect 0 1315 836 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 836 1315
+rect 0 1311 836 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 836 1311
 rect 35 1201 69 1217
 rect 35 683 69 929
 rect 133 1201 167 1271
@@ -276,27 +278,27 @@
 rect 753 267 787 283
 rect 615 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
 rect 35 649 69 683
 rect 260 501 294 535
 rect 164 427 198 461
@@ -307,28 +309,28 @@
 rect 624 427 658 461
 rect 507 353 541 387
 rect 667 353 701 387
-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 1315 836 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 836 1315
-rect 0 1271 836 1281
+rect 0 1311 836 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 836 1311
+rect 0 1271 836 1277
 rect 23 683 81 689
 rect 23 649 35 683
 rect 69 649 81 683
@@ -369,17 +371,16 @@
 rect 23 278 35 312
 rect 69 278 81 312
 rect 23 272 81 278
-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 viali 68 1288 68 1288 1 vdd
 rlabel metal1 50 477 50 477 1 S
 port 1 n
 rlabel metal1 737 518 737 518 1 A
@@ -390,5 +391,6 @@
 port 4 n
 rlabel metal1 684 370 684 370 1 CON
 port 5 n
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__and2_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__and2_1.mag
index 140d5a1..352987b 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__and2_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__and2_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861476
+timestamp 1606864589
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
 << nmos >>
@@ -101,10 +103,10 @@
 rect 173 468 207 502
 rect 269 370 303 404
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -127,29 +129,29 @@
 rect 193 61 227 131
 rect 293 267 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 37 649 71 683
 rect 173 575 207 609
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 105 683
@@ -167,18 +169,18 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 55 666 55 666 1 A
 port 2 n
 rlabel metal1 191 592 191 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__and2_2.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__and2_2.mag
index 8ed31f4..1714755 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__and2_2.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__and2_2.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861504
+timestamp 1606864589
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 462 1341
 << nmos >>
@@ -124,11 +126,11 @@
 rect 173 468 207 502
 rect 269 370 303 404
 << locali >>
-rect 0 1315 462 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 462 1315
+rect 0 1311 462 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 462 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -155,35 +157,35 @@
 rect 293 115 327 131
 rect 379 267 413 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 37 649 71 683
 rect 173 575 207 609
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 462 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 462 1315
-rect 0 1271 462 1281
+rect 0 1311 462 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 462 1311
+rect 0 1271 462 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 105 683
@@ -201,19 +203,19 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 191 592 191 592 1 B
 port 1 n
 rlabel metal1 55 666 55 666 1 A
 port 2 n
 rlabel metal1 311 444 311 444 1 Y
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__and2_4.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__and2_4.mag
index eeb5e0f..2ecaf34 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__and2_4.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__and2_4.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861536
+timestamp 1606864590
+<< checkpaint >>
+rect -1209 -1243 1753 2575
 << nwell >>
 rect -9 581 638 1341
 << nmos >>
@@ -162,12 +164,12 @@
 rect 173 468 207 502
 rect 269 370 303 404
 << locali >>
-rect 0 1315 638 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 638 1315
+rect 0 1311 638 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 638 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -202,43 +204,43 @@
 rect 465 115 499 131
 rect 551 267 585 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 37 649 71 683
 rect 173 575 207 609
 rect 293 501 327 535
 rect 465 501 499 535
 rect 293 279 327 313
 rect 465 279 499 313
-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 1315 638 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 638 1315
-rect 0 1271 638 1281
+rect 0 1311 638 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 638 1311
+rect 0 1271 638 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 105 683
@@ -263,20 +265,20 @@
 rect 499 279 511 313
 rect 281 273 339 279
 rect 453 273 511 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 55 666 55 666 1 A
 port 2 n
 rlabel metal1 191 592 191 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__and2_6.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__and2_6.mag
index c5e7bb0..f02d284 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__and2_6.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__and2_6.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1600380937
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 581 814 1341
 << nmos >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__and2_8.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__and2_8.mag
index 48e39b4..baaaa4a 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__and2_8.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__and2_8.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861577
+timestamp 1606864590
+<< checkpaint >>
+rect -1209 -1243 2161 2575
 << nwell >>
 rect -9 581 990 1341
 << nmos >>
@@ -245,15 +247,15 @@
 rect 173 468 207 502
 rect 269 370 303 404
 << locali >>
-rect 0 1315 990 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 990 1315
+rect 0 1311 990 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 990 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -304,30 +306,30 @@
 rect 809 115 843 131
 rect 895 267 929 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
 rect 37 649 71 683
 rect 173 575 207 609
 rect 293 501 327 535
@@ -338,31 +340,31 @@
 rect 465 279 499 313
 rect 637 279 671 313
 rect 809 279 843 313
-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 1315 990 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 990 1315
-rect 0 1271 990 1281
+rect 0 1311 990 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 990 1311
+rect 0 1271 990 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 105 683
@@ -402,23 +404,23 @@
 rect 453 273 511 279
 rect 625 273 683 279
 rect 797 273 855 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 191 592 191 592 1 B
 port 1 n
 rlabel metal1 55 666 55 666 1 A
 port 2 n
 rlabel metal1 311 444 311 444 1 Y
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__and2_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__and2_l.mag
index 692b3eb..e2b62d6 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__and2_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__and2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603992067
+timestamp 1606864590
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
 << nmos >>
@@ -101,10 +103,10 @@
 rect 173 468 207 502
 rect 269 370 303 404
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1271
 rect 121 1201 155 1217
 rect 35 845 69 861
@@ -127,29 +129,29 @@
 rect 193 61 227 131
 rect 293 199 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 37 649 71 683
 rect 173 575 207 609
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 105 683
@@ -167,18 +169,18 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 55 666 55 666 1 A
 port 2 n
 rlabel metal1 191 592 191 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__ant.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__ant.mag
index be10a79..a008898 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__ant.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__ant.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861735
+timestamp 1606864591
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << nmos >>
@@ -54,9 +56,9 @@
 << polycont >>
 rect 47 501 81 535
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1217
 rect 35 535 69 657
 rect 121 1201 155 1271
@@ -69,31 +71,31 @@
 rect 35 115 69 131
 rect 121 267 155 383
 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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 47 501 81 535
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 35 535 108 541
 rect 35 501 47 535
 rect 81 501 108 535
 rect 35 495 108 501
-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 metal1 64 518 64 518 1 A
 port 1 n
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__antfill.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__antfill.mag
index 2fd23c4..17bb3d2 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__antfill.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__antfill.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861660
+timestamp 1606864590
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << psubdiff >>
@@ -15,9 +17,9 @@
 << nsubdiffcont >>
 rect 51 1271 85 1305
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 535 69 1217
 rect 121 641 155 1271
 rect 31 501 47 535
@@ -26,31 +28,31 @@
 rect 35 383 155 417
 rect 35 115 69 383
 rect 121 115 155 383
-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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 47 501 81 535
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 35 535 108 541
 rect 35 501 47 535
 rect 81 501 108 535
 rect 35 495 108 501
-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 metal1 64 518 64 518 1 A
 port 1 n
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__aoi21_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__aoi21_l.mag
index 703f8a0..c4c7b21 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__aoi21_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__aoi21_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861837
+timestamp 1606864591
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
 << nmos >>
@@ -104,10 +106,10 @@
 rect 146 434 180 468
 rect 289 355 323 389
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 845 155 861
@@ -131,30 +133,30 @@
 rect 193 115 227 131
 rect 291 199 325 215
 rect 291 61 325 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 60 649 94 683
 rect 128 575 162 609
 rect 216 501 250 535
 rect 293 427 327 461
 rect 193 279 227 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 48 683 106 689
 rect 48 649 60 683
 rect 94 649 128 683
@@ -176,14 +178,12 @@
 rect 181 279 193 313
 rect 227 279 327 313
 rect 181 273 239 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 77 666 77 666 1 A0
 port 1 n
 rlabel metal1 233 518 233 518 1 B0
@@ -192,4 +192,6 @@
 port 3 n
 rlabel metal1 145 592 145 592 1 A1
 port 4 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__aoi22_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__aoi22_l.mag
index 347122a..887c10d 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__aoi22_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__aoi22_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603913306
+timestamp 1606864591
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 462 1341
 << nmos >>
@@ -126,11 +128,11 @@
 rect 234 363 268 397
 rect 370 428 404 462
 << locali >>
-rect 0 1315 462 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 462 1315
+rect 0 1311 462 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 462 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 845 155 861
@@ -159,37 +161,37 @@
 rect 200 115 234 131
 rect 365 267 399 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 60 649 94 683
 rect 128 575 162 609
 rect 216 501 250 535
 rect 370 428 404 462
 rect 302 353 336 387
 rect 200 279 234 313
-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 1315 462 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 462 1315
-rect 0 1271 462 1281
+rect 0 1311 462 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 462 1311
+rect 0 1271 462 1277
 rect 48 683 106 689
 rect 48 649 60 683
 rect 94 649 128 683
@@ -215,14 +217,13 @@
 rect 188 279 200 313
 rect 234 279 338 313
 rect 188 273 246 279
-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 77 666 77 666 1 A0
 port 1 n
 rlabel metal1 233 518 233 518 1 B0
@@ -232,5 +233,6 @@
 rlabel viali 387 445 387 445 1 B1
 rlabel metal1 321 340 321 340 1 Y
 port 3 n
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__buf_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__buf_1.mag
index 9c1d956..f536d74 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__buf_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__buf_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861870
+timestamp 1606864591
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 288 1341
 << nmos >>
@@ -83,10 +85,10 @@
 rect 110 479 144 513
 rect 176 370 210 404
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -104,28 +106,28 @@
 rect 121 61 155 131
 rect 207 267 241 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 110 649 144 683
 rect 207 575 241 609
 rect 207 279 241 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 98 683 156 689
 rect 64 649 110 683
 rect 144 649 156 683
@@ -139,16 +141,16 @@
 rect 195 279 207 313
 rect 241 279 253 313
 rect 195 273 253 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 127 666 127 666 1 A
 port 1 n
 rlabel metal1 213 455 213 455 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__buf_2.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__buf_2.mag
index df6985f..5953f64 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__buf_2.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__buf_2.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861892
+timestamp 1606864591
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 376 1341
 << nmos >>
@@ -100,10 +102,10 @@
 rect 110 479 144 513
 rect 176 370 210 404
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -125,28 +127,28 @@
 rect 207 115 241 131
 rect 293 267 327 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 110 649 144 683
 rect 207 575 241 609
 rect 207 279 241 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 98 683 156 689
 rect 64 649 110 683
 rect 144 649 156 683
@@ -160,16 +162,16 @@
 rect 195 279 207 313
 rect 241 279 253 313
 rect 195 273 253 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 127 666 127 666 1 A
 port 1 n
 rlabel metal1 211 454 211 454 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__buf_4.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__buf_4.mag
index d4f6f73..21efee1 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__buf_4.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__buf_4.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861950
+timestamp 1606864592
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 552 1341
 << nmos >>
@@ -138,11 +140,11 @@
 rect 110 479 144 513
 rect 176 370 210 404
 << locali >>
-rect 0 1315 550 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 550 1315
+rect 0 1311 550 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 550 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -174,36 +176,36 @@
 rect 379 115 413 131
 rect 465 267 499 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 110 649 144 683
 rect 207 575 241 609
 rect 379 575 413 609
 rect 207 279 241 313
 rect 379 279 413 313
-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 1315 550 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 550 1315
-rect 0 1271 550 1281
+rect 0 1311 550 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 550 1311
+rect 0 1271 550 1277
 rect 98 683 156 689
 rect 64 649 110 683
 rect 144 649 156 683
@@ -224,17 +226,17 @@
 rect 413 279 425 313
 rect 195 273 253 279
 rect 367 273 425 279
-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 metal1 127 666 127 666 1 A
 port 1 n
 rlabel metal1 211 454 211 454 1 Y
 port 2 n
-rlabel viali 68 1288 68 1288 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__buf_6.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__buf_6.mag
index 034f166..259b3ea 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__buf_6.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__buf_6.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598479240
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 581 728 1341
 << nmos >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__buf_8.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__buf_8.mag
index 32ee407..795d1ad 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__buf_8.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__buf_8.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862056
+timestamp 1606864592
+<< checkpaint >>
+rect -1209 -1243 2025 2575
 << nwell >>
 rect -9 581 904 1341
 << nmos >>
@@ -221,14 +223,14 @@
 rect 110 479 144 513
 rect 176 370 210 404
 << locali >>
-rect 0 1315 902 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 902 1315
+rect 0 1311 902 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 902 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -274,27 +276,27 @@
 rect 723 115 757 131
 rect 809 267 843 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
 rect 110 649 144 683
 rect 207 575 241 609
 rect 379 575 413 609
@@ -304,28 +306,28 @@
 rect 379 279 413 313
 rect 551 279 585 313
 rect 723 279 757 313
-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 1315 902 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 902 1315
-rect 0 1271 902 1281
+rect 0 1311 902 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 902 1311
+rect 0 1271 902 1277
 rect 98 683 156 689
 rect 64 649 110 683
 rect 144 649 156 683
@@ -360,20 +362,20 @@
 rect 367 273 425 279
 rect 539 273 597 279
 rect 711 273 769 279
-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 metal1 127 666 127 666 1 A
 port 1 n
 rlabel metal1 211 454 211 454 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__buf_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__buf_l.mag
index 57b4310..f8d74ee 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__buf_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__buf_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862077
+timestamp 1606864592
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 288 1341
 << nmos >>
@@ -83,10 +85,10 @@
 rect 110 479 144 513
 rect 176 370 210 404
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1217
 rect 35 404 69 861
 rect 121 1201 155 1271
@@ -104,28 +106,28 @@
 rect 121 61 155 131
 rect 207 199 241 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 110 649 144 683
 rect 207 575 241 609
 rect 207 279 241 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 98 683 156 689
 rect 64 649 110 683
 rect 144 649 156 683
@@ -139,16 +141,16 @@
 rect 195 279 207 313
 rect 241 279 253 313
 rect 195 273 253 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 127 666 127 666 1 A
 port 1 n
 rlabel metal1 214 452 214 452 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__decap_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__decap_1.mag
index df91fcf..43d00a1 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__decap_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__decap_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862105
+timestamp 1606864592
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << nmos >>
@@ -47,9 +49,9 @@
 rect 80 451 110 817
 rect 80 80 110 115
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 845 69 861
 rect 121 1201 155 1271
@@ -58,24 +60,24 @@
 rect 35 61 69 131
 rect 121 403 155 419
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
+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 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__decap_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__decap_l.mag
index b23bb5b..7b3de16 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__decap_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__decap_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862119
+timestamp 1606864593
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << nmos >>
@@ -47,9 +49,9 @@
 rect 80 315 110 1017
 rect 80 80 110 115
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 1049 69 1065
 rect 121 1201 155 1271
@@ -58,24 +60,24 @@
 rect 35 61 69 131
 rect 121 267 155 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
+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 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__dff_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__dff_1.mag
index c74e996..82e7d1a 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__dff_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__dff_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862204
+timestamp 1606864593
+<< checkpaint >>
+rect -1209 -1243 2569 2575
 << nwell >>
 rect -9 581 1456 1341
 << nmos >>
@@ -366,18 +368,18 @@
 rect 1323 462 1357 496
 rect 1018 353 1052 387
 << locali >>
-rect 0 1315 1452 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 1003 1315
-rect 1037 1271 1139 1315
-rect 1173 1271 1275 1315
-rect 1309 1271 1452 1315
+rect 0 1311 1452 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 1003 1311
+rect 1037 1271 1139 1311
+rect 1173 1271 1275 1311
+rect 1309 1271 1452 1311
 rect 40 1201 74 1217
 rect 17 657 40 669
 rect 126 1201 160 1271
@@ -481,39 +483,39 @@
 rect 1292 61 1326 131
 rect 1378 267 1412 286
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
-rect 1003 1305 1037 1315
-rect 1003 1281 1037 1305
-rect 1139 1305 1173 1315
-rect 1139 1281 1173 1305
-rect 1275 1305 1309 1315
-rect 1275 1281 1309 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
+rect 1003 1305 1037 1311
+rect 1003 1277 1037 1305
+rect 1139 1305 1173 1311
+rect 1139 1277 1173 1305
+rect 1275 1305 1309 1311
+rect 1275 1277 1309 1305
 rect 40 353 74 387
 rect 253 501 287 535
 rect 181 427 215 461
@@ -528,40 +530,40 @@
 rect 1206 575 1240 609
 rect 1226 421 1260 455
 rect 1018 353 1052 387
-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 1315 1452 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 1003 1315
-rect 1037 1281 1139 1315
-rect 1173 1281 1275 1315
-rect 1309 1281 1452 1315
-rect 0 1271 1452 1281
+rect 0 1311 1452 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 1003 1311
+rect 1037 1277 1139 1311
+rect 1173 1277 1275 1311
+rect 1309 1277 1452 1311
+rect 0 1271 1452 1277
 rect 1366 683 1424 689
 rect 1343 649 1378 683
 rect 1412 649 1424 683
@@ -605,22 +607,20 @@
 rect 1052 353 1064 387
 rect 523 347 581 353
 rect 1006 347 1064 353
-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 68 45 68 45 1 gnd
-rlabel viali 68 1289 68 1289 1 vdd
 rlabel metal1 198 444 198 444 1 D
 port 1 n
 rlabel metal1 915 518 915 518 1 CK
@@ -629,4 +629,6 @@
 port 4 n
 rlabel metal1 1224 592 1224 592 1 QN
 port 2 n
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 1285 68 1285 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__dff_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__dff_l.mag
index 85b0034..1bb1cc9 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__dff_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__dff_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862260
+timestamp 1606864593
+<< checkpaint >>
+rect -1209 -1243 2569 2575
 << nwell >>
 rect -9 581 1456 1341
 << nmos >>
@@ -366,18 +368,18 @@
 rect 1323 462 1357 496
 rect 1018 353 1052 387
 << locali >>
-rect 0 1315 1452 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 1003 1315
-rect 1037 1271 1139 1315
-rect 1173 1271 1275 1315
-rect 1309 1271 1452 1315
+rect 0 1311 1452 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 1003 1311
+rect 1037 1271 1139 1311
+rect 1173 1271 1275 1311
+rect 1309 1271 1452 1311
 rect 40 1201 74 1217
 rect 17 657 40 669
 rect 126 1201 160 1271
@@ -483,39 +485,39 @@
 rect 1292 61 1326 131
 rect 1378 199 1412 286
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
-rect 1003 1305 1037 1315
-rect 1003 1281 1037 1305
-rect 1139 1305 1173 1315
-rect 1139 1281 1173 1305
-rect 1275 1305 1309 1315
-rect 1275 1281 1309 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
+rect 1003 1305 1037 1311
+rect 1003 1277 1037 1305
+rect 1139 1305 1173 1311
+rect 1139 1277 1173 1305
+rect 1275 1305 1309 1311
+rect 1275 1277 1309 1305
 rect 40 353 74 387
 rect 253 501 287 535
 rect 181 427 215 461
@@ -529,40 +531,40 @@
 rect 1206 575 1240 609
 rect 1226 421 1260 455
 rect 1018 353 1052 387
-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 1315 1452 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 1003 1315
-rect 1037 1281 1139 1315
-rect 1173 1281 1275 1315
-rect 1309 1281 1452 1315
-rect 0 1271 1452 1281
+rect 0 1311 1452 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 1003 1311
+rect 1037 1277 1139 1311
+rect 1173 1277 1275 1311
+rect 1309 1277 1452 1311
+rect 0 1271 1452 1277
 rect 1365 683 1423 689
 rect 1343 649 1377 683
 rect 1411 649 1423 683
@@ -606,22 +608,20 @@
 rect 1052 353 1064 387
 rect 523 347 581 353
 rect 1006 347 1064 353
-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 68 45 68 45 1 gnd
-rlabel viali 68 1289 68 1289 1 vdd
 rlabel metal1 198 444 198 444 1 D
 port 1 n
 rlabel metal1 1394 666 1394 666 1 Q
@@ -630,4 +630,6 @@
 port 3 n
 rlabel metal1 915 518 915 518 1 CK
 port 4 n
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 1285 68 1285 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__dffr_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__dffr_1.mag
index 26780c6..5839bb5 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__dffr_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__dffr_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862408
+timestamp 1606864593
+<< checkpaint >>
+rect -1210 -1243 3112 2575
 << nwell >>
 rect -10 581 1917 1341
 << nmos >>
@@ -465,22 +467,22 @@
 rect 1784 462 1818 496
 rect 1545 301 1579 335
 << locali >>
-rect 0 1315 1914 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1682 1315
-rect 1716 1271 1818 1315
-rect 1852 1271 1914 1315
+rect 0 1311 1914 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1682 1311
+rect 1716 1271 1818 1311
+rect 1852 1271 1914 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -609,51 +611,51 @@
 rect 1753 61 1787 131
 rect 1839 199 1873 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
-rect 1682 1305 1716 1315
-rect 1682 1281 1716 1305
-rect 1818 1305 1852 1315
-rect 1818 1281 1852 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
+rect 1682 1305 1716 1311
+rect 1682 1277 1716 1305
+rect 1818 1305 1852 1311
+rect 1818 1277 1852 1305
 rect 47 649 81 683
 rect 311 353 345 387
 rect 229 301 263 313
@@ -672,52 +674,52 @@
 rect 1409 353 1443 387
 rect 1545 301 1579 313
 rect 1545 279 1579 301
-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 1315 1914 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1682 1315
-rect 1716 1281 1818 1315
-rect 1852 1281 1914 1315
-rect 0 1271 1914 1281
+rect 0 1311 1914 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1682 1311
+rect 1716 1277 1818 1311
+rect 1852 1277 1914 1311
+rect 0 1271 1914 1277
 rect 35 683 93 689
 rect 1826 683 1884 689
 rect 35 649 47 683
@@ -772,30 +774,26 @@
 rect 1579 279 1591 313
 rect 217 273 275 279
 rect 1533 273 1591 279
-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 metal1 65 666 65 666 1 RN
 port 1 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1288 67 1288 1 vdd
-rlabel viali 67 1288 67 1288 1 vdd
 rlabel metal1 573 444 573 444 1 D
 port 2 n
 rlabel metal1 1290 518 1290 518 1 CK
@@ -804,4 +802,6 @@
 port 4 n
 rlabel metal1 1685 592 1685 592 1 QN
 port 5 n
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__dffr_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__dffr_l.mag
index 3823a9f..06e7502 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__dffr_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__dffr_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862567
+timestamp 1606864593
+<< checkpaint >>
+rect -1210 -1243 3112 2575
 << nwell >>
 rect -10 581 1917 1341
 << nmos >>
@@ -465,22 +467,22 @@
 rect 1784 462 1818 496
 rect 1545 301 1579 335
 << locali >>
-rect 0 1315 1914 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1682 1315
-rect 1716 1271 1818 1315
-rect 1852 1271 1914 1315
+rect 0 1311 1914 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1682 1311
+rect 1716 1271 1818 1311
+rect 1852 1271 1914 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -609,51 +611,51 @@
 rect 1753 61 1787 131
 rect 1839 199 1873 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
-rect 1682 1305 1716 1315
-rect 1682 1281 1716 1305
-rect 1818 1305 1852 1315
-rect 1818 1281 1852 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
+rect 1682 1305 1716 1311
+rect 1682 1277 1716 1305
+rect 1818 1305 1852 1311
+rect 1818 1277 1852 1305
 rect 47 649 81 683
 rect 311 353 345 387
 rect 229 301 263 313
@@ -672,52 +674,52 @@
 rect 1409 353 1443 387
 rect 1545 301 1579 313
 rect 1545 279 1579 301
-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 1315 1914 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1682 1315
-rect 1716 1281 1818 1315
-rect 1852 1281 1914 1315
-rect 0 1271 1914 1281
+rect 0 1311 1914 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1682 1311
+rect 1716 1277 1818 1311
+rect 1852 1277 1914 1311
+rect 0 1271 1914 1277
 rect 35 683 93 689
 rect 1826 683 1884 689
 rect 35 649 47 683
@@ -772,30 +774,26 @@
 rect 1579 279 1591 313
 rect 217 273 275 279
 rect 1533 273 1591 279
-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 metal1 65 666 65 666 1 RN
 port 1 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1288 67 1288 1 vdd
-rlabel viali 67 1288 67 1288 1 vdd
 rlabel metal1 573 444 573 444 1 D
 port 2 n
 rlabel metal1 1290 518 1290 518 1 CK
@@ -804,4 +802,6 @@
 port 4 n
 rlabel metal1 1685 592 1685 592 1 QN
 port 5 n
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__dffs_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__dffs_1.mag
index 8269e64..5058386 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__dffs_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__dffs_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862672
+timestamp 1606864593
+<< checkpaint >>
+rect -1210 -1243 2840 2575
 << nwell >>
 rect -10 581 1741 1341
 << nmos >>
@@ -420,20 +422,20 @@
 rect 1594 462 1628 496
 rect 1355 301 1389 335
 << locali >>
-rect 0 1315 1738 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1738 1315
+rect 0 1311 1738 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1738 1311
 rect 35 1201 69 1271
 rect 35 913 69 929
 rect 121 1201 155 1217
@@ -544,45 +546,45 @@
 rect 1563 61 1597 131
 rect 1649 199 1683 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
 rect 47 279 81 313
 rect 121 353 155 387
 rect 438 501 472 535
@@ -599,46 +601,46 @@
 rect 1203 353 1237 387
 rect 1355 301 1389 313
 rect 1355 279 1389 301
-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 1315 1738 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1738 1315
-rect 0 1271 1738 1281
+rect 0 1311 1738 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1738 1311
+rect 0 1271 1738 1277
 rect 1636 683 1694 689
 rect 1614 649 1648 683
 rect 1682 649 1694 683
@@ -689,24 +691,22 @@
 rect 1389 279 1401 313
 rect 35 273 93 279
 rect 1343 273 1401 279
-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 67 44 67 44 1 gnd
-rlabel viali 67 1288 67 1288 1 vdd
 rlabel viali 383 444 383 444 1 D
 port 1 n
 rlabel viali 1100 518 1100 518 1 CK
@@ -716,4 +716,6 @@
 rlabel viali 1495 592 1495 592 1 QN
 port 3 n
 rlabel viali 64 296 64 296 1 SN
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__dffs_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__dffs_l.mag
index 13db3bc..6bb4f01 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__dffs_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__dffs_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862745
+timestamp 1606864594
+<< checkpaint >>
+rect -1210 -1243 2840 2575
 << nwell >>
 rect -10 581 1741 1341
 << nmos >>
@@ -420,20 +422,20 @@
 rect 1594 462 1628 496
 rect 1355 301 1389 335
 << locali >>
-rect 0 1315 1738 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1738 1315
+rect 0 1311 1738 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1738 1311
 rect 35 1201 69 1271
 rect 35 913 69 929
 rect 121 1201 155 1217
@@ -544,45 +546,45 @@
 rect 1563 61 1597 131
 rect 1649 199 1683 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
 rect 47 279 81 313
 rect 121 353 155 387
 rect 438 501 472 535
@@ -599,46 +601,46 @@
 rect 1203 353 1237 387
 rect 1355 301 1389 313
 rect 1355 279 1389 301
-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 1315 1738 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1738 1315
-rect 0 1271 1738 1281
+rect 0 1311 1738 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1738 1311
+rect 0 1271 1738 1277
 rect 1636 683 1694 689
 rect 1614 649 1648 683
 rect 1682 649 1694 683
@@ -689,24 +691,22 @@
 rect 1389 279 1401 313
 rect 35 273 93 279
 rect 1343 273 1401 279
-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 67 44 67 44 1 gnd
-rlabel viali 67 1288 67 1288 1 vdd
 rlabel viali 383 444 383 444 1 D
 port 1 n
 rlabel viali 1100 518 1100 518 1 CK
@@ -716,4 +716,6 @@
 rlabel viali 1495 592 1495 592 1 QN
 port 3 n
 rlabel viali 64 296 64 296 1 SN
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__dffsr_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__dffsr_1.mag
index 36f64e9..d95e25d 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__dffsr_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__dffsr_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863488
+timestamp 1606864594
+<< checkpaint >>
+rect -1210 -1243 3248 2575
 << nwell >>
 rect -10 581 2090 1341
 << nmos >>
@@ -526,23 +528,23 @@
 rect 1956 462 1990 496
 rect 1755 301 1789 335
 << locali >>
-rect 0 1315 2090 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1682 1315
-rect 1716 1271 1818 1315
-rect 1852 1271 1954 1315
-rect 1988 1271 2090 1315
+rect 0 1311 2090 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1682 1311
+rect 1716 1271 1818 1311
+rect 1852 1271 1954 1311
+rect 1988 1271 2090 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -683,54 +685,54 @@
 rect 1925 61 1959 131
 rect 2011 267 2045 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
-rect 1682 1305 1716 1315
-rect 1682 1281 1716 1305
-rect 1818 1305 1852 1315
-rect 1818 1281 1852 1305
-rect 1954 1305 1988 1315
-rect 1954 1281 1988 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
+rect 1682 1305 1716 1311
+rect 1682 1277 1716 1305
+rect 1818 1305 1852 1311
+rect 1818 1277 1852 1305
+rect 1954 1305 1988 1311
+rect 1954 1277 1988 1305
 rect 47 649 81 683
 rect 325 575 359 609
 rect 325 353 359 387
@@ -752,55 +754,55 @@
 rect 1502 353 1536 387
 rect 1755 301 1789 313
 rect 1755 279 1789 301
-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 1315 2090 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1682 1315
-rect 1716 1281 1818 1315
-rect 1852 1281 1954 1315
-rect 1988 1281 2090 1315
-rect 0 1271 2090 1281
+rect 0 1311 2090 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1682 1311
+rect 1716 1277 1818 1311
+rect 1852 1277 1954 1311
+rect 1988 1277 2090 1311
+rect 0 1271 2090 1277
 rect 35 683 93 689
 rect 1999 683 2057 689
 rect 35 649 47 683
@@ -862,24 +864,24 @@
 rect 1789 279 1801 313
 rect 217 273 275 279
 rect 1743 273 1801 279
-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 metal1 659 444 659 444 1 D
 port 1 n
@@ -893,6 +895,6 @@
 port 5 n
 rlabel metal1 2028 666 2028 666 1 Q
 port 6 n
-rlabel viali 67 1288 67 1288 1 vdd
-rlabel viali 67 44 67 44 1 gnd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__dffsr_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__dffsr_l.mag
index 2c91159..1de3dcd 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__dffsr_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__dffsr_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863586
+timestamp 1606864594
+<< checkpaint >>
+rect -1210 -1243 3248 2575
 << nwell >>
 rect -10 581 2090 1341
 << nmos >>
@@ -524,23 +526,23 @@
 rect 1956 462 1990 496
 rect 1755 301 1789 335
 << locali >>
-rect 0 1315 2090 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1682 1315
-rect 1716 1271 1818 1315
-rect 1852 1271 1954 1315
-rect 1988 1271 2090 1315
+rect 0 1311 2090 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1682 1311
+rect 1716 1271 1818 1311
+rect 1852 1271 1954 1311
+rect 1988 1271 2090 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -683,54 +685,54 @@
 rect 1925 61 1959 131
 rect 2011 199 2045 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
-rect 1682 1305 1716 1315
-rect 1682 1281 1716 1305
-rect 1818 1305 1852 1315
-rect 1818 1281 1852 1305
-rect 1954 1305 1988 1315
-rect 1954 1281 1988 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
+rect 1682 1305 1716 1311
+rect 1682 1277 1716 1305
+rect 1818 1305 1852 1311
+rect 1818 1277 1852 1305
+rect 1954 1305 1988 1311
+rect 1954 1277 1988 1305
 rect 47 649 81 683
 rect 325 575 359 609
 rect 325 353 359 387
@@ -751,55 +753,55 @@
 rect 1502 353 1536 387
 rect 1755 301 1789 313
 rect 1755 279 1789 301
-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 1315 2090 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1682 1315
-rect 1716 1281 1818 1315
-rect 1852 1281 1954 1315
-rect 1988 1281 2090 1315
-rect 0 1271 2090 1281
+rect 0 1311 2090 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1682 1311
+rect 1716 1277 1818 1311
+rect 1852 1277 1954 1311
+rect 1988 1277 2090 1311
+rect 0 1271 2090 1277
 rect 35 683 93 689
 rect 1998 683 2056 689
 rect 35 649 47 683
@@ -861,24 +863,24 @@
 rect 1789 279 1801 313
 rect 217 273 275 279
 rect 1743 273 1801 279
-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 metal1 659 444 659 444 1 D
 port 1 n
@@ -892,6 +894,6 @@
 port 5 n
 rlabel metal1 65 666 65 666 1 RN
 port 6 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1288 67 1288 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__fill_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__fill_1.mag
index 95c509c..8d5ce0c 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__fill_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__fill_1.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548551
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << error_p >>
 rect 0 1271 34 1332
 rect 41 581 154 1341
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__fill_16.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__fill_16.mag
index 0359d8e..877376a 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__fill_16.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__fill_16.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548584
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 581 355 1341
 << locali >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__fill_2.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__fill_2.mag
index 6563ebf..65e2cf3 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__fill_2.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__fill_2.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548559
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << error_p >>
 rect 0 1271 44 1332
 rect 50 581 161 1341
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__fill_32.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__fill_32.mag
index 6fa9b88..bcb8614 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__fill_32.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__fill_32.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548594
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 581 707 1341
 << locali >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__fill_4.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__fill_4.mag
index 0304d99..b47e23b 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__fill_4.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__fill_4.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548567
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << error_p >>
 rect 96 581 159 1341
 << nwell >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__fill_8.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__fill_8.mag
index c59d34e..024779e 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__fill_8.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__fill_8.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548573
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 581 179 1341
 << locali >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__inv_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__inv_1.mag
index 00eb835..59fe6c3 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__inv_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__inv_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863700
+timestamp 1606864596
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << nmos >>
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -68,22 +70,22 @@
 rect 35 61 69 131
 rect 121 267 155 279
 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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 121 279 155 313
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -97,15 +99,15 @@
 rect 109 279 121 313
 rect 155 279 167 313
 rect 109 273 167 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 151 441 151 441 1 Y
 port 1 n
 rlabel metal1 64 666 64 666 1 A
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__inv_10.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__inv_10.mag
index 3de166a..87a4f5a 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__inv_10.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__inv_10.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863912
+timestamp 1606864595
+<< checkpaint >>
+rect -1209 -1243 2161 2575
 << nwell >>
 rect -9 581 990 1341
 << nmos >>
@@ -239,15 +241,15 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 990 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 990 1315
+rect 0 1311 990 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 990 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -295,30 +297,30 @@
 rect 809 115 843 131
 rect 895 267 929 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 293 575 327 609
@@ -330,31 +332,31 @@
 rect 465 279 499 313
 rect 637 279 671 313
 rect 809 279 843 313
-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 1315 990 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 990 1315
-rect 0 1271 990 1281
+rect 0 1311 990 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 990 1311
+rect 0 1271 990 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -396,21 +398,21 @@
 rect 453 273 511 279
 rect 625 273 683 279
 rect 797 273 855 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 152 440 152 440 1 Y
 port 1 n
 rlabel metal1 64 665 64 665 1 A
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__inv_2.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__inv_2.mag
index aacaf53..0937d08 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__inv_2.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__inv_2.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863719
+timestamp 1606864596
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 287 1341
 << nmos >>
@@ -80,10 +82,10 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -99,28 +101,28 @@
 rect 121 115 155 131
 rect 207 267 241 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 121 279 155 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -134,16 +136,16 @@
 rect 109 279 121 313
 rect 155 279 167 313
 rect 109 273 167 279
-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 440 152 440 1 Y
 port 1 n
 rlabel metal1 64 665 64 665 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__inv_3.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__inv_3.mag
index f6d9bf9..5f717a5 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__inv_3.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__inv_3.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863791
+timestamp 1606864596
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 375 1341
 << nmos >>
@@ -96,10 +98,10 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -119,30 +121,30 @@
 rect 207 61 241 131
 rect 293 267 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 293 575 327 609
 rect 121 279 155 313
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -163,16 +165,16 @@
 rect 327 279 339 313
 rect 109 273 167 279
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 152 440 152 440 1 Y
 port 1 n
 rlabel metal1 64 665 64 665 1 A
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__inv_4.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__inv_4.mag
index b57611f..04eb4e5 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__inv_4.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__inv_4.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863747
+timestamp 1606864596
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 463 1341
 << nmos >>
@@ -118,11 +120,11 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 462 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 462 1315
+rect 0 1311 462 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 462 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -146,36 +148,36 @@
 rect 293 115 327 131
 rect 379 267 413 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 293 575 327 609
 rect 121 279 155 313
 rect 293 279 327 313
-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 1315 462 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 462 1315
-rect 0 1271 462 1281
+rect 0 1311 462 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 462 1311
+rect 0 1271 462 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -196,17 +198,17 @@
 rect 327 279 339 313
 rect 109 273 167 279
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 64 665 64 665 1 A
 port 1 n
 rlabel metal1 152 440 152 440 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__inv_6.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__inv_6.mag
index 30f5bef..1c1a4eb 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__inv_6.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__inv_6.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863829
+timestamp 1606864596
+<< checkpaint >>
+rect -1209 -1243 1753 2575
 << nwell >>
 rect -9 581 639 1341
 << nmos >>
@@ -157,12 +159,12 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 638 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 638 1315
+rect 0 1311 638 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 638 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -194,21 +196,21 @@
 rect 465 115 499 131
 rect 551 267 585 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 293 575 327 609
@@ -216,22 +218,22 @@
 rect 121 279 155 313
 rect 293 279 327 313
 rect 465 279 499 313
-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 1315 638 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 638 1315
-rect 0 1271 638 1281
+rect 0 1311 638 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 638 1311
+rect 0 1271 638 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -259,18 +261,18 @@
 rect 109 273 167 279
 rect 281 273 339 279
 rect 453 273 511 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 64 665 64 665 1 A
 port 1 n
 rlabel metal1 152 440 152 440 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__inv_8.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__inv_8.mag
index 1c93fdd..9b5d559 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__inv_8.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__inv_8.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863864
+timestamp 1606864596
+<< checkpaint >>
+rect -1209 -1243 1889 2575
 << nwell >>
 rect -9 581 814 1341
 << nmos >>
@@ -195,13 +197,13 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 814 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 814 1315
+rect 0 1311 814 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 814 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -241,24 +243,24 @@
 rect 637 115 671 131
 rect 723 267 757 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 293 575 327 609
@@ -268,25 +270,25 @@
 rect 293 279 327 313
 rect 465 279 499 313
 rect 637 279 671 313
-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 1315 814 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 814 1315
-rect 0 1271 814 1281
+rect 0 1311 814 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 814 1311
+rect 0 1271 814 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -321,19 +323,19 @@
 rect 281 273 339 279
 rect 453 273 511 279
 rect 625 273 683 279
-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 viali 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 152 440 152 440 1 Y
 port 1 n
 rlabel metal1 64 665 64 665 1 A
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__inv_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__inv_l.mag
index 3b130c2..2075ffd 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__inv_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__inv_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863931
+timestamp 1606864597
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << nmos >>
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 913 69 929
 rect 121 1201 155 1217
@@ -68,22 +70,22 @@
 rect 35 61 69 131
 rect 121 199 155 279
 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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 121 279 155 313
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -97,15 +99,15 @@
 rect 109 279 121 313
 rect 155 279 167 313
 rect 109 273 167 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 64 666 64 666 1 A
 port 1 n
 rlabel metal1 151 441 151 441 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__mux2_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__mux2_1.mag
index f8971c5..5871dea 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__mux2_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__mux2_1.mag
@@ -1,7 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864309
+timestamp 1606864597
+<< checkpaint >>
+rect -801 1315 1753 2575
+rect -1209 -1243 1753 1315
 << nwell >>
 rect -9 581 553 1341
 << nmos >>
@@ -120,9 +123,9 @@
 rect 37 444 71 478
 rect 168 353 202 387
 << locali >>
-rect 0 1315 550 1332
-rect 0 1271 459 1315
-rect 493 1271 550 1315
+rect 0 1311 550 1332
+rect 0 1271 459 1311
+rect 493 1271 550 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -154,33 +157,33 @@
 rect 311 115 345 131
 rect 397 267 431 501
 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 1305 493 1315
-rect 459 1281 493 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 37 649 71 683
 rect 236 575 270 609
 rect 311 427 345 461
 rect 397 501 431 535
 rect 311 279 345 313
-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 1315 550 1332
-rect 0 1281 459 1315
-rect 493 1281 550 1315
-rect 0 1271 550 1281
+rect 0 1311 550 1332
+rect 0 1277 459 1311
+rect 493 1277 550 1311
+rect 0 1271 550 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 117 683
@@ -202,24 +205,22 @@
 rect 299 279 311 313
 rect 345 279 357 313
 rect 299 273 357 279
-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 metal1 54 666 54 666 1 S0
 port 1 n
 rlabel metal1 328 444 328 444 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 476 1288 476 1288 1 vdd
-rlabel viali 476 1288 476 1288 1 vdd
 rlabel metal1 253 592 253 592 1 A0
 port 3 n
 rlabel metal1 414 518 414 518 1 A1
 port 4 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 476 1284 476 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__nand2_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__nand2_1.mag
index 7bd22f0..c9ee6a4 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__nand2_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__nand2_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864337
+timestamp 1606864597
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 286 1341
 << nmos >>
@@ -77,10 +79,10 @@
 rect 47 520 81 554
 rect 166 427 200 461
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -96,29 +98,29 @@
 rect 35 115 69 131
 rect 193 267 227 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 47 649 81 683
 rect 121 501 155 535
 rect 195 575 229 609
 rect 35 279 69 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 115 683
@@ -136,18 +138,18 @@
 rect 23 279 35 313
 rect 69 279 155 313
 rect 23 273 81 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 136 470 136 470 1 Y
 port 1 n
 rlabel metal1 64 666 64 666 1 A
 port 2 n
 rlabel metal1 212 592 212 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__nand2_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__nand2_l.mag
index dac9058..d58b468 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__nand2_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__nand2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864354
+timestamp 1606864597
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 286 1341
 << nmos >>
@@ -77,10 +79,10 @@
 rect 47 520 81 554
 rect 166 370 200 404
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1271
 rect 35 913 69 929
 rect 121 1201 155 1217
@@ -96,29 +98,29 @@
 rect 35 115 69 131
 rect 193 199 227 215
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 47 649 81 683
 rect 121 501 155 535
 rect 195 575 229 609
 rect 35 279 69 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 115 683
@@ -136,18 +138,18 @@
 rect 23 279 35 313
 rect 69 279 155 313
 rect 23 273 81 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 136 470 136 470 1 Y
 port 1 n
 rlabel metal1 212 592 212 592 1 B
 port 2 n
 rlabel metal1 64 666 64 666 1 A
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__nor2_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__nor2_1.mag
index eb01d47..79aa4e2 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__nor2_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__nor2_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864375
+timestamp 1606864597
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 286 1341
 << nmos >>
@@ -77,10 +79,10 @@
 rect 181 534 215 568
 rect 66 401 100 435
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1217
 rect 193 1201 227 1271
 rect 193 777 227 793
@@ -96,29 +98,29 @@
 rect 121 115 155 131
 rect 207 267 241 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 181 649 215 683
 rect 35 501 69 535
 rect 113 575 147 609
 rect 121 279 155 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 169 683 227 689
 rect 148 649 181 683
 rect 215 649 227 683
@@ -136,18 +138,18 @@
 rect 109 279 121 313
 rect 155 279 167 313
 rect 109 273 167 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 137 393 137 393 1 Y
 port 1 n
 rlabel metal1 130 592 130 592 1 B
 port 2 n
 rlabel metal1 198 666 198 666 1 A
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__nor2_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__nor2_l.mag
index 0da0e64..73884c4 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__nor2_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__nor2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864393
+timestamp 1606864598
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 286 1341
 << nmos >>
@@ -77,10 +79,10 @@
 rect 181 534 215 568
 rect 66 401 100 435
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1217
 rect 35 535 69 861
 rect 193 1201 227 1271
@@ -96,29 +98,29 @@
 rect 121 115 155 131
 rect 207 199 241 215
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 181 649 215 683
 rect 35 501 69 535
 rect 113 575 147 609
 rect 121 279 155 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 169 683 227 689
 rect 148 649 181 683
 rect 215 649 227 683
@@ -136,18 +138,18 @@
 rect 109 279 121 313
 rect 155 279 167 313
 rect 109 273 167 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 137 393 137 393 1 Y
 port 1 n
 rlabel metal1 198 666 198 666 1 A
 port 2 n
 rlabel metal1 130 592 130 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__oai21_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__oai21_l.mag
index a9c7c07..31a326d 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__oai21_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__oai21_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864420
+timestamp 1606864598
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
 << nmos >>
@@ -101,10 +103,10 @@
 rect 152 427 186 461
 rect 262 359 296 393
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 193 1201 227 1271
 rect 193 845 227 861
@@ -128,30 +130,30 @@
 rect 207 115 241 131
 rect 293 266 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 66 649 100 683
 rect 162 575 196 609
 rect 223 501 257 535
 rect 291 427 325 461
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 54 683 112 689
 rect 54 649 66 683
 rect 100 649 134 683
@@ -173,14 +175,12 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 83 666 83 666 1 A0
 port 1 n
 rlabel metal1 179 592 179 592 1 A1
@@ -189,4 +189,6 @@
 port 3 n
 rlabel metal1 240 518 240 518 1 B0
 port 4 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__oai22_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__oai22_l.mag
index 7b7cfe1..9e6070c 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__oai22_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__oai22_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603913328
+timestamp 1606864598
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 462 1341
 << nmos >>
@@ -125,11 +127,11 @@
 rect 384 428 418 462
 rect 248 359 282 393
 << locali >>
-rect 0 1315 462 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 462 1315
+rect 0 1311 462 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 462 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 200 1201 234 1217
@@ -160,37 +162,37 @@
 rect 379 199 413 215
 rect 241 131 379 149
 rect 207 115 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 66 649 100 683
 rect 162 575 196 609
 rect 223 501 257 535
 rect 384 428 418 462
 rect 316 353 350 387
 rect 316 279 350 313
-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 1315 462 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 462 1315
-rect 0 1271 462 1281
+rect 0 1311 462 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 462 1311
+rect 0 1271 462 1277
 rect 54 683 112 689
 rect 54 649 66 683
 rect 100 649 134 683
@@ -216,14 +218,13 @@
 rect 304 279 316 313
 rect 350 279 362 313
 rect 304 273 362 279
-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 metal1 240 518 240 518 1 B0
 port 4 n
 rlabel viali 179 592 179 592 1 A1
@@ -233,5 +234,6 @@
 rlabel viali 333 370 333 370 1 Y
 port 3 n
 rlabel viali 401 445 401 445 1 B1
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__or2_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__or2_1.mag
index ec1d592..945e62e 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__or2_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__or2_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864446
+timestamp 1606864598
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
 << nmos >>
@@ -101,10 +103,10 @@
 rect 173 460 207 494
 rect 269 370 303 404
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 207 1201 241 1271
 rect 207 777 241 793
@@ -127,29 +129,29 @@
 rect 207 61 241 131
 rect 293 267 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 37 575 71 609
 rect 173 649 207 683
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 161 683 219 689
 rect 140 649 173 683
 rect 207 649 219 683
@@ -167,18 +169,18 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 190 666 190 666 1 A
 port 2 n
 rlabel metal1 54 592 54 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__or2_2.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__or2_2.mag
index a335a64..9be4858 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__or2_2.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__or2_2.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864470
+timestamp 1606864598
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 462 1341
 << nmos >>
@@ -124,11 +126,11 @@
 rect 173 460 207 494
 rect 269 370 303 404
 << locali >>
-rect 0 1315 462 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 462 1315
+rect 0 1311 462 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 462 1311
 rect 35 1201 69 1217
 rect 207 1201 241 1271
 rect 207 777 241 793
@@ -155,35 +157,35 @@
 rect 293 115 327 131
 rect 379 267 413 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 37 575 71 609
 rect 173 649 207 683
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 462 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 462 1315
-rect 0 1271 462 1281
+rect 0 1311 462 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 462 1311
+rect 0 1271 462 1277
 rect 161 683 219 689
 rect 140 649 173 683
 rect 207 649 219 683
@@ -201,19 +203,19 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 190 666 190 666 1 A
 port 2 n
 rlabel metal1 54 592 54 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__or2_4.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__or2_4.mag
index 33c6a2f..9e02cd8 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__or2_4.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__or2_4.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864501
+timestamp 1606864598
+<< checkpaint >>
+rect -1209 -1243 1753 2575
 << nwell >>
 rect -9 581 638 1341
 << nmos >>
@@ -162,12 +164,12 @@
 rect 173 460 207 494
 rect 269 370 303 404
 << locali >>
-rect 0 1315 638 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 638 1315
+rect 0 1311 638 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 638 1311
 rect 35 1201 69 1217
 rect 207 1201 241 1271
 rect 207 777 241 793
@@ -202,43 +204,43 @@
 rect 465 115 499 131
 rect 551 267 585 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 37 575 71 609
 rect 173 649 207 683
 rect 293 501 327 535
 rect 465 501 499 535
 rect 293 279 327 313
 rect 465 279 499 313
-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 1315 638 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 638 1315
-rect 0 1271 638 1281
+rect 0 1311 638 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 638 1311
+rect 0 1271 638 1277
 rect 161 683 219 689
 rect 140 649 173 683
 rect 207 649 219 683
@@ -263,20 +265,20 @@
 rect 499 279 511 313
 rect 281 273 339 279
 rect 453 273 511 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 190 666 190 666 1 A
 port 2 n
 rlabel metal1 54 592 54 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__or2_8.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__or2_8.mag
index 8494e40..3a1a21e 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__or2_8.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__or2_8.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864544
+timestamp 1606864599
+<< checkpaint >>
+rect -1209 -1243 2161 2575
 << nwell >>
 rect -9 581 990 1341
 << nmos >>
@@ -245,15 +247,15 @@
 rect 173 460 207 494
 rect 269 370 303 404
 << locali >>
-rect 0 1315 990 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 990 1315
+rect 0 1311 990 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 990 1311
 rect 35 1201 69 1217
 rect 207 1201 241 1271
 rect 207 777 241 793
@@ -304,30 +306,30 @@
 rect 809 115 843 131
 rect 895 267 929 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
 rect 37 575 71 609
 rect 173 649 207 683
 rect 293 501 327 535
@@ -338,31 +340,31 @@
 rect 465 279 499 313
 rect 637 279 671 313
 rect 809 279 843 313
-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 1315 990 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 990 1315
-rect 0 1271 990 1281
+rect 0 1311 990 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 990 1311
+rect 0 1271 990 1277
 rect 161 683 219 689
 rect 140 649 173 683
 rect 207 649 219 683
@@ -402,23 +404,23 @@
 rect 453 273 511 279
 rect 625 273 683 279
 rect 797 273 855 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 190 666 190 666 1 A
 port 2 n
 rlabel metal1 54 592 54 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__or2_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__or2_l.mag
index 328163c..7113ca5 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__or2_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__or2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864574
+timestamp 1606864599
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
 << nmos >>
@@ -101,10 +103,10 @@
 rect 173 460 207 494
 rect 269 370 303 404
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 35 743 69 929
 rect 207 1201 241 1271
@@ -127,29 +129,29 @@
 rect 207 61 241 131
 rect 293 199 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 37 575 71 609
 rect 173 649 207 683
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 161 683 219 689
 rect 140 649 173 683
 rect 207 649 219 683
@@ -167,18 +169,18 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 54 592 54 592 1 B
 port 2 n
 rlabel metal1 190 666 190 666 1 A
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__tbufi_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__tbufi_1.mag
index 04fa0cb..4f70cd9 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__tbufi_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__tbufi_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864606
+timestamp 1606864599
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 375 1341
 << nmos >>
@@ -98,10 +100,10 @@
 rect 121 353 155 387
 rect 248 401 282 435
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 709 155 725
@@ -122,29 +124,29 @@
 rect 121 61 155 131
 rect 279 267 313 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 211 649 245 683
 rect 279 501 313 535
 rect 121 353 155 387
 rect 279 279 313 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 199 683 257 689
 rect 177 649 211 683
 rect 245 649 257 683
@@ -166,18 +168,18 @@
 rect 267 279 279 313
 rect 313 279 325 313
 rect 267 273 325 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 305 364 305 364 1 Y
 port 1 n
 rlabel metal1 228 666 228 666 1 A
 port 2 n
 rlabel metal1 138 592 138 592 1 OE
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__tbufi_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__tbufi_l.mag
index 7ef167f..1308bc3 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__tbufi_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__tbufi_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864958
+timestamp 1606864599
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 375 1341
 << nmos >>
@@ -98,10 +100,10 @@
 rect 121 353 155 387
 rect 248 401 282 435
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 35 513 69 861
 rect 121 1201 155 1271
@@ -122,29 +124,29 @@
 rect 121 61 155 131
 rect 279 199 313 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 211 649 245 683
 rect 279 501 313 535
 rect 121 353 155 387
 rect 279 279 313 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 199 683 257 689
 rect 177 649 211 683
 rect 245 649 257 683
@@ -166,18 +168,18 @@
 rect 267 279 279 313
 rect 313 279 325 313
 rect 267 273 325 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 305 364 305 364 1 Y
 port 1 n
 rlabel metal1 228 666 228 666 1 A
 port 2 n
 rlabel metal1 138 592 138 592 1 OE
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__tiehi.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__tiehi.mag
index 6d60b32..04c93aa 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__tiehi.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__tiehi.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865006
+timestamp 1606864599
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << nmos >>
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 383 124 417
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 641 69 657
 rect 121 1201 155 1217
@@ -67,31 +69,31 @@
 rect 35 61 69 131
 rect 121 267 155 383
 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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 121 575 155 609
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 94 609 167 615
 rect 94 575 121 609
 rect 155 575 167 609
 rect 94 569 167 575
-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 68 1288 68 1288 1 vdd
 rlabel metal1 138 592 138 592 1 Y
 port 1 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__tielo.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__tielo.mag
index dc3d4fc..c63213e 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__tielo.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__tielo.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865020
+timestamp 1606864600
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << nmos >>
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 515 124 549
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 641 69 657
 rect 121 1201 155 1217
@@ -67,31 +69,31 @@
 rect 35 61 69 131
 rect 121 267 155 353
 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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 121 353 155 387
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 94 387 167 393
 rect 94 353 121 387
 rect 155 353 167 387
 rect 94 347 167 353
-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 68 1288 68 1288 1 vdd
 rlabel metal1 138 370 138 370 1 Y
 port 1 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__tnbufi_1.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__tnbufi_1.mag
index 3c34a0f..20e703a 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__tnbufi_1.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__tnbufi_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865046
+timestamp 1606864600
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 375 1341
 << nmos >>
@@ -97,10 +99,10 @@
 rect 121 418 155 452
 rect 248 401 282 435
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 709 155 725
@@ -121,29 +123,29 @@
 rect 121 61 155 131
 rect 279 267 313 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 211 649 245 683
 rect 121 575 155 609
 rect 279 501 313 535
 rect 279 279 313 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 199 683 257 689
 rect 177 649 211 683
 rect 245 649 257 683
@@ -161,18 +163,18 @@
 rect 267 279 279 313
 rect 313 279 325 313
 rect 267 273 325 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 305 364 305 364 1 Y
 port 1 n
 rlabel metal1 228 666 228 666 1 A
 port 2 n
 rlabel metal1 138 592 138 592 1 OE
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__tnbufi_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__tnbufi_l.mag
index 48dc5bf..65862b4 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__tnbufi_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__tnbufi_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865067
+timestamp 1606864600
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 375 1341
 << nmos >>
@@ -97,10 +99,10 @@
 rect 121 418 155 452
 rect 248 401 282 435
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 35 452 69 861
 rect 121 1201 155 1271
@@ -121,29 +123,29 @@
 rect 121 61 155 131
 rect 279 199 313 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 211 649 245 683
 rect 121 575 155 609
 rect 279 501 313 535
 rect 279 279 313 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 199 683 257 689
 rect 177 649 211 683
 rect 245 649 257 683
@@ -161,18 +163,18 @@
 rect 267 279 279 313
 rect 313 279 325 313
 rect 267 273 325 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 305 364 305 364 1 Y
 port 1 n
 rlabel metal1 228 666 228 666 1 A
 port 2 n
 rlabel metal1 138 592 138 592 1 OE
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__xnor2_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__xnor2_l.mag
index bf7cab3..f4835ba 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__xnor2_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__xnor2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865125
+timestamp 1606864600
+<< checkpaint >>
+rect -1209 -1243 1753 2575
 << nwell >>
 rect -9 581 638 1341
 << nmos >>
@@ -169,12 +171,12 @@
 rect 336 353 370 387
 rect 489 353 523 387
 << locali >>
-rect 0 1315 638 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 638 1315
+rect 0 1311 638 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 638 1311
 rect 35 1201 69 1217
 rect 35 495 69 657
 rect 121 1201 155 1271
@@ -212,21 +214,21 @@
 rect 471 199 505 215
 rect 471 61 505 131
 rect 557 115 591 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 268 657 279 683
 rect 279 657 302 683
 rect 268 649 302 657
@@ -234,22 +236,22 @@
 rect 268 353 302 387
 rect 489 353 523 387
 rect 412 279 446 313
-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 1315 638 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 638 1315
-rect 0 1271 638 1281
+rect 0 1311 638 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 638 1311
+rect 0 1271 638 1277
 rect 256 683 314 689
 rect 256 649 268 683
 rect 302 649 314 683
@@ -270,20 +272,20 @@
 rect 446 279 458 313
 rect 140 273 198 279
 rect 400 273 458 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 170 296 170 296 1 A
 port 1 n
 rlabel metal1 506 370 506 370 1 B
 port 2 n
 rlabel metal1 284 427 284 427 1 Y
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ls/magic/sky130_osu_sc_18T_ls__xor2_l.mag b/18T_ls/magic/sky130_osu_sc_18T_ls__xor2_l.mag
index 39ed7f6..e6dc57e 100644
--- a/18T_ls/magic/sky130_osu_sc_18T_ls__xor2_l.mag
+++ b/18T_ls/magic/sky130_osu_sc_18T_ls__xor2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865151
+timestamp 1606864601
+<< checkpaint >>
+rect -1209 -1243 1753 2575
 << nwell >>
 rect -9 581 638 1341
 << nmos >>
@@ -168,12 +170,12 @@
 rect 430 427 464 461
 rect 248 353 282 387
 << locali >>
-rect 0 1315 638 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 638 1315
+rect 0 1311 638 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 638 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -213,42 +215,42 @@
 rect 471 61 505 131
 rect 557 267 591 353
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 200 649 234 683
 rect 412 649 446 683
 rect 268 501 302 535
 rect 489 575 523 609
 rect 296 279 330 313
-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 1315 638 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 638 1315
-rect 0 1271 638 1281
+rect 0 1311 638 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 638 1311
+rect 0 1271 638 1277
 rect 188 683 246 689
 rect 400 683 458 689
 rect 188 649 200 683
@@ -269,20 +271,20 @@
 rect 268 279 296 313
 rect 330 279 342 313
 rect 284 273 342 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 218 666 218 666 1 A
 port 1 n
 rlabel metal1 285 486 285 486 1 Y
 port 2 n
 rlabel metal1 506 592 506 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__addf_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__addf_1.gds
index 192b39d..cf2c6f2 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__addf_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__addf_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__addf_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__addf_l.gds
index 444ae65..44b1c89 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__addf_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__addf_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__addh_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__addh_1.gds
index 3266f4c..29c54f9 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__addh_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__addh_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__addh_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__addh_l.gds
index e94dfcf..abbcb0f 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__addh_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__addh_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__and2_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__and2_1.gds
index aa71998..0d5da76 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__and2_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__and2_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__and2_2.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__and2_2.gds
index 0f034be..7391511 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__and2_2.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__and2_2.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__and2_4.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__and2_4.gds
index 77e318b..295316b 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__and2_4.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__and2_4.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__and2_6.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__and2_6.gds
index 2f19c2c..1eeb4ab 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__and2_6.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__and2_6.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__and2_8.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__and2_8.gds
index 20ab335..7f94ece 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__and2_8.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__and2_8.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__and2_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__and2_l.gds
index cd7fddd..1e0b1e5 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__and2_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__and2_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__ant.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__ant.gds
index 04d17b5..ad23540 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__ant.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__ant.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__antfill.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__antfill.gds
index d18d7e4..1dcaebb 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__antfill.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__antfill.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__aoi21_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__aoi21_l.gds
index bd507ef..a897432 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__aoi21_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__aoi21_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__aoi22_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__aoi22_l.gds
index c7ac99e..3f926c7 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__aoi22_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__aoi22_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__buf_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__buf_1.gds
index cccdf88..8d11429 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__buf_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__buf_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__buf_2.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__buf_2.gds
index 2c03185..c7c3365 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__buf_2.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__buf_2.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__buf_4.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__buf_4.gds
index 8082984..e835948 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__buf_4.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__buf_4.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__buf_6.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__buf_6.gds
index 092522c..5413df9 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__buf_6.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__buf_6.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__buf_8.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__buf_8.gds
index e98ac94..eea7178 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__buf_8.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__buf_8.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__buf_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__buf_l.gds
index e83afe4..89e1154 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__buf_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__buf_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__decap_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__decap_1.gds
index f61fd69..4401feb 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__decap_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__decap_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__decap_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__decap_l.gds
index 17b05a7..baf4ff8 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__decap_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__decap_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__dff_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__dff_1.gds
index e4629c8..d24cf86 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__dff_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__dff_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__dff_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__dff_l.gds
index a04269c..a67e557 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__dff_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__dff_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__dffr_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__dffr_1.gds
index 8c1a50f..fce648c 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__dffr_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__dffr_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__dffr_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__dffr_l.gds
index a1045c8..f5a90c2 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__dffr_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__dffr_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__dffs_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__dffs_1.gds
index 6df2264..1d717de 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__dffs_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__dffs_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__dffs_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__dffs_l.gds
index b225ccc..a7c49fb 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__dffs_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__dffs_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__dffsr_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__dffsr_1.gds
index 21cc719..b540b7a 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__dffsr_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__dffsr_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__dffsr_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__dffsr_l.gds
index f8d8db6..8d286c0 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__dffsr_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__dffsr_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__fill_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__fill_1.gds
index 979aeff..2802913 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__fill_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__fill_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__fill_16.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__fill_16.gds
index e1a3e9d..8b17644 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__fill_16.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__fill_16.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__fill_2.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__fill_2.gds
index a50fc8a..7166c89 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__fill_2.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__fill_2.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__fill_32.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__fill_32.gds
index eb853be..02770bd 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__fill_32.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__fill_32.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__fill_4.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__fill_4.gds
index 45f011a..e1c1157 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__fill_4.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__fill_4.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__fill_8.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__fill_8.gds
index 682592d..cfba6d6 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__fill_8.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__fill_8.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__inv_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__inv_1.gds
index aba2547..cb9315b 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__inv_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__inv_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__inv_10.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__inv_10.gds
index 9ac6b1a..9d46cab 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__inv_10.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__inv_10.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__inv_2.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__inv_2.gds
index d9c1eb3..2c91443 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__inv_2.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__inv_2.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__inv_3.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__inv_3.gds
index 0295098..aeea491 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__inv_3.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__inv_3.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__inv_4.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__inv_4.gds
index 3c78f68..8cd7f10 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__inv_4.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__inv_4.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__inv_6.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__inv_6.gds
index 5a4ec9f..e371e51 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__inv_6.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__inv_6.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__inv_8.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__inv_8.gds
index 760feac..8a0a66c 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__inv_8.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__inv_8.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__inv_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__inv_l.gds
index 19aa6b3..115ce0f 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__inv_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__inv_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__mux2_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__mux2_1.gds
index 7fbcd78..12e4bb1 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__mux2_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__mux2_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__nand2_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__nand2_1.gds
index 4928763..1ed1a8f 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__nand2_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__nand2_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__nand2_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__nand2_l.gds
index 6c1223f..da7541a 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__nand2_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__nand2_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__nor2_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__nor2_1.gds
index fbe9230..8307ec3 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__nor2_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__nor2_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__nor2_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__nor2_l.gds
index 66003c7..57e6080 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__nor2_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__nor2_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__oai21_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__oai21_l.gds
index b1054d9..96a6f5e 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__oai21_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__oai21_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__oai22_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__oai22_l.gds
index fd32e58..7d79062 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__oai22_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__oai22_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__or2_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__or2_1.gds
index c7eca9e..eb10708 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__or2_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__or2_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__or2_2.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__or2_2.gds
index 60ef0d6..9ae54eb 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__or2_2.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__or2_2.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__or2_4.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__or2_4.gds
index fef97c1..b7c774e 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__or2_4.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__or2_4.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__or2_8.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__or2_8.gds
index 7b4f009..52bf9ef 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__or2_8.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__or2_8.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__or2_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__or2_l.gds
index 421bf97..32b28c4 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__or2_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__or2_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__tbufi_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__tbufi_1.gds
index 9dc4ef8..756769e 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__tbufi_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__tbufi_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__tbufi_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__tbufi_l.gds
index 9da93f3..38de3ef 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__tbufi_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__tbufi_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__tiehi.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__tiehi.gds
index 51df3b9..89f6eae 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__tiehi.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__tiehi.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__tielo.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__tielo.gds
index 8dd055b..c6e2b7b 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__tielo.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__tielo.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__tnbufi_1.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__tnbufi_1.gds
index ea5b962..c9ba7f8 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__tnbufi_1.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__tnbufi_1.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__tnbufi_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__tnbufi_l.gds
index 358d7c2..bad967c 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__tnbufi_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__tnbufi_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__xnor2_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__xnor2_l.gds
index 583e585..63ce598 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__xnor2_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__xnor2_l.gds
Binary files differ
diff --git a/18T_ms/gds/sky130_osu_sc_18T_ms__xor2_l.gds b/18T_ms/gds/sky130_osu_sc_18T_ms__xor2_l.gds
index affe16f..a352e37 100644
--- a/18T_ms/gds/sky130_osu_sc_18T_ms__xor2_l.gds
+++ b/18T_ms/gds/sky130_osu_sc_18T_ms__xor2_l.gds
Binary files differ
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__addf_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__addf_1.mag
index a949c37..ff19ff1 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__addf_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__addf_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603838866
+timestamp 1606864598
+<< checkpaint >>
+rect -1209 -1243 2569 2575
 << nwell >>
 rect -9 581 1435 1341
 << nmos >>
@@ -367,18 +369,18 @@
 rect 1265 531 1299 565
 rect 1014 353 1048 387
 << locali >>
-rect 0 1315 1408 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 1003 1315
-rect 1037 1271 1139 1315
-rect 1173 1271 1275 1315
-rect 1309 1271 1408 1315
+rect 0 1311 1408 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 1003 1311
+rect 1037 1271 1139 1311
+rect 1173 1271 1275 1311
+rect 1309 1271 1408 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -482,39 +484,39 @@
 rect 1247 199 1281 215
 rect 1247 61 1281 131
 rect 1333 115 1367 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 1003 61
-rect 1037 17 1139 61
-rect 1173 17 1275 61
-rect 1309 17 1408 61
-rect 0 0 1408 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 1003 61
+rect 1037 21 1139 61
+rect 1173 21 1275 61
+rect 1309 21 1408 61
+rect 0 0 1408 21
 << viali >>
-rect 51 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
-rect 1003 1305 1037 1315
-rect 1003 1281 1037 1305
-rect 1139 1305 1173 1315
-rect 1139 1281 1173 1305
-rect 1275 1305 1309 1315
-rect 1275 1281 1309 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
+rect 1003 1305 1037 1311
+rect 1003 1277 1037 1305
+rect 1139 1305 1173 1311
+rect 1139 1277 1173 1305
+rect 1275 1305 1309 1311
+rect 1275 1277 1309 1305
 rect 80 501 114 535
 rect 248 427 282 461
 rect 80 353 114 387
@@ -530,40 +532,40 @@
 rect 1014 353 1048 387
 rect 1211 279 1245 313
 rect 1333 575 1367 609
-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 1315 1408 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 1003 1315
-rect 1037 1281 1139 1315
-rect 1173 1281 1275 1315
-rect 1309 1281 1408 1315
-rect 0 1271 1408 1281
+rect 0 1311 1408 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 1003 1311
+rect 1037 1277 1139 1311
+rect 1173 1277 1275 1311
+rect 1309 1277 1408 1311
+rect 0 1271 1408 1277
 rect 1131 684 1189 690
 rect 1109 650 1143 684
 rect 1177 650 1189 684
@@ -617,32 +619,32 @@
 rect 281 273 339 279
 rect 765 273 823 279
 rect 1199 273 1257 279
-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 68 44 68 44 1 gnd
 rlabel metal1 97 370 97 370 1 A
 port 1 n
 rlabel metal1 265 444 265 444 1 CI
 port 2 n
 rlabel metal1 129 518 129 518 1 B
 port 3 n
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 1228 296 1228 296 1 CON
 port 4 n
 rlabel metal1 1160 667 1160 667 1 S
 port 5 n
 rlabel metal1 1350 592 1350 592 1 CO
 port 6 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__addf_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__addf_l.mag
index b937425..fe5c0dd 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__addf_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__addf_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603839028
+timestamp 1606864598
+<< checkpaint >>
+rect -1209 -1243 2569 2575
 << nwell >>
 rect -9 581 1435 1341
 << nmos >>
@@ -369,18 +371,18 @@
 rect 1265 531 1299 565
 rect 1014 353 1048 387
 << locali >>
-rect 0 1315 1408 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 1003 1315
-rect 1037 1271 1139 1315
-rect 1173 1271 1275 1315
-rect 1309 1271 1408 1315
+rect 0 1311 1408 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 1003 1311
+rect 1037 1271 1139 1311
+rect 1173 1271 1275 1311
+rect 1309 1271 1408 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -484,39 +486,39 @@
 rect 1247 61 1281 131
 rect 1333 199 1367 575
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
-rect 1003 1305 1037 1315
-rect 1003 1281 1037 1305
-rect 1139 1305 1173 1315
-rect 1139 1281 1173 1305
-rect 1275 1305 1309 1315
-rect 1275 1281 1309 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
+rect 1003 1305 1037 1311
+rect 1003 1277 1037 1305
+rect 1139 1305 1173 1311
+rect 1139 1277 1173 1305
+rect 1275 1305 1309 1311
+rect 1275 1277 1309 1305
 rect 80 501 114 535
 rect 248 427 282 461
 rect 80 353 114 387
@@ -532,40 +534,40 @@
 rect 1014 353 1048 387
 rect 1211 279 1245 313
 rect 1333 575 1367 609
-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 1315 1408 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 1003 1315
-rect 1037 1281 1139 1315
-rect 1173 1281 1275 1315
-rect 1309 1281 1408 1315
-rect 0 1271 1408 1281
+rect 0 1311 1408 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 1003 1311
+rect 1037 1277 1139 1311
+rect 1173 1277 1275 1311
+rect 1309 1277 1408 1311
+rect 0 1271 1408 1277
 rect 1131 690 1189 696
 rect 1109 656 1143 690
 rect 1177 656 1189 690
@@ -619,32 +621,32 @@
 rect 281 273 339 279
 rect 765 273 823 279
 rect 1199 273 1257 279
-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 68 44 68 44 1 gnd
 rlabel metal1 97 370 97 370 1 A
 port 1 n
 rlabel metal1 265 444 265 444 1 CI
 port 2 n
 rlabel metal1 129 518 129 518 1 B
 port 3 n
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 1350 592 1350 592 1 CO
 port 5 n
 rlabel metal1 1160 673 1160 673 1 S
 port 6 n
 rlabel metal1 1228 296 1228 296 1 CON
 port 4 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__addh_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__addh_1.mag
index 462b41c..0851b21 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__addh_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__addh_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861324
+timestamp 1606864599
+<< checkpaint >>
+rect -1209 -1243 2025 2575
 << nwell >>
 rect -9 581 837 1341
 << nmos >>
@@ -210,14 +212,14 @@
 rect 624 427 658 461
 rect 348 374 382 408
 << locali >>
-rect 0 1315 836 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 836 1315
+rect 0 1311 836 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 836 1311
 rect 35 1201 69 1217
 rect 35 623 69 649
 rect 133 1201 167 1271
@@ -272,27 +274,27 @@
 rect 753 267 787 283
 rect 615 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
 rect 35 657 69 683
 rect 35 649 69 657
 rect 260 501 294 535
@@ -304,28 +306,28 @@
 rect 624 427 658 461
 rect 507 353 541 387
 rect 667 353 701 387
-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 1315 836 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 836 1315
-rect 0 1271 836 1281
+rect 0 1311 836 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 836 1311
+rect 0 1271 836 1277
 rect 23 683 81 689
 rect 23 649 35 683
 rect 69 649 81 683
@@ -366,18 +368,16 @@
 rect 23 278 35 312
 rect 69 278 81 312
 rect 23 272 81 278
-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 viali 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 50 477 50 477 1 S
 port 1 n
 rlabel metal1 737 518 737 518 1 A
@@ -388,4 +388,6 @@
 port 4 n
 rlabel metal1 684 370 684 370 1 CON
 port 5 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__addh_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__addh_l.mag
index cc4aef1..44c4f44 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__addh_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__addh_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861428
+timestamp 1606864599
+<< checkpaint >>
+rect -1209 -1243 2025 2575
 << nwell >>
 rect -9 581 837 1341
 << nmos >>
@@ -214,14 +216,14 @@
 rect 624 427 658 461
 rect 348 374 382 408
 << locali >>
-rect 0 1315 836 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 836 1315
+rect 0 1311 836 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 836 1311
 rect 35 1201 69 1217
 rect 35 683 69 929
 rect 133 1201 167 1271
@@ -276,27 +278,27 @@
 rect 753 267 787 283
 rect 615 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
 rect 35 649 69 683
 rect 260 501 294 535
 rect 164 427 198 461
@@ -307,28 +309,28 @@
 rect 624 427 658 461
 rect 507 353 541 387
 rect 667 353 701 387
-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 1315 836 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 836 1315
-rect 0 1271 836 1281
+rect 0 1311 836 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 836 1311
+rect 0 1271 836 1277
 rect 23 683 81 689
 rect 23 649 35 683
 rect 69 649 81 683
@@ -369,17 +371,16 @@
 rect 23 278 35 312
 rect 69 278 81 312
 rect 23 272 81 278
-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 viali 68 1288 68 1288 1 vdd
 rlabel metal1 50 477 50 477 1 S
 port 1 n
 rlabel metal1 737 518 737 518 1 A
@@ -390,5 +391,6 @@
 port 4 n
 rlabel metal1 684 370 684 370 1 CON
 port 5 n
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__and2_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__and2_1.mag
index 6ceb802..5ea78c3 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__and2_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__and2_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861476
+timestamp 1606864599
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
 << nmos >>
@@ -101,10 +103,10 @@
 rect 173 468 207 502
 rect 269 370 303 404
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -127,29 +129,29 @@
 rect 193 61 227 131
 rect 293 267 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 37 649 71 683
 rect 173 575 207 609
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 105 683
@@ -167,18 +169,18 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 55 666 55 666 1 A
 port 2 n
 rlabel metal1 191 592 191 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__and2_2.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__and2_2.mag
index 44ac1e9..b04f251 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__and2_2.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__and2_2.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861504
+timestamp 1606864599
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 462 1341
 << nmos >>
@@ -124,11 +126,11 @@
 rect 173 468 207 502
 rect 269 370 303 404
 << locali >>
-rect 0 1315 462 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 462 1315
+rect 0 1311 462 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 462 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -155,35 +157,35 @@
 rect 293 115 327 131
 rect 379 267 413 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 37 649 71 683
 rect 173 575 207 609
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 462 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 462 1315
-rect 0 1271 462 1281
+rect 0 1311 462 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 462 1311
+rect 0 1271 462 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 105 683
@@ -201,19 +203,19 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 191 592 191 592 1 B
 port 1 n
 rlabel metal1 55 666 55 666 1 A
 port 2 n
 rlabel metal1 311 444 311 444 1 Y
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__and2_4.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__and2_4.mag
index a2226ca..7db364d 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__and2_4.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__and2_4.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861536
+timestamp 1606864600
+<< checkpaint >>
+rect -1209 -1243 1753 2575
 << nwell >>
 rect -9 581 638 1341
 << nmos >>
@@ -162,12 +164,12 @@
 rect 173 468 207 502
 rect 269 370 303 404
 << locali >>
-rect 0 1315 638 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 638 1315
+rect 0 1311 638 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 638 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -202,43 +204,43 @@
 rect 465 115 499 131
 rect 551 267 585 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 37 649 71 683
 rect 173 575 207 609
 rect 293 501 327 535
 rect 465 501 499 535
 rect 293 279 327 313
 rect 465 279 499 313
-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 1315 638 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 638 1315
-rect 0 1271 638 1281
+rect 0 1311 638 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 638 1311
+rect 0 1271 638 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 105 683
@@ -263,20 +265,20 @@
 rect 499 279 511 313
 rect 281 273 339 279
 rect 453 273 511 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 55 666 55 666 1 A
 port 2 n
 rlabel metal1 191 592 191 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__and2_6.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__and2_6.mag
index 93ab1cf..67b3b64 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__and2_6.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__and2_6.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1600380937
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 581 814 1341
 << nmos >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__and2_8.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__and2_8.mag
index c9e53b8..2b2af4a 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__and2_8.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__and2_8.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861577
+timestamp 1606864600
+<< checkpaint >>
+rect -1209 -1243 2161 2575
 << nwell >>
 rect -9 581 990 1341
 << nmos >>
@@ -245,15 +247,15 @@
 rect 173 468 207 502
 rect 269 370 303 404
 << locali >>
-rect 0 1315 990 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 990 1315
+rect 0 1311 990 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 990 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -304,30 +306,30 @@
 rect 809 115 843 131
 rect 895 267 929 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
 rect 37 649 71 683
 rect 173 575 207 609
 rect 293 501 327 535
@@ -338,31 +340,31 @@
 rect 465 279 499 313
 rect 637 279 671 313
 rect 809 279 843 313
-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 1315 990 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 990 1315
-rect 0 1271 990 1281
+rect 0 1311 990 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 990 1311
+rect 0 1271 990 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 105 683
@@ -402,23 +404,23 @@
 rect 453 273 511 279
 rect 625 273 683 279
 rect 797 273 855 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 191 592 191 592 1 B
 port 1 n
 rlabel metal1 55 666 55 666 1 A
 port 2 n
 rlabel metal1 311 444 311 444 1 Y
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__and2_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__and2_l.mag
index 132a344..802acc1 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__and2_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__and2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603992067
+timestamp 1606864600
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
 << nmos >>
@@ -101,10 +103,10 @@
 rect 173 468 207 502
 rect 269 370 303 404
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1271
 rect 121 1201 155 1217
 rect 35 845 69 861
@@ -127,29 +129,29 @@
 rect 193 61 227 131
 rect 293 199 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 37 649 71 683
 rect 173 575 207 609
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 105 683
@@ -167,18 +169,18 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 55 666 55 666 1 A
 port 2 n
 rlabel metal1 191 592 191 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__ant.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__ant.mag
index 2af77c1..833fc06 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__ant.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__ant.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861735
+timestamp 1606864601
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << nmos >>
@@ -54,9 +56,9 @@
 << polycont >>
 rect 47 501 81 535
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1217
 rect 35 535 69 657
 rect 121 1201 155 1271
@@ -69,31 +71,31 @@
 rect 35 115 69 131
 rect 121 267 155 383
 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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 47 501 81 535
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 35 535 108 541
 rect 35 501 47 535
 rect 81 501 108 535
 rect 35 495 108 501
-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 metal1 64 518 64 518 1 A
 port 1 n
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__antfill.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__antfill.mag
index 2fd23c4..288b81a 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__antfill.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__antfill.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861660
+timestamp 1606864600
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << psubdiff >>
@@ -15,9 +17,9 @@
 << nsubdiffcont >>
 rect 51 1271 85 1305
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 535 69 1217
 rect 121 641 155 1271
 rect 31 501 47 535
@@ -26,31 +28,31 @@
 rect 35 383 155 417
 rect 35 115 69 383
 rect 121 115 155 383
-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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 47 501 81 535
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 35 535 108 541
 rect 35 501 47 535
 rect 81 501 108 535
 rect 35 495 108 501
-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 metal1 64 518 64 518 1 A
 port 1 n
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__aoi21_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__aoi21_l.mag
index 8a00b8d..f3e7b23 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__aoi21_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__aoi21_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861837
+timestamp 1606864601
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
 << nmos >>
@@ -104,10 +106,10 @@
 rect 146 434 180 468
 rect 289 355 323 389
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 845 155 861
@@ -131,30 +133,30 @@
 rect 193 115 227 131
 rect 291 199 325 215
 rect 291 61 325 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 60 649 94 683
 rect 128 575 162 609
 rect 216 501 250 535
 rect 293 427 327 461
 rect 193 279 227 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 48 683 106 689
 rect 48 649 60 683
 rect 94 649 128 683
@@ -176,14 +178,12 @@
 rect 181 279 193 313
 rect 227 279 327 313
 rect 181 273 239 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 77 666 77 666 1 A0
 port 1 n
 rlabel metal1 233 518 233 518 1 B0
@@ -192,4 +192,6 @@
 port 3 n
 rlabel metal1 145 592 145 592 1 A1
 port 4 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__aoi22_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__aoi22_l.mag
index 2fefdf4..e8f3868 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__aoi22_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__aoi22_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603913306
+timestamp 1606864601
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 462 1341
 << nmos >>
@@ -126,11 +128,11 @@
 rect 234 363 268 397
 rect 370 428 404 462
 << locali >>
-rect 0 1315 462 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 462 1315
+rect 0 1311 462 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 462 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 845 155 861
@@ -159,37 +161,37 @@
 rect 200 115 234 131
 rect 365 267 399 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 60 649 94 683
 rect 128 575 162 609
 rect 216 501 250 535
 rect 370 428 404 462
 rect 302 353 336 387
 rect 200 279 234 313
-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 1315 462 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 462 1315
-rect 0 1271 462 1281
+rect 0 1311 462 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 462 1311
+rect 0 1271 462 1277
 rect 48 683 106 689
 rect 48 649 60 683
 rect 94 649 128 683
@@ -215,14 +217,13 @@
 rect 188 279 200 313
 rect 234 279 338 313
 rect 188 273 246 279
-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 77 666 77 666 1 A0
 port 1 n
 rlabel metal1 233 518 233 518 1 B0
@@ -232,5 +233,6 @@
 rlabel viali 387 445 387 445 1 B1
 rlabel metal1 321 340 321 340 1 Y
 port 3 n
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__buf_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__buf_1.mag
index 056394f..6684382 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__buf_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__buf_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861870
+timestamp 1606864601
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 288 1341
 << nmos >>
@@ -83,10 +85,10 @@
 rect 110 479 144 513
 rect 176 370 210 404
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -104,28 +106,28 @@
 rect 121 61 155 131
 rect 207 267 241 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 110 649 144 683
 rect 207 575 241 609
 rect 207 279 241 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 98 683 156 689
 rect 64 649 110 683
 rect 144 649 156 683
@@ -139,16 +141,16 @@
 rect 195 279 207 313
 rect 241 279 253 313
 rect 195 273 253 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 127 666 127 666 1 A
 port 1 n
 rlabel metal1 213 455 213 455 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__buf_2.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__buf_2.mag
index 777f78b..bec4219 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__buf_2.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__buf_2.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861892
+timestamp 1606864601
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 376 1341
 << nmos >>
@@ -100,10 +102,10 @@
 rect 110 479 144 513
 rect 176 370 210 404
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -125,28 +127,28 @@
 rect 207 115 241 131
 rect 293 267 327 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 110 649 144 683
 rect 207 575 241 609
 rect 207 279 241 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 98 683 156 689
 rect 64 649 110 683
 rect 144 649 156 683
@@ -160,16 +162,16 @@
 rect 195 279 207 313
 rect 241 279 253 313
 rect 195 273 253 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 127 666 127 666 1 A
 port 1 n
 rlabel metal1 211 454 211 454 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__buf_4.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__buf_4.mag
index 62938df..81c44f6 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__buf_4.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__buf_4.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603861950
+timestamp 1606864601
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 552 1341
 << nmos >>
@@ -138,11 +140,11 @@
 rect 110 479 144 513
 rect 176 370 210 404
 << locali >>
-rect 0 1315 550 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 550 1315
+rect 0 1311 550 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 550 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -174,36 +176,36 @@
 rect 379 115 413 131
 rect 465 267 499 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 110 649 144 683
 rect 207 575 241 609
 rect 379 575 413 609
 rect 207 279 241 313
 rect 379 279 413 313
-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 1315 550 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 550 1315
-rect 0 1271 550 1281
+rect 0 1311 550 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 550 1311
+rect 0 1271 550 1277
 rect 98 683 156 689
 rect 64 649 110 683
 rect 144 649 156 683
@@ -224,17 +226,17 @@
 rect 413 279 425 313
 rect 195 273 253 279
 rect 367 273 425 279
-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 metal1 127 666 127 666 1 A
 port 1 n
 rlabel metal1 211 454 211 454 1 Y
 port 2 n
-rlabel viali 68 1288 68 1288 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__buf_6.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__buf_6.mag
index 63447ef..721bbbf 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__buf_6.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__buf_6.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598479240
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 581 728 1341
 << nmos >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__buf_8.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__buf_8.mag
index 7ed1f11..8d1552b 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__buf_8.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__buf_8.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862056
+timestamp 1606864602
+<< checkpaint >>
+rect -1209 -1243 2025 2575
 << nwell >>
 rect -9 581 904 1341
 << nmos >>
@@ -221,14 +223,14 @@
 rect 110 479 144 513
 rect 176 370 210 404
 << locali >>
-rect 0 1315 902 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 902 1315
+rect 0 1311 902 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 902 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -274,27 +276,27 @@
 rect 723 115 757 131
 rect 809 267 843 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
 rect 110 649 144 683
 rect 207 575 241 609
 rect 379 575 413 609
@@ -304,28 +306,28 @@
 rect 379 279 413 313
 rect 551 279 585 313
 rect 723 279 757 313
-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 1315 902 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 902 1315
-rect 0 1271 902 1281
+rect 0 1311 902 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 902 1311
+rect 0 1271 902 1277
 rect 98 683 156 689
 rect 64 649 110 683
 rect 144 649 156 683
@@ -360,20 +362,20 @@
 rect 367 273 425 279
 rect 539 273 597 279
 rect 711 273 769 279
-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 metal1 127 666 127 666 1 A
 port 1 n
 rlabel metal1 211 454 211 454 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__buf_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__buf_l.mag
index 5807bde..460a04a 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__buf_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__buf_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862077
+timestamp 1606864602
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 288 1341
 << nmos >>
@@ -83,10 +85,10 @@
 rect 110 479 144 513
 rect 176 370 210 404
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1217
 rect 35 404 69 861
 rect 121 1201 155 1271
@@ -104,28 +106,28 @@
 rect 121 61 155 131
 rect 207 199 241 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 110 649 144 683
 rect 207 575 241 609
 rect 207 279 241 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 98 683 156 689
 rect 64 649 110 683
 rect 144 649 156 683
@@ -139,16 +141,16 @@
 rect 195 279 207 313
 rect 241 279 253 313
 rect 195 273 253 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 127 666 127 666 1 A
 port 1 n
 rlabel metal1 214 452 214 452 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__decap_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__decap_1.mag
index 5d796b7..842e5d6 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__decap_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__decap_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862105
+timestamp 1606864602
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << nmos >>
@@ -47,9 +49,9 @@
 rect 80 451 110 817
 rect 80 80 110 115
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 845 69 861
 rect 121 1201 155 1271
@@ -58,24 +60,24 @@
 rect 35 61 69 131
 rect 121 403 155 419
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
+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 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__decap_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__decap_l.mag
index c5eb7ba..8c5f887 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__decap_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__decap_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862119
+timestamp 1606864602
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << nmos >>
@@ -47,9 +49,9 @@
 rect 80 315 110 1017
 rect 80 80 110 115
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 1049 69 1065
 rect 121 1201 155 1271
@@ -58,24 +60,24 @@
 rect 35 61 69 131
 rect 121 267 155 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
+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 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__dff_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__dff_1.mag
index ebc5d12..78cb4cc 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__dff_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__dff_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862204
+timestamp 1606864603
+<< checkpaint >>
+rect -1209 -1243 2569 2575
 << nwell >>
 rect -9 581 1456 1341
 << nmos >>
@@ -366,18 +368,18 @@
 rect 1323 462 1357 496
 rect 1018 353 1052 387
 << locali >>
-rect 0 1315 1452 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 1003 1315
-rect 1037 1271 1139 1315
-rect 1173 1271 1275 1315
-rect 1309 1271 1452 1315
+rect 0 1311 1452 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 1003 1311
+rect 1037 1271 1139 1311
+rect 1173 1271 1275 1311
+rect 1309 1271 1452 1311
 rect 40 1201 74 1217
 rect 17 657 40 669
 rect 126 1201 160 1271
@@ -481,39 +483,39 @@
 rect 1292 61 1326 131
 rect 1378 267 1412 286
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
-rect 1003 1305 1037 1315
-rect 1003 1281 1037 1305
-rect 1139 1305 1173 1315
-rect 1139 1281 1173 1305
-rect 1275 1305 1309 1315
-rect 1275 1281 1309 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
+rect 1003 1305 1037 1311
+rect 1003 1277 1037 1305
+rect 1139 1305 1173 1311
+rect 1139 1277 1173 1305
+rect 1275 1305 1309 1311
+rect 1275 1277 1309 1305
 rect 40 353 74 387
 rect 253 501 287 535
 rect 181 427 215 461
@@ -528,40 +530,40 @@
 rect 1206 575 1240 609
 rect 1226 421 1260 455
 rect 1018 353 1052 387
-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 1315 1452 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 1003 1315
-rect 1037 1281 1139 1315
-rect 1173 1281 1275 1315
-rect 1309 1281 1452 1315
-rect 0 1271 1452 1281
+rect 0 1311 1452 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 1003 1311
+rect 1037 1277 1139 1311
+rect 1173 1277 1275 1311
+rect 1309 1277 1452 1311
+rect 0 1271 1452 1277
 rect 1366 683 1424 689
 rect 1343 649 1378 683
 rect 1412 649 1424 683
@@ -605,22 +607,20 @@
 rect 1052 353 1064 387
 rect 523 347 581 353
 rect 1006 347 1064 353
-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 68 45 68 45 1 gnd
-rlabel viali 68 1289 68 1289 1 vdd
 rlabel metal1 198 444 198 444 1 D
 port 1 n
 rlabel metal1 915 518 915 518 1 CK
@@ -629,4 +629,6 @@
 port 4 n
 rlabel metal1 1224 592 1224 592 1 QN
 port 2 n
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 1285 68 1285 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__dff_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__dff_l.mag
index bf77222..3ed0bbf 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__dff_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__dff_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862260
+timestamp 1606864603
+<< checkpaint >>
+rect -1209 -1243 2569 2575
 << nwell >>
 rect -9 581 1456 1341
 << nmos >>
@@ -366,18 +368,18 @@
 rect 1323 462 1357 496
 rect 1018 353 1052 387
 << locali >>
-rect 0 1315 1452 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 1003 1315
-rect 1037 1271 1139 1315
-rect 1173 1271 1275 1315
-rect 1309 1271 1452 1315
+rect 0 1311 1452 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 1003 1311
+rect 1037 1271 1139 1311
+rect 1173 1271 1275 1311
+rect 1309 1271 1452 1311
 rect 40 1201 74 1217
 rect 17 657 40 669
 rect 126 1201 160 1271
@@ -483,39 +485,39 @@
 rect 1292 61 1326 131
 rect 1378 199 1412 286
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
-rect 1003 1305 1037 1315
-rect 1003 1281 1037 1305
-rect 1139 1305 1173 1315
-rect 1139 1281 1173 1305
-rect 1275 1305 1309 1315
-rect 1275 1281 1309 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
+rect 1003 1305 1037 1311
+rect 1003 1277 1037 1305
+rect 1139 1305 1173 1311
+rect 1139 1277 1173 1305
+rect 1275 1305 1309 1311
+rect 1275 1277 1309 1305
 rect 40 353 74 387
 rect 253 501 287 535
 rect 181 427 215 461
@@ -529,40 +531,40 @@
 rect 1206 575 1240 609
 rect 1226 421 1260 455
 rect 1018 353 1052 387
-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 1315 1452 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 1003 1315
-rect 1037 1281 1139 1315
-rect 1173 1281 1275 1315
-rect 1309 1281 1452 1315
-rect 0 1271 1452 1281
+rect 0 1311 1452 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 1003 1311
+rect 1037 1277 1139 1311
+rect 1173 1277 1275 1311
+rect 1309 1277 1452 1311
+rect 0 1271 1452 1277
 rect 1365 683 1423 689
 rect 1343 649 1377 683
 rect 1411 649 1423 683
@@ -606,22 +608,20 @@
 rect 1052 353 1064 387
 rect 523 347 581 353
 rect 1006 347 1064 353
-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 68 45 68 45 1 gnd
-rlabel viali 68 1289 68 1289 1 vdd
 rlabel metal1 198 444 198 444 1 D
 port 1 n
 rlabel metal1 1394 666 1394 666 1 Q
@@ -630,4 +630,6 @@
 port 3 n
 rlabel metal1 915 518 915 518 1 CK
 port 4 n
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 1285 68 1285 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__dffr_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__dffr_1.mag
index 0c2e8e8..3c01a2d 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__dffr_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__dffr_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862408
+timestamp 1606864603
+<< checkpaint >>
+rect -1210 -1243 3112 2575
 << nwell >>
 rect -10 581 1917 1341
 << nmos >>
@@ -465,22 +467,22 @@
 rect 1784 462 1818 496
 rect 1545 301 1579 335
 << locali >>
-rect 0 1315 1914 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1682 1315
-rect 1716 1271 1818 1315
-rect 1852 1271 1914 1315
+rect 0 1311 1914 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1682 1311
+rect 1716 1271 1818 1311
+rect 1852 1271 1914 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -609,51 +611,51 @@
 rect 1753 61 1787 131
 rect 1839 199 1873 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
-rect 1682 1305 1716 1315
-rect 1682 1281 1716 1305
-rect 1818 1305 1852 1315
-rect 1818 1281 1852 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
+rect 1682 1305 1716 1311
+rect 1682 1277 1716 1305
+rect 1818 1305 1852 1311
+rect 1818 1277 1852 1305
 rect 47 649 81 683
 rect 311 353 345 387
 rect 229 301 263 313
@@ -672,52 +674,52 @@
 rect 1409 353 1443 387
 rect 1545 301 1579 313
 rect 1545 279 1579 301
-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 1315 1914 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1682 1315
-rect 1716 1281 1818 1315
-rect 1852 1281 1914 1315
-rect 0 1271 1914 1281
+rect 0 1311 1914 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1682 1311
+rect 1716 1277 1818 1311
+rect 1852 1277 1914 1311
+rect 0 1271 1914 1277
 rect 35 683 93 689
 rect 1826 683 1884 689
 rect 35 649 47 683
@@ -772,30 +774,26 @@
 rect 1579 279 1591 313
 rect 217 273 275 279
 rect 1533 273 1591 279
-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 metal1 65 666 65 666 1 RN
 port 1 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1288 67 1288 1 vdd
-rlabel viali 67 1288 67 1288 1 vdd
 rlabel metal1 573 444 573 444 1 D
 port 2 n
 rlabel metal1 1290 518 1290 518 1 CK
@@ -804,4 +802,6 @@
 port 4 n
 rlabel metal1 1685 592 1685 592 1 QN
 port 5 n
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__dffr_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__dffr_l.mag
index cdb7b6d..faa52fc 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__dffr_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__dffr_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862567
+timestamp 1606864603
+<< checkpaint >>
+rect -1210 -1243 3112 2575
 << nwell >>
 rect -10 581 1917 1341
 << nmos >>
@@ -465,22 +467,22 @@
 rect 1784 462 1818 496
 rect 1545 301 1579 335
 << locali >>
-rect 0 1315 1914 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1682 1315
-rect 1716 1271 1818 1315
-rect 1852 1271 1914 1315
+rect 0 1311 1914 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1682 1311
+rect 1716 1271 1818 1311
+rect 1852 1271 1914 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -609,51 +611,51 @@
 rect 1753 61 1787 131
 rect 1839 199 1873 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
-rect 1682 1305 1716 1315
-rect 1682 1281 1716 1305
-rect 1818 1305 1852 1315
-rect 1818 1281 1852 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
+rect 1682 1305 1716 1311
+rect 1682 1277 1716 1305
+rect 1818 1305 1852 1311
+rect 1818 1277 1852 1305
 rect 47 649 81 683
 rect 311 353 345 387
 rect 229 301 263 313
@@ -672,52 +674,52 @@
 rect 1409 353 1443 387
 rect 1545 301 1579 313
 rect 1545 279 1579 301
-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 1315 1914 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1682 1315
-rect 1716 1281 1818 1315
-rect 1852 1281 1914 1315
-rect 0 1271 1914 1281
+rect 0 1311 1914 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1682 1311
+rect 1716 1277 1818 1311
+rect 1852 1277 1914 1311
+rect 0 1271 1914 1277
 rect 35 683 93 689
 rect 1826 683 1884 689
 rect 35 649 47 683
@@ -772,30 +774,26 @@
 rect 1579 279 1591 313
 rect 217 273 275 279
 rect 1533 273 1591 279
-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 metal1 65 666 65 666 1 RN
 port 1 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1288 67 1288 1 vdd
-rlabel viali 67 1288 67 1288 1 vdd
 rlabel metal1 573 444 573 444 1 D
 port 2 n
 rlabel metal1 1290 518 1290 518 1 CK
@@ -804,4 +802,6 @@
 port 4 n
 rlabel metal1 1685 592 1685 592 1 QN
 port 5 n
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__dffs_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__dffs_1.mag
index 9dc95eb..bcfa75b 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__dffs_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__dffs_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862672
+timestamp 1606864603
+<< checkpaint >>
+rect -1210 -1243 2840 2575
 << nwell >>
 rect -10 581 1741 1341
 << nmos >>
@@ -420,20 +422,20 @@
 rect 1594 462 1628 496
 rect 1355 301 1389 335
 << locali >>
-rect 0 1315 1738 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1738 1315
+rect 0 1311 1738 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1738 1311
 rect 35 1201 69 1271
 rect 35 913 69 929
 rect 121 1201 155 1217
@@ -544,45 +546,45 @@
 rect 1563 61 1597 131
 rect 1649 199 1683 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
 rect 47 279 81 313
 rect 121 353 155 387
 rect 438 501 472 535
@@ -599,46 +601,46 @@
 rect 1203 353 1237 387
 rect 1355 301 1389 313
 rect 1355 279 1389 301
-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 1315 1738 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1738 1315
-rect 0 1271 1738 1281
+rect 0 1311 1738 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1738 1311
+rect 0 1271 1738 1277
 rect 1636 683 1694 689
 rect 1614 649 1648 683
 rect 1682 649 1694 683
@@ -689,24 +691,22 @@
 rect 1389 279 1401 313
 rect 35 273 93 279
 rect 1343 273 1401 279
-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 67 44 67 44 1 gnd
-rlabel viali 67 1288 67 1288 1 vdd
 rlabel viali 383 444 383 444 1 D
 port 1 n
 rlabel viali 1100 518 1100 518 1 CK
@@ -716,4 +716,6 @@
 rlabel viali 1495 592 1495 592 1 QN
 port 3 n
 rlabel viali 64 296 64 296 1 SN
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__dffs_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__dffs_l.mag
index 325f3ec..9584d34 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__dffs_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__dffs_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603862745
+timestamp 1606864604
+<< checkpaint >>
+rect -1210 -1243 2840 2575
 << nwell >>
 rect -10 581 1741 1341
 << nmos >>
@@ -420,20 +422,20 @@
 rect 1594 462 1628 496
 rect 1355 301 1389 335
 << locali >>
-rect 0 1315 1738 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1738 1315
+rect 0 1311 1738 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1738 1311
 rect 35 1201 69 1271
 rect 35 913 69 929
 rect 121 1201 155 1217
@@ -544,45 +546,45 @@
 rect 1563 61 1597 131
 rect 1649 199 1683 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
 rect 47 279 81 313
 rect 121 353 155 387
 rect 438 501 472 535
@@ -599,46 +601,46 @@
 rect 1203 353 1237 387
 rect 1355 301 1389 313
 rect 1355 279 1389 301
-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 1315 1738 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1738 1315
-rect 0 1271 1738 1281
+rect 0 1311 1738 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1738 1311
+rect 0 1271 1738 1277
 rect 1636 683 1694 689
 rect 1614 649 1648 683
 rect 1682 649 1694 683
@@ -689,24 +691,22 @@
 rect 1389 279 1401 313
 rect 35 273 93 279
 rect 1343 273 1401 279
-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 67 44 67 44 1 gnd
-rlabel viali 67 1288 67 1288 1 vdd
 rlabel viali 383 444 383 444 1 D
 port 1 n
 rlabel viali 1100 518 1100 518 1 CK
@@ -716,4 +716,6 @@
 rlabel viali 1495 592 1495 592 1 QN
 port 3 n
 rlabel viali 64 296 64 296 1 SN
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__dffsr_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__dffsr_1.mag
index ba7ced9..72769ea 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__dffsr_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__dffsr_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863488
+timestamp 1606864604
+<< checkpaint >>
+rect -1210 -1243 3248 2575
 << nwell >>
 rect -10 581 2090 1341
 << nmos >>
@@ -526,23 +528,23 @@
 rect 1956 462 1990 496
 rect 1755 301 1789 335
 << locali >>
-rect 0 1315 2090 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1682 1315
-rect 1716 1271 1818 1315
-rect 1852 1271 1954 1315
-rect 1988 1271 2090 1315
+rect 0 1311 2090 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1682 1311
+rect 1716 1271 1818 1311
+rect 1852 1271 1954 1311
+rect 1988 1271 2090 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -683,54 +685,54 @@
 rect 1925 61 1959 131
 rect 2011 267 2045 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
-rect 1682 1305 1716 1315
-rect 1682 1281 1716 1305
-rect 1818 1305 1852 1315
-rect 1818 1281 1852 1305
-rect 1954 1305 1988 1315
-rect 1954 1281 1988 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
+rect 1682 1305 1716 1311
+rect 1682 1277 1716 1305
+rect 1818 1305 1852 1311
+rect 1818 1277 1852 1305
+rect 1954 1305 1988 1311
+rect 1954 1277 1988 1305
 rect 47 649 81 683
 rect 325 575 359 609
 rect 325 353 359 387
@@ -752,55 +754,55 @@
 rect 1502 353 1536 387
 rect 1755 301 1789 313
 rect 1755 279 1789 301
-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 1315 2090 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1682 1315
-rect 1716 1281 1818 1315
-rect 1852 1281 1954 1315
-rect 1988 1281 2090 1315
-rect 0 1271 2090 1281
+rect 0 1311 2090 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1682 1311
+rect 1716 1277 1818 1311
+rect 1852 1277 1954 1311
+rect 1988 1277 2090 1311
+rect 0 1271 2090 1277
 rect 35 683 93 689
 rect 1999 683 2057 689
 rect 35 649 47 683
@@ -862,24 +864,24 @@
 rect 1789 279 1801 313
 rect 217 273 275 279
 rect 1743 273 1801 279
-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 metal1 659 444 659 444 1 D
 port 1 n
@@ -893,6 +895,6 @@
 port 5 n
 rlabel metal1 2028 666 2028 666 1 Q
 port 6 n
-rlabel viali 67 1288 67 1288 1 vdd
-rlabel viali 67 44 67 44 1 gnd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__dffsr_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__dffsr_l.mag
index 1740b1a..23191c0 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__dffsr_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__dffsr_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863586
+timestamp 1606864604
+<< checkpaint >>
+rect -1210 -1243 3248 2575
 << nwell >>
 rect -10 581 2090 1341
 << nmos >>
@@ -524,23 +526,23 @@
 rect 1956 462 1990 496
 rect 1755 301 1789 335
 << locali >>
-rect 0 1315 2090 1332
-rect 0 1271 50 1315
-rect 84 1271 186 1315
-rect 220 1271 322 1315
-rect 356 1271 458 1315
-rect 492 1271 594 1315
-rect 628 1271 730 1315
-rect 764 1271 866 1315
-rect 900 1271 1002 1315
-rect 1036 1271 1138 1315
-rect 1172 1271 1274 1315
-rect 1308 1271 1410 1315
-rect 1444 1271 1546 1315
-rect 1580 1271 1682 1315
-rect 1716 1271 1818 1315
-rect 1852 1271 1954 1315
-rect 1988 1271 2090 1315
+rect 0 1311 2090 1332
+rect 0 1271 50 1311
+rect 84 1271 186 1311
+rect 220 1271 322 1311
+rect 356 1271 458 1311
+rect 492 1271 594 1311
+rect 628 1271 730 1311
+rect 764 1271 866 1311
+rect 900 1271 1002 1311
+rect 1036 1271 1138 1311
+rect 1172 1271 1274 1311
+rect 1308 1271 1410 1311
+rect 1444 1271 1546 1311
+rect 1580 1271 1682 1311
+rect 1716 1271 1818 1311
+rect 1852 1271 1954 1311
+rect 1988 1271 2090 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -683,54 +685,54 @@
 rect 1925 61 1959 131
 rect 2011 199 2045 286
 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 1305 84 1315
-rect 50 1281 84 1305
-rect 186 1305 220 1315
-rect 186 1281 220 1305
-rect 322 1305 356 1315
-rect 322 1281 356 1305
-rect 458 1305 492 1315
-rect 458 1281 492 1305
-rect 594 1305 628 1315
-rect 594 1281 628 1305
-rect 730 1305 764 1315
-rect 730 1281 764 1305
-rect 866 1305 900 1315
-rect 866 1281 900 1305
-rect 1002 1305 1036 1315
-rect 1002 1281 1036 1305
-rect 1138 1305 1172 1315
-rect 1138 1281 1172 1305
-rect 1274 1305 1308 1315
-rect 1274 1281 1308 1305
-rect 1410 1305 1444 1315
-rect 1410 1281 1444 1305
-rect 1546 1305 1580 1315
-rect 1546 1281 1580 1305
-rect 1682 1305 1716 1315
-rect 1682 1281 1716 1305
-rect 1818 1305 1852 1315
-rect 1818 1281 1852 1305
-rect 1954 1305 1988 1315
-rect 1954 1281 1988 1305
+rect 50 1305 84 1311
+rect 50 1277 84 1305
+rect 186 1305 220 1311
+rect 186 1277 220 1305
+rect 322 1305 356 1311
+rect 322 1277 356 1305
+rect 458 1305 492 1311
+rect 458 1277 492 1305
+rect 594 1305 628 1311
+rect 594 1277 628 1305
+rect 730 1305 764 1311
+rect 730 1277 764 1305
+rect 866 1305 900 1311
+rect 866 1277 900 1305
+rect 1002 1305 1036 1311
+rect 1002 1277 1036 1305
+rect 1138 1305 1172 1311
+rect 1138 1277 1172 1305
+rect 1274 1305 1308 1311
+rect 1274 1277 1308 1305
+rect 1410 1305 1444 1311
+rect 1410 1277 1444 1305
+rect 1546 1305 1580 1311
+rect 1546 1277 1580 1305
+rect 1682 1305 1716 1311
+rect 1682 1277 1716 1305
+rect 1818 1305 1852 1311
+rect 1818 1277 1852 1305
+rect 1954 1305 1988 1311
+rect 1954 1277 1988 1305
 rect 47 649 81 683
 rect 325 575 359 609
 rect 325 353 359 387
@@ -751,55 +753,55 @@
 rect 1502 353 1536 387
 rect 1755 301 1789 313
 rect 1755 279 1789 301
-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 1315 2090 1332
-rect 0 1281 50 1315
-rect 84 1281 186 1315
-rect 220 1281 322 1315
-rect 356 1281 458 1315
-rect 492 1281 594 1315
-rect 628 1281 730 1315
-rect 764 1281 866 1315
-rect 900 1281 1002 1315
-rect 1036 1281 1138 1315
-rect 1172 1281 1274 1315
-rect 1308 1281 1410 1315
-rect 1444 1281 1546 1315
-rect 1580 1281 1682 1315
-rect 1716 1281 1818 1315
-rect 1852 1281 1954 1315
-rect 1988 1281 2090 1315
-rect 0 1271 2090 1281
+rect 0 1311 2090 1332
+rect 0 1277 50 1311
+rect 84 1277 186 1311
+rect 220 1277 322 1311
+rect 356 1277 458 1311
+rect 492 1277 594 1311
+rect 628 1277 730 1311
+rect 764 1277 866 1311
+rect 900 1277 1002 1311
+rect 1036 1277 1138 1311
+rect 1172 1277 1274 1311
+rect 1308 1277 1410 1311
+rect 1444 1277 1546 1311
+rect 1580 1277 1682 1311
+rect 1716 1277 1818 1311
+rect 1852 1277 1954 1311
+rect 1988 1277 2090 1311
+rect 0 1271 2090 1277
 rect 35 683 93 689
 rect 1998 683 2056 689
 rect 35 649 47 683
@@ -861,24 +863,24 @@
 rect 1789 279 1801 313
 rect 217 273 275 279
 rect 1743 273 1801 279
-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 metal1 659 444 659 444 1 D
 port 1 n
@@ -892,6 +894,6 @@
 port 5 n
 rlabel metal1 65 666 65 666 1 RN
 port 6 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1288 67 1288 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1284 67 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__fill_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__fill_1.mag
index 95c509c..8d5ce0c 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__fill_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__fill_1.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548551
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << error_p >>
 rect 0 1271 34 1332
 rect 41 581 154 1341
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__fill_16.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__fill_16.mag
index 0359d8e..877376a 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__fill_16.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__fill_16.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548584
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 581 355 1341
 << locali >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__fill_2.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__fill_2.mag
index 6563ebf..65e2cf3 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__fill_2.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__fill_2.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548559
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << error_p >>
 rect 0 1271 44 1332
 rect 50 581 161 1341
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__fill_32.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__fill_32.mag
index 6fa9b88..bcb8614 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__fill_32.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__fill_32.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548594
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 581 707 1341
 << locali >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__fill_4.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__fill_4.mag
index 0304d99..b47e23b 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__fill_4.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__fill_4.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548567
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << error_p >>
 rect 96 581 159 1341
 << nwell >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__fill_8.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__fill_8.mag
index c59d34e..024779e 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__fill_8.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__fill_8.mag
@@ -2,6 +2,8 @@
 tech sky130A
 magscale 1 2
 timestamp 1598548573
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 581 179 1341
 << locali >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__inv_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__inv_1.mag
index fa0053a..4e2adfa 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__inv_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__inv_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863700
+timestamp 1606864605
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << nmos >>
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -68,22 +70,22 @@
 rect 35 61 69 131
 rect 121 267 155 279
 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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 121 279 155 313
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -97,15 +99,15 @@
 rect 109 279 121 313
 rect 155 279 167 313
 rect 109 273 167 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 151 441 151 441 1 Y
 port 1 n
 rlabel metal1 64 666 64 666 1 A
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__inv_10.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__inv_10.mag
index 22c4f22..1fbcb2d 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__inv_10.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__inv_10.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863912
+timestamp 1606864605
+<< checkpaint >>
+rect -1209 -1243 2161 2575
 << nwell >>
 rect -9 581 990 1341
 << nmos >>
@@ -239,15 +241,15 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 990 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 990 1315
+rect 0 1311 990 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 990 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -295,30 +297,30 @@
 rect 809 115 843 131
 rect 895 267 929 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 293 575 327 609
@@ -330,31 +332,31 @@
 rect 465 279 499 313
 rect 637 279 671 313
 rect 809 279 843 313
-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 1315 990 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 990 1315
-rect 0 1271 990 1281
+rect 0 1311 990 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 990 1311
+rect 0 1271 990 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -396,21 +398,21 @@
 rect 453 273 511 279
 rect 625 273 683 279
 rect 797 273 855 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 152 440 152 440 1 Y
 port 1 n
 rlabel metal1 64 665 64 665 1 A
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__inv_2.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__inv_2.mag
index 25b1955..c82b2db 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__inv_2.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__inv_2.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863719
+timestamp 1606864606
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 287 1341
 << nmos >>
@@ -80,10 +82,10 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -99,28 +101,28 @@
 rect 121 115 155 131
 rect 207 267 241 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 121 279 155 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -134,16 +136,16 @@
 rect 109 279 121 313
 rect 155 279 167 313
 rect 109 273 167 279
-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 440 152 440 1 Y
 port 1 n
 rlabel metal1 64 665 64 665 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__inv_3.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__inv_3.mag
index f612f2e..cf5f3a1 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__inv_3.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__inv_3.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863791
+timestamp 1606864606
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 375 1341
 << nmos >>
@@ -96,10 +98,10 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -119,30 +121,30 @@
 rect 207 61 241 131
 rect 293 267 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 293 575 327 609
 rect 121 279 155 313
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -163,16 +165,16 @@
 rect 327 279 339 313
 rect 109 273 167 279
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 152 440 152 440 1 Y
 port 1 n
 rlabel metal1 64 665 64 665 1 A
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__inv_4.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__inv_4.mag
index bf86165..78ebd31 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__inv_4.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__inv_4.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863747
+timestamp 1606864606
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 463 1341
 << nmos >>
@@ -118,11 +120,11 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 462 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 462 1315
+rect 0 1311 462 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 462 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -146,36 +148,36 @@
 rect 293 115 327 131
 rect 379 267 413 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 293 575 327 609
 rect 121 279 155 313
 rect 293 279 327 313
-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 1315 462 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 462 1315
-rect 0 1271 462 1281
+rect 0 1311 462 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 462 1311
+rect 0 1271 462 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -196,17 +198,17 @@
 rect 327 279 339 313
 rect 109 273 167 279
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 64 665 64 665 1 A
 port 1 n
 rlabel metal1 152 440 152 440 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__inv_6.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__inv_6.mag
index 4310b98..7ae23c2 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__inv_6.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__inv_6.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863829
+timestamp 1606864606
+<< checkpaint >>
+rect -1209 -1243 1753 2575
 << nwell >>
 rect -9 581 639 1341
 << nmos >>
@@ -157,12 +159,12 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 638 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 638 1315
+rect 0 1311 638 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 638 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -194,21 +196,21 @@
 rect 465 115 499 131
 rect 551 267 585 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 293 575 327 609
@@ -216,22 +218,22 @@
 rect 121 279 155 313
 rect 293 279 327 313
 rect 465 279 499 313
-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 1315 638 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 638 1315
-rect 0 1271 638 1281
+rect 0 1311 638 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 638 1311
+rect 0 1271 638 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -259,18 +261,18 @@
 rect 109 273 167 279
 rect 281 273 339 279
 rect 453 273 511 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 64 665 64 665 1 A
 port 1 n
 rlabel metal1 152 440 152 440 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__inv_8.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__inv_8.mag
index 4826616..8c4fc78 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__inv_8.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__inv_8.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863864
+timestamp 1606864606
+<< checkpaint >>
+rect -1209 -1243 1889 2575
 << nwell >>
 rect -9 581 814 1341
 << nmos >>
@@ -195,13 +197,13 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 814 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 814 1315
+rect 0 1311 814 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 814 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -241,24 +243,24 @@
 rect 637 115 671 131
 rect 723 267 757 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 293 575 327 609
@@ -268,25 +270,25 @@
 rect 293 279 327 313
 rect 465 279 499 313
 rect 637 279 671 313
-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 1315 814 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 814 1315
-rect 0 1271 814 1281
+rect 0 1311 814 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 814 1311
+rect 0 1271 814 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -321,19 +323,19 @@
 rect 281 273 339 279
 rect 453 273 511 279
 rect 625 273 683 279
-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 viali 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 152 440 152 440 1 Y
 port 1 n
 rlabel metal1 64 665 64 665 1 A
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__inv_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__inv_l.mag
index f69d776..83f90f4 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__inv_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__inv_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603863931
+timestamp 1606864607
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << nmos >>
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 444 124 478
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 913 69 929
 rect 121 1201 155 1217
@@ -68,22 +70,22 @@
 rect 35 61 69 131
 rect 121 199 155 279
 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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 47 649 81 683
 rect 121 575 155 609
 rect 121 279 155 313
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 127 683
@@ -97,15 +99,15 @@
 rect 109 279 121 313
 rect 155 279 167 313
 rect 109 273 167 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 64 666 64 666 1 A
 port 1 n
 rlabel metal1 151 441 151 441 1 Y
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__mux2_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__mux2_1.mag
index 35d302d..a991f77 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__mux2_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__mux2_1.mag
@@ -1,7 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864309
+timestamp 1606864607
+<< checkpaint >>
+rect -801 1315 1753 2575
+rect -1209 -1243 1753 1315
 << nwell >>
 rect -9 581 553 1341
 << nmos >>
@@ -120,9 +123,9 @@
 rect 37 444 71 478
 rect 168 353 202 387
 << locali >>
-rect 0 1315 550 1332
-rect 0 1271 459 1315
-rect 493 1271 550 1315
+rect 0 1311 550 1332
+rect 0 1271 459 1311
+rect 493 1271 550 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -154,33 +157,33 @@
 rect 311 115 345 131
 rect 397 267 431 501
 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 1305 493 1315
-rect 459 1281 493 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 37 649 71 683
 rect 236 575 270 609
 rect 311 427 345 461
 rect 397 501 431 535
 rect 311 279 345 313
-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 1315 550 1332
-rect 0 1281 459 1315
-rect 493 1281 550 1315
-rect 0 1271 550 1281
+rect 0 1311 550 1332
+rect 0 1277 459 1311
+rect 493 1277 550 1311
+rect 0 1271 550 1277
 rect 25 683 83 689
 rect 25 649 37 683
 rect 71 649 117 683
@@ -202,24 +205,22 @@
 rect 299 279 311 313
 rect 345 279 357 313
 rect 299 273 357 279
-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 metal1 54 666 54 666 1 S0
 port 1 n
 rlabel metal1 328 444 328 444 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 476 1288 476 1288 1 vdd
-rlabel viali 476 1288 476 1288 1 vdd
 rlabel metal1 253 592 253 592 1 A0
 port 3 n
 rlabel metal1 414 518 414 518 1 A1
 port 4 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 476 1284 476 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__nand2_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__nand2_1.mag
index feff122..819d971 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__nand2_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__nand2_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864337
+timestamp 1606864607
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 286 1341
 << nmos >>
@@ -77,10 +79,10 @@
 rect 47 520 81 554
 rect 166 427 200 461
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 121 1201 155 1217
@@ -96,29 +98,29 @@
 rect 35 115 69 131
 rect 193 267 227 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 47 649 81 683
 rect 121 501 155 535
 rect 195 575 229 609
 rect 35 279 69 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 115 683
@@ -136,18 +138,18 @@
 rect 23 279 35 313
 rect 69 279 155 313
 rect 23 273 81 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 136 470 136 470 1 Y
 port 1 n
 rlabel metal1 64 666 64 666 1 A
 port 2 n
 rlabel metal1 212 592 212 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__nand2_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__nand2_l.mag
index 183306d..2a21a15 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__nand2_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__nand2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864354
+timestamp 1606864607
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 286 1341
 << nmos >>
@@ -77,10 +79,10 @@
 rect 47 520 81 554
 rect 166 370 200 404
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1271
 rect 35 913 69 929
 rect 121 1201 155 1217
@@ -96,29 +98,29 @@
 rect 35 115 69 131
 rect 193 199 227 215
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 47 649 81 683
 rect 121 501 155 535
 rect 195 575 229 609
 rect 35 279 69 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 35 683 93 689
 rect 35 649 47 683
 rect 81 649 115 683
@@ -136,18 +138,18 @@
 rect 23 279 35 313
 rect 69 279 155 313
 rect 23 273 81 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 136 470 136 470 1 Y
 port 1 n
 rlabel metal1 212 592 212 592 1 B
 port 2 n
 rlabel metal1 64 666 64 666 1 A
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__nor2_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__nor2_1.mag
index e7f8482..f8ee8b3 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__nor2_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__nor2_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864375
+timestamp 1606864607
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 286 1341
 << nmos >>
@@ -77,10 +79,10 @@
 rect 181 534 215 568
 rect 66 401 100 435
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1217
 rect 193 1201 227 1271
 rect 193 777 227 793
@@ -96,29 +98,29 @@
 rect 121 115 155 131
 rect 207 267 241 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 181 649 215 683
 rect 35 501 69 535
 rect 113 575 147 609
 rect 121 279 155 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 169 683 227 689
 rect 148 649 181 683
 rect 215 649 227 683
@@ -136,18 +138,18 @@
 rect 109 279 121 313
 rect 155 279 167 313
 rect 109 273 167 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 137 393 137 393 1 Y
 port 1 n
 rlabel metal1 130 592 130 592 1 B
 port 2 n
 rlabel metal1 198 666 198 666 1 A
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__nor2_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__nor2_l.mag
index 66501f3..b56c522 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__nor2_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__nor2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864393
+timestamp 1606864607
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 286 1341
 << nmos >>
@@ -77,10 +79,10 @@
 rect 181 534 215 568
 rect 66 401 100 435
 << locali >>
-rect 0 1315 286 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 286 1315
+rect 0 1311 286 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 286 1311
 rect 35 1201 69 1217
 rect 35 535 69 861
 rect 193 1201 227 1271
@@ -96,29 +98,29 @@
 rect 121 115 155 131
 rect 207 199 241 215
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 181 649 215 683
 rect 35 501 69 535
 rect 113 575 147 609
 rect 121 279 155 313
-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 1315 286 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 286 1315
-rect 0 1271 286 1281
+rect 0 1311 286 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 286 1311
+rect 0 1271 286 1277
 rect 169 683 227 689
 rect 148 649 181 683
 rect 215 649 227 683
@@ -136,18 +138,18 @@
 rect 109 279 121 313
 rect 155 279 167 313
 rect 109 273 167 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 137 393 137 393 1 Y
 port 1 n
 rlabel metal1 198 666 198 666 1 A
 port 2 n
 rlabel metal1 130 592 130 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__oai21_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__oai21_l.mag
index b3e45b8..ab0cc55 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__oai21_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__oai21_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864420
+timestamp 1606864608
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
 << nmos >>
@@ -101,10 +103,10 @@
 rect 152 427 186 461
 rect 262 359 296 393
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 193 1201 227 1271
 rect 193 845 227 861
@@ -128,30 +130,30 @@
 rect 207 115 241 131
 rect 293 266 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 66 649 100 683
 rect 162 575 196 609
 rect 223 501 257 535
 rect 291 427 325 461
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 54 683 112 689
 rect 54 649 66 683
 rect 100 649 134 683
@@ -173,14 +175,12 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 83 666 83 666 1 A0
 port 1 n
 rlabel metal1 179 592 179 592 1 A1
@@ -189,4 +189,6 @@
 port 3 n
 rlabel metal1 240 518 240 518 1 B0
 port 4 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__oai22_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__oai22_l.mag
index b7483b9..650efc1 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__oai22_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__oai22_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603913328
+timestamp 1606864608
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 462 1341
 << nmos >>
@@ -125,11 +127,11 @@
 rect 384 428 418 462
 rect 248 359 282 393
 << locali >>
-rect 0 1315 462 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 462 1315
+rect 0 1311 462 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 462 1311
 rect 35 1201 69 1271
 rect 35 777 69 793
 rect 200 1201 234 1217
@@ -160,37 +162,37 @@
 rect 379 199 413 215
 rect 241 131 379 149
 rect 207 115 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 66 649 100 683
 rect 162 575 196 609
 rect 223 501 257 535
 rect 384 428 418 462
 rect 316 353 350 387
 rect 316 279 350 313
-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 1315 462 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 462 1315
-rect 0 1271 462 1281
+rect 0 1311 462 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 462 1311
+rect 0 1271 462 1277
 rect 54 683 112 689
 rect 54 649 66 683
 rect 100 649 134 683
@@ -216,14 +218,13 @@
 rect 304 279 316 313
 rect 350 279 362 313
 rect 304 273 362 279
-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 metal1 240 518 240 518 1 B0
 port 4 n
 rlabel viali 179 592 179 592 1 A1
@@ -233,5 +234,6 @@
 rlabel viali 333 370 333 370 1 Y
 port 3 n
 rlabel viali 401 445 401 445 1 B1
-rlabel viali 68 1288 68 1288 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__or2_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__or2_1.mag
index b6c2fa8..e6d1621 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__or2_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__or2_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864446
+timestamp 1606864608
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
 << nmos >>
@@ -101,10 +103,10 @@
 rect 173 460 207 494
 rect 269 370 303 404
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 207 1201 241 1271
 rect 207 777 241 793
@@ -127,29 +129,29 @@
 rect 207 61 241 131
 rect 293 267 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 37 575 71 609
 rect 173 649 207 683
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 161 683 219 689
 rect 140 649 173 683
 rect 207 649 219 683
@@ -167,18 +169,18 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 190 666 190 666 1 A
 port 2 n
 rlabel metal1 54 592 54 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__or2_2.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__or2_2.mag
index a5a449d..689b7e1 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__or2_2.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__or2_2.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864470
+timestamp 1606864608
+<< checkpaint >>
+rect -1209 -1243 1617 2575
 << nwell >>
 rect -9 581 462 1341
 << nmos >>
@@ -124,11 +126,11 @@
 rect 173 460 207 494
 rect 269 370 303 404
 << locali >>
-rect 0 1315 462 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 462 1315
+rect 0 1311 462 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 462 1311
 rect 35 1201 69 1217
 rect 207 1201 241 1271
 rect 207 777 241 793
@@ -155,35 +157,35 @@
 rect 293 115 327 131
 rect 379 267 413 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
 rect 37 575 71 609
 rect 173 649 207 683
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 462 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 462 1315
-rect 0 1271 462 1281
+rect 0 1311 462 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 462 1311
+rect 0 1271 462 1277
 rect 161 683 219 689
 rect 140 649 173 683
 rect 207 649 219 683
@@ -201,19 +203,19 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 190 666 190 666 1 A
 port 2 n
 rlabel metal1 54 592 54 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__or2_4.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__or2_4.mag
index 2245790..8b7840c 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__or2_4.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__or2_4.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864501
+timestamp 1606864608
+<< checkpaint >>
+rect -1209 -1243 1753 2575
 << nwell >>
 rect -9 581 638 1341
 << nmos >>
@@ -162,12 +164,12 @@
 rect 173 460 207 494
 rect 269 370 303 404
 << locali >>
-rect 0 1315 638 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 638 1315
+rect 0 1311 638 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 638 1311
 rect 35 1201 69 1217
 rect 207 1201 241 1271
 rect 207 777 241 793
@@ -202,43 +204,43 @@
 rect 465 115 499 131
 rect 551 267 585 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 37 575 71 609
 rect 173 649 207 683
 rect 293 501 327 535
 rect 465 501 499 535
 rect 293 279 327 313
 rect 465 279 499 313
-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 1315 638 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 638 1315
-rect 0 1271 638 1281
+rect 0 1311 638 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 638 1311
+rect 0 1271 638 1277
 rect 161 683 219 689
 rect 140 649 173 683
 rect 207 649 219 683
@@ -263,20 +265,20 @@
 rect 499 279 511 313
 rect 281 273 339 279
 rect 453 273 511 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 190 666 190 666 1 A
 port 2 n
 rlabel metal1 54 592 54 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__or2_8.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__or2_8.mag
index 8666313..709d3d3 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__or2_8.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__or2_8.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864544
+timestamp 1606864609
+<< checkpaint >>
+rect -1209 -1243 2161 2575
 << nwell >>
 rect -9 581 990 1341
 << nmos >>
@@ -245,15 +247,15 @@
 rect 173 460 207 494
 rect 269 370 303 404
 << locali >>
-rect 0 1315 990 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 595 1315
-rect 629 1271 731 1315
-rect 765 1271 867 1315
-rect 901 1271 990 1315
+rect 0 1311 990 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 595 1311
+rect 629 1271 731 1311
+rect 765 1271 867 1311
+rect 901 1271 990 1311
 rect 35 1201 69 1217
 rect 207 1201 241 1271
 rect 207 777 241 793
@@ -304,30 +306,30 @@
 rect 809 115 843 131
 rect 895 267 929 283
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
-rect 595 1305 629 1315
-rect 595 1281 629 1305
-rect 731 1305 765 1315
-rect 731 1281 765 1305
-rect 867 1305 901 1315
-rect 867 1281 901 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
+rect 595 1305 629 1311
+rect 595 1277 629 1305
+rect 731 1305 765 1311
+rect 731 1277 765 1305
+rect 867 1305 901 1311
+rect 867 1277 901 1305
 rect 37 575 71 609
 rect 173 649 207 683
 rect 293 501 327 535
@@ -338,31 +340,31 @@
 rect 465 279 499 313
 rect 637 279 671 313
 rect 809 279 843 313
-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 1315 990 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 595 1315
-rect 629 1281 731 1315
-rect 765 1281 867 1315
-rect 901 1281 990 1315
-rect 0 1271 990 1281
+rect 0 1311 990 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 595 1311
+rect 629 1277 731 1311
+rect 765 1277 867 1311
+rect 901 1277 990 1311
+rect 0 1271 990 1277
 rect 161 683 219 689
 rect 140 649 173 683
 rect 207 649 219 683
@@ -402,23 +404,23 @@
 rect 453 273 511 279
 rect 625 273 683 279
 rect 797 273 855 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 190 666 190 666 1 A
 port 2 n
 rlabel metal1 54 592 54 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__or2_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__or2_l.mag
index 3936c17..cc30af0 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__or2_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__or2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864574
+timestamp 1606864609
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 374 1341
 << nmos >>
@@ -101,10 +103,10 @@
 rect 173 460 207 494
 rect 269 370 303 404
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 35 743 69 929
 rect 207 1201 241 1271
@@ -127,29 +129,29 @@
 rect 207 61 241 131
 rect 293 199 327 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 37 575 71 609
 rect 173 649 207 683
 rect 293 501 327 535
 rect 293 279 327 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 161 683 219 689
 rect 140 649 173 683
 rect 207 649 219 683
@@ -167,18 +169,18 @@
 rect 281 279 293 313
 rect 327 279 339 313
 rect 281 273 339 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 311 444 311 444 1 Y
 port 1 n
 rlabel metal1 54 592 54 592 1 B
 port 2 n
 rlabel metal1 190 666 190 666 1 A
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__tbufi_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__tbufi_1.mag
index 0b96d3c..4718bbd 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__tbufi_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__tbufi_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864606
+timestamp 1606864609
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 375 1341
 << nmos >>
@@ -98,10 +100,10 @@
 rect 121 353 155 387
 rect 248 401 282 435
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 709 155 725
@@ -122,29 +124,29 @@
 rect 121 61 155 131
 rect 279 267 313 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 211 649 245 683
 rect 279 501 313 535
 rect 121 353 155 387
 rect 279 279 313 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 199 683 257 689
 rect 177 649 211 683
 rect 245 649 257 683
@@ -166,18 +168,18 @@
 rect 267 279 279 313
 rect 313 279 325 313
 rect 267 273 325 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 305 364 305 364 1 Y
 port 1 n
 rlabel metal1 228 666 228 666 1 A
 port 2 n
 rlabel metal1 138 592 138 592 1 OE
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__tbufi_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__tbufi_l.mag
index 7408d03..dcc28e3 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__tbufi_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__tbufi_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603864958
+timestamp 1606864609
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 375 1341
 << nmos >>
@@ -98,10 +100,10 @@
 rect 121 353 155 387
 rect 248 401 282 435
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 35 513 69 861
 rect 121 1201 155 1271
@@ -122,29 +124,29 @@
 rect 121 61 155 131
 rect 279 199 313 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 211 649 245 683
 rect 279 501 313 535
 rect 121 353 155 387
 rect 279 279 313 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 199 683 257 689
 rect 177 649 211 683
 rect 245 649 257 683
@@ -166,18 +168,18 @@
 rect 267 279 279 313
 rect 313 279 325 313
 rect 267 273 325 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 305 364 305 364 1 Y
 port 1 n
 rlabel metal1 228 666 228 666 1 A
 port 2 n
 rlabel metal1 138 592 138 592 1 OE
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__tiehi.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__tiehi.mag
index eab20e3..d05b702 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__tiehi.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__tiehi.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865006
+timestamp 1606864609
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << nmos >>
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 383 124 417
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 641 69 657
 rect 121 1201 155 1217
@@ -67,31 +69,31 @@
 rect 35 61 69 131
 rect 121 267 155 383
 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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 121 575 155 609
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 94 609 167 615
 rect 94 575 121 609
 rect 155 575 167 609
 rect 94 569 167 575
-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 68 1288 68 1288 1 vdd
 rlabel metal1 138 592 138 592 1 Y
 port 1 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__tielo.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__tielo.mag
index ee5c3ad..5a351a2 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__tielo.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__tielo.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865020
+timestamp 1606864610
+<< checkpaint >>
+rect -1209 -1243 1345 2575
 << nwell >>
 rect -9 581 199 1341
 << nmos >>
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 515 124 549
 << locali >>
-rect 0 1315 198 1332
-rect 0 1271 51 1315
-rect 85 1271 198 1315
+rect 0 1311 198 1332
+rect 0 1271 51 1311
+rect 85 1271 198 1311
 rect 35 1201 69 1271
 rect 35 641 69 657
 rect 121 1201 155 1217
@@ -67,31 +69,31 @@
 rect 35 61 69 131
 rect 121 267 155 353
 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 1305 85 1315
-rect 51 1281 85 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
 rect 121 353 155 387
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1315 198 1332
-rect 0 1281 51 1315
-rect 85 1281 198 1315
-rect 0 1271 198 1281
+rect 0 1311 198 1332
+rect 0 1277 51 1311
+rect 85 1277 198 1311
+rect 0 1271 198 1277
 rect 94 387 167 393
 rect 94 353 121 387
 rect 155 353 167 387
 rect 94 347 167 353
-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 68 1288 68 1288 1 vdd
 rlabel metal1 138 370 138 370 1 Y
 port 1 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__tnbufi_1.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__tnbufi_1.mag
index 4b8f4a0..1e21fd3 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__tnbufi_1.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__tnbufi_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865046
+timestamp 1606864610
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 375 1341
 << nmos >>
@@ -97,10 +99,10 @@
 rect 121 418 155 452
 rect 248 401 282 435
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 709 155 725
@@ -121,29 +123,29 @@
 rect 121 61 155 131
 rect 279 267 313 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 211 649 245 683
 rect 121 575 155 609
 rect 279 501 313 535
 rect 279 279 313 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 199 683 257 689
 rect 177 649 211 683
 rect 245 649 257 683
@@ -161,18 +163,18 @@
 rect 267 279 279 313
 rect 313 279 325 313
 rect 267 273 325 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 305 364 305 364 1 Y
 port 1 n
 rlabel metal1 228 666 228 666 1 A
 port 2 n
 rlabel metal1 138 592 138 592 1 OE
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__tnbufi_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__tnbufi_l.mag
index b85083e..be98072 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__tnbufi_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__tnbufi_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865067
+timestamp 1606864610
+<< checkpaint >>
+rect -1209 -1243 1481 2575
 << nwell >>
 rect -9 581 375 1341
 << nmos >>
@@ -97,10 +99,10 @@
 rect 121 418 155 452
 rect 248 401 282 435
 << locali >>
-rect 0 1315 374 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 374 1315
+rect 0 1311 374 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 374 1311
 rect 35 1201 69 1217
 rect 35 452 69 861
 rect 121 1201 155 1271
@@ -121,29 +123,29 @@
 rect 121 61 155 131
 rect 279 199 313 279
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
 rect 211 649 245 683
 rect 121 575 155 609
 rect 279 501 313 535
 rect 279 279 313 313
-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 1315 374 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 374 1315
-rect 0 1271 374 1281
+rect 0 1311 374 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 374 1311
+rect 0 1271 374 1277
 rect 199 683 257 689
 rect 177 649 211 683
 rect 245 649 257 683
@@ -161,18 +163,18 @@
 rect 267 279 279 313
 rect 313 279 325 313
 rect 267 273 325 279
-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 68 1288 68 1288 1 vdd
 rlabel metal1 305 364 305 364 1 Y
 port 1 n
 rlabel metal1 228 666 228 666 1 A
 port 2 n
 rlabel metal1 138 592 138 592 1 OE
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__xnor2_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__xnor2_l.mag
index 5cba490..76a281d 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__xnor2_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__xnor2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865125
+timestamp 1606864610
+<< checkpaint >>
+rect -1209 -1243 1753 2575
 << nwell >>
 rect -9 581 638 1341
 << nmos >>
@@ -169,12 +171,12 @@
 rect 336 353 370 387
 rect 489 353 523 387
 << locali >>
-rect 0 1315 638 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 638 1315
+rect 0 1311 638 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 638 1311
 rect 35 1201 69 1217
 rect 35 495 69 657
 rect 121 1201 155 1271
@@ -212,21 +214,21 @@
 rect 471 199 505 215
 rect 471 61 505 131
 rect 557 115 591 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 268 657 279 683
 rect 279 657 302 683
 rect 268 649 302 657
@@ -234,22 +236,22 @@
 rect 268 353 302 387
 rect 489 353 523 387
 rect 412 279 446 313
-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 1315 638 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 638 1315
-rect 0 1271 638 1281
+rect 0 1311 638 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 638 1311
+rect 0 1271 638 1277
 rect 256 683 314 689
 rect 256 649 268 683
 rect 302 649 314 683
@@ -270,20 +272,20 @@
 rect 446 279 458 313
 rect 140 273 198 279
 rect 400 273 458 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 170 296 170 296 1 A
 port 1 n
 rlabel metal1 506 370 506 370 1 B
 port 2 n
 rlabel metal1 284 427 284 427 1 Y
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>
diff --git a/18T_ms/magic/sky130_osu_sc_18T_ms__xor2_l.mag b/18T_ms/magic/sky130_osu_sc_18T_ms__xor2_l.mag
index d29a060..9e67659 100644
--- a/18T_ms/magic/sky130_osu_sc_18T_ms__xor2_l.mag
+++ b/18T_ms/magic/sky130_osu_sc_18T_ms__xor2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1603865151
+timestamp 1606864610
+<< checkpaint >>
+rect -1209 -1243 1753 2575
 << nwell >>
 rect -9 581 638 1341
 << nmos >>
@@ -168,12 +170,12 @@
 rect 430 427 464 461
 rect 248 353 282 387
 << locali >>
-rect 0 1315 638 1332
-rect 0 1271 51 1315
-rect 85 1271 187 1315
-rect 221 1271 323 1315
-rect 357 1271 459 1315
-rect 493 1271 638 1315
+rect 0 1311 638 1332
+rect 0 1271 51 1311
+rect 85 1271 187 1311
+rect 221 1271 323 1311
+rect 357 1271 459 1311
+rect 493 1271 638 1311
 rect 35 1201 69 1217
 rect 121 1201 155 1271
 rect 121 777 155 793
@@ -213,42 +215,42 @@
 rect 471 61 505 131
 rect 557 267 591 353
 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 1305 85 1315
-rect 51 1281 85 1305
-rect 187 1305 221 1315
-rect 187 1281 221 1305
-rect 323 1305 357 1315
-rect 323 1281 357 1305
-rect 459 1305 493 1315
-rect 459 1281 493 1305
+rect 51 1305 85 1311
+rect 51 1277 85 1305
+rect 187 1305 221 1311
+rect 187 1277 221 1305
+rect 323 1305 357 1311
+rect 323 1277 357 1305
+rect 459 1305 493 1311
+rect 459 1277 493 1305
 rect 200 649 234 683
 rect 412 649 446 683
 rect 268 501 302 535
 rect 489 575 523 609
 rect 296 279 330 313
-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 1315 638 1332
-rect 0 1281 51 1315
-rect 85 1281 187 1315
-rect 221 1281 323 1315
-rect 357 1281 459 1315
-rect 493 1281 638 1315
-rect 0 1271 638 1281
+rect 0 1311 638 1332
+rect 0 1277 51 1311
+rect 85 1277 187 1311
+rect 221 1277 323 1311
+rect 357 1277 459 1311
+rect 493 1277 638 1311
+rect 0 1271 638 1277
 rect 188 683 246 689
 rect 400 683 458 689
 rect 188 649 200 683
@@ -269,20 +271,20 @@
 rect 268 279 296 313
 rect 330 279 342 313
 rect 284 273 342 279
-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 68 44 68 44 1 gnd
-rlabel viali 68 1288 68 1288 1 vdd
 rlabel metal1 218 666 218 666 1 A
 port 1 n
 rlabel metal1 285 486 285 486 1 Y
 port 2 n
 rlabel metal1 506 592 506 592 1 B
 port 3 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1284 68 1284 1 vdd
 << end >>