Revised files; characterization pending due to license starvation
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__addf_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__addf_1.gds
new file mode 100644
index 0000000..5903eaa
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__addf_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__addf_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__addf_l.gds
new file mode 100644
index 0000000..2d6ea32
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__addf_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__addh_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__addh_1.gds
new file mode 100644
index 0000000..35c7ea2
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__addh_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__addh_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__addh_l.gds
new file mode 100644
index 0000000..4faf491
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__addh_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_1.gds
new file mode 100644
index 0000000..d54df1e
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_2.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_2.gds
new file mode 100644
index 0000000..197837f
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_2.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_4.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_4.gds
new file mode 100644
index 0000000..b9923f5
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_4.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_6.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_6.gds
new file mode 100644
index 0000000..617b0bc
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_6.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_8.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_8.gds
new file mode 100644
index 0000000..a6d189f
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_8.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_l.gds
new file mode 100644
index 0000000..7abaf25
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__ant.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__ant.gds
new file mode 100644
index 0000000..b9bbc5a
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__ant.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__antfill.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__antfill.gds
new file mode 100644
index 0000000..b9ffc19
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__antfill.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__aoi21_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__aoi21_l.gds
new file mode 100644
index 0000000..700db18
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__aoi21_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__aoi22_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__aoi22_l.gds
new file mode 100644
index 0000000..5148667
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__aoi22_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_1.gds
new file mode 100644
index 0000000..bd25e03
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_2.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_2.gds
new file mode 100644
index 0000000..a5e768f
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_2.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_4.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_4.gds
new file mode 100644
index 0000000..a3d54b7
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_4.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_6.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_6.gds
new file mode 100644
index 0000000..54108ac
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_6.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_8.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_8.gds
new file mode 100644
index 0000000..10991d2
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_8.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_l.gds
new file mode 100644
index 0000000..50c06c1
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__decap_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__decap_1.gds
new file mode 100644
index 0000000..f78ff22
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__decap_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__decap_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__decap_l.gds
new file mode 100644
index 0000000..ec67d6b
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__decap_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__dff_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__dff_1.gds
new file mode 100644
index 0000000..c06761b
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__dff_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__dff_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__dff_l.gds
new file mode 100644
index 0000000..4bebcf7
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__dff_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__dffr_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__dffr_1.gds
new file mode 100644
index 0000000..8ee77cb
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__dffr_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__dffr_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__dffr_l.gds
new file mode 100644
index 0000000..361d3e6
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__dffr_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__dffs_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__dffs_1.gds
new file mode 100644
index 0000000..6074444
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__dffs_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__dffs_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__dffs_l.gds
new file mode 100644
index 0000000..71c27ef
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__dffs_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__dffsr_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__dffsr_1.gds
new file mode 100644
index 0000000..f7f6f1b
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__dffsr_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__dffsr_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__dffsr_l.gds
new file mode 100644
index 0000000..47cc53c
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__dffsr_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_1.gds
new file mode 100644
index 0000000..7bf3910
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_16.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_16.gds
new file mode 100644
index 0000000..c319090
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_16.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_2.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_2.gds
new file mode 100644
index 0000000..a4b3ad5
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_2.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_32.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_32.gds
new file mode 100644
index 0000000..e09dd08
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_32.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_4.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_4.gds
new file mode 100644
index 0000000..101d87f
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_4.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_8.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_8.gds
new file mode 100644
index 0000000..0deeb13
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_8.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_1.gds
new file mode 100644
index 0000000..275f710
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_10.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_10.gds
new file mode 100644
index 0000000..2527611
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_10.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_2.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_2.gds
new file mode 100644
index 0000000..a259a7d
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_2.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_3.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_3.gds
new file mode 100644
index 0000000..dc243a9
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_3.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_4.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_4.gds
new file mode 100644
index 0000000..a7b3224
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_4.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_6.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_6.gds
new file mode 100644
index 0000000..a845722
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_6.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_8.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_8.gds
new file mode 100644
index 0000000..24d03d7
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_8.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_l.gds
new file mode 100644
index 0000000..fa2b4ee
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__mux2_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__mux2_1.gds
new file mode 100644
index 0000000..3fb3951
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__mux2_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__nand2_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__nand2_1.gds
new file mode 100644
index 0000000..0334b2d
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__nand2_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__nand2_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__nand2_l.gds
new file mode 100644
index 0000000..a6c5f84
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__nand2_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__nor2_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__nor2_1.gds
new file mode 100644
index 0000000..296f314
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__nor2_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__nor2_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__nor2_l.gds
new file mode 100644
index 0000000..e038ecc
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__nor2_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__oai21_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__oai21_l.gds
new file mode 100644
index 0000000..e79b74e
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__oai21_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__oai22_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__oai22_l.gds
new file mode 100644
index 0000000..276e7ca
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__oai22_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__or2_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_1.gds
new file mode 100644
index 0000000..eebfd2f
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__or2_2.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_2.gds
new file mode 100644
index 0000000..d307d27
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_2.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__or2_4.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_4.gds
new file mode 100644
index 0000000..7b52b0b
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_4.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__or2_8.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_8.gds
new file mode 100644
index 0000000..bd90893
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_8.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__or2_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_l.gds
new file mode 100644
index 0000000..53bc42c
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__tbufi_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__tbufi_1.gds
new file mode 100644
index 0000000..42f989a
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__tbufi_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__tbufi_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__tbufi_l.gds
new file mode 100644
index 0000000..6b9e9f7
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__tbufi_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__tiehi.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__tiehi.gds
new file mode 100644
index 0000000..8a03e99
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__tiehi.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__tielo.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__tielo.gds
new file mode 100644
index 0000000..432068c
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__tielo.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__tnbufi_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__tnbufi_1.gds
new file mode 100644
index 0000000..1b04972
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__tnbufi_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__tnbufi_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__tnbufi_l.gds
new file mode 100644
index 0000000..f7599db
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__tnbufi_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__xnor2_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__xnor2_l.gds
new file mode 100644
index 0000000..1c3017f
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__xnor2_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__xor2_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__xor2_l.gds
new file mode 100644
index 0000000..b82b86e
--- /dev/null
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__xor2_l.gds
Binary files differ
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__addf_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__addf_1.mag
new file mode 100644
index 0000000..38e0bec
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__addf_1.mag
@@ -0,0 +1,650 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007747
+<< checkpaint >>
+rect -1269 -242 2695 2379
+<< nwell >>
+rect -9 529 1435 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 410 115 440 263
+rect 496 115 526 263
+rect 582 115 612 263
+rect 668 115 698 263
+rect 754 115 784 263
+rect 840 115 870 263
+rect 922 115 952 263
+rect 1004 115 1034 263
+rect 1102 115 1132 263
+rect 1292 115 1322 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+rect 410 565 440 965
+rect 496 565 526 965
+rect 582 565 612 965
+rect 668 565 698 965
+rect 754 565 784 965
+rect 840 565 870 965
+rect 922 565 952 965
+rect 1004 565 1034 965
+rect 1102 565 1132 965
+rect 1292 565 1322 965
+<< ndiff >>
+rect 27 233 80 263
+rect 27 131 35 233
+rect 69 131 80 233
+rect 27 115 80 131
+rect 110 165 166 263
+rect 110 131 121 165
+rect 155 131 166 165
+rect 110 115 166 131
+rect 196 233 252 263
+rect 196 131 207 233
+rect 241 131 252 233
+rect 196 115 252 131
+rect 282 233 338 263
+rect 282 131 293 233
+rect 327 131 338 233
+rect 282 115 338 131
+rect 368 115 410 263
+rect 440 233 496 263
+rect 440 131 451 233
+rect 485 131 496 233
+rect 440 115 496 131
+rect 526 233 582 263
+rect 526 131 537 233
+rect 571 131 582 233
+rect 526 115 582 131
+rect 612 165 668 263
+rect 612 131 623 165
+rect 657 131 668 165
+rect 612 115 668 131
+rect 698 233 754 263
+rect 698 131 709 233
+rect 743 131 754 233
+rect 698 115 754 131
+rect 784 165 840 263
+rect 784 131 795 165
+rect 829 131 840 165
+rect 784 115 840 131
+rect 870 115 922 263
+rect 952 115 1004 263
+rect 1034 233 1102 263
+rect 1034 131 1045 233
+rect 1079 131 1102 233
+rect 1034 115 1102 131
+rect 1132 165 1185 263
+rect 1132 131 1143 165
+rect 1177 131 1185 165
+rect 1132 115 1185 131
+rect 1239 165 1292 263
+rect 1239 131 1247 165
+rect 1281 131 1292 165
+rect 1239 115 1292 131
+rect 1322 233 1375 263
+rect 1322 131 1333 233
+rect 1367 131 1375 233
+rect 1322 115 1375 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 677 35 949
+rect 69 677 80 949
+rect 27 565 80 677
+rect 110 949 166 965
+rect 110 745 121 949
+rect 155 745 166 949
+rect 110 565 166 745
+rect 196 949 252 965
+rect 196 677 207 949
+rect 241 677 252 949
+rect 196 565 252 677
+rect 282 949 338 965
+rect 282 677 293 949
+rect 327 677 338 949
+rect 282 565 338 677
+rect 368 565 410 965
+rect 440 949 496 965
+rect 440 677 451 949
+rect 485 677 496 949
+rect 440 565 496 677
+rect 526 949 582 965
+rect 526 677 537 949
+rect 571 677 582 949
+rect 526 565 582 677
+rect 612 949 668 965
+rect 612 745 623 949
+rect 657 745 668 949
+rect 612 565 668 745
+rect 698 949 754 965
+rect 698 677 709 949
+rect 743 677 754 949
+rect 698 565 754 677
+rect 784 949 840 965
+rect 784 677 795 949
+rect 829 677 840 949
+rect 784 565 840 677
+rect 870 565 922 965
+rect 952 565 1004 965
+rect 1034 949 1102 965
+rect 1034 745 1045 949
+rect 1079 745 1102 949
+rect 1034 565 1102 745
+rect 1132 949 1185 965
+rect 1132 677 1143 949
+rect 1177 677 1185 949
+rect 1132 565 1185 677
+rect 1239 949 1292 965
+rect 1239 609 1247 949
+rect 1281 609 1292 949
+rect 1239 565 1292 609
+rect 1322 949 1375 965
+rect 1322 609 1333 949
+rect 1367 609 1375 949
+rect 1322 565 1375 609
+<< ndiffc >>
+rect 35 131 69 233
+rect 121 131 155 165
+rect 207 131 241 233
+rect 293 131 327 233
+rect 451 131 485 233
+rect 537 131 571 233
+rect 623 131 657 165
+rect 709 131 743 233
+rect 795 131 829 165
+rect 1045 131 1079 233
+rect 1143 131 1177 165
+rect 1247 131 1281 165
+rect 1333 131 1367 233
+<< pdiffc >>
+rect 35 677 69 949
+rect 121 745 155 949
+rect 207 677 241 949
+rect 293 677 327 949
+rect 451 677 485 949
+rect 537 677 571 949
+rect 623 745 657 949
+rect 709 677 743 949
+rect 795 677 829 949
+rect 1045 745 1079 949
+rect 1143 677 1177 949
+rect 1247 609 1281 949
+rect 1333 609 1367 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+rect 571 27 595 61
+rect 629 27 653 61
+rect 707 27 731 61
+rect 765 27 789 61
+rect 843 27 867 61
+rect 901 27 925 61
+rect 979 27 1003 61
+rect 1037 27 1061 61
+rect 1115 27 1139 61
+rect 1173 27 1197 61
+rect 1251 27 1275 61
+rect 1309 27 1333 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+rect 571 1049 595 1083
+rect 629 1049 653 1083
+rect 707 1049 731 1083
+rect 765 1049 789 1083
+rect 843 1049 867 1083
+rect 901 1049 925 1083
+rect 979 1049 1003 1083
+rect 1037 1049 1061 1083
+rect 1115 1049 1139 1083
+rect 1173 1049 1197 1083
+rect 1251 1049 1275 1083
+rect 1309 1049 1333 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+rect 595 27 629 61
+rect 731 27 765 61
+rect 867 27 901 61
+rect 1003 27 1037 61
+rect 1139 27 1173 61
+rect 1275 27 1309 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+rect 595 1049 629 1083
+rect 731 1049 765 1083
+rect 867 1049 901 1083
+rect 1003 1049 1037 1083
+rect 1139 1049 1173 1083
+rect 1275 1049 1309 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 993
+rect 338 965 368 993
+rect 410 965 440 991
+rect 496 965 526 991
+rect 582 965 612 993
+rect 668 965 698 993
+rect 754 965 784 993
+rect 840 965 870 993
+rect 922 965 952 993
+rect 1004 965 1034 993
+rect 1102 965 1132 993
+rect 1292 965 1322 993
+rect 80 351 110 565
+rect 166 533 196 565
+rect 152 517 206 533
+rect 152 483 162 517
+rect 196 483 206 517
+rect 152 467 206 483
+rect 70 335 124 351
+rect 70 301 80 335
+rect 114 301 124 335
+rect 70 285 124 301
+rect 80 263 110 285
+rect 166 263 196 467
+rect 252 425 282 565
+rect 338 467 368 565
+rect 410 540 440 565
+rect 496 540 526 565
+rect 410 510 526 540
+rect 338 451 430 467
+rect 238 409 292 425
+rect 238 375 248 409
+rect 282 375 292 409
+rect 238 359 292 375
+rect 338 417 386 451
+rect 420 417 430 451
+rect 338 401 430 417
+rect 252 263 282 359
+rect 338 263 368 401
+rect 472 351 502 510
+rect 582 362 612 565
+rect 668 499 698 565
+rect 656 483 710 499
+rect 656 449 666 483
+rect 700 449 710 483
+rect 656 433 710 449
+rect 472 335 526 351
+rect 472 315 482 335
+rect 410 301 482 315
+rect 516 301 526 335
+rect 410 285 526 301
+rect 568 346 622 362
+rect 568 312 578 346
+rect 612 312 622 346
+rect 568 296 622 312
+rect 410 263 440 285
+rect 496 263 526 285
+rect 582 263 612 296
+rect 668 263 698 433
+rect 754 351 784 565
+rect 840 499 870 565
+rect 826 483 880 499
+rect 826 449 836 483
+rect 870 449 880 483
+rect 826 433 880 449
+rect 922 461 952 565
+rect 1004 533 1034 565
+rect 1004 503 1048 533
+rect 1102 532 1132 565
+rect 922 445 976 461
+rect 742 335 796 351
+rect 742 301 752 335
+rect 786 301 796 335
+rect 742 285 796 301
+rect 754 263 784 285
+rect 840 263 870 433
+rect 922 411 932 445
+rect 966 411 976 445
+rect 922 395 976 411
+rect 922 263 952 395
+rect 1018 351 1048 503
+rect 1090 516 1144 532
+rect 1292 529 1322 565
+rect 1090 482 1100 516
+rect 1134 482 1144 516
+rect 1090 466 1144 482
+rect 1255 513 1322 529
+rect 1255 479 1265 513
+rect 1299 479 1322 513
+rect 1004 335 1058 351
+rect 1004 301 1014 335
+rect 1048 301 1058 335
+rect 1004 285 1058 301
+rect 1004 263 1034 285
+rect 1102 263 1132 466
+rect 1255 463 1322 479
+rect 1292 263 1322 463
+rect 80 81 110 115
+rect 166 82 196 115
+rect 252 82 282 115
+rect 338 82 368 115
+rect 410 82 440 115
+rect 496 82 526 115
+rect 582 82 612 115
+rect 668 82 698 115
+rect 754 82 784 115
+rect 840 82 870 115
+rect 922 82 952 115
+rect 1004 82 1034 115
+rect 1102 80 1132 115
+rect 1292 80 1322 115
+<< polycont >>
+rect 162 483 196 517
+rect 80 301 114 335
+rect 248 375 282 409
+rect 386 417 420 451
+rect 666 449 700 483
+rect 482 301 516 335
+rect 578 312 612 346
+rect 836 449 870 483
+rect 752 301 786 335
+rect 932 411 966 445
+rect 1100 482 1134 516
+rect 1265 479 1299 513
+rect 1014 301 1048 335
+<< locali >>
+rect 0 1093 1408 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 459 1093
+rect 493 1049 595 1093
+rect 629 1049 731 1093
+rect 765 1049 867 1093
+rect 901 1049 1003 1093
+rect 1037 1049 1139 1093
+rect 1173 1049 1275 1093
+rect 1309 1049 1408 1093
+rect 35 949 69 965
+rect 121 949 155 1049
+rect 121 729 155 745
+rect 207 949 241 965
+rect 35 657 69 677
+rect 207 657 241 677
+rect 35 623 241 657
+rect 293 949 327 965
+rect 293 590 327 677
+rect 451 949 485 1049
+rect 451 661 485 677
+rect 537 949 571 965
+rect 623 949 657 1049
+rect 623 729 657 745
+rect 709 949 743 965
+rect 537 656 571 677
+rect 709 656 743 677
+rect 537 622 743 656
+rect 795 949 829 965
+rect 1045 949 1079 1049
+rect 1045 729 1079 745
+rect 1143 949 1177 965
+rect 795 632 829 677
+rect 1143 632 1177 677
+rect 795 598 1100 632
+rect 293 553 350 590
+rect 795 589 829 598
+rect 80 483 162 517
+rect 196 483 212 517
+rect 248 409 282 425
+rect 248 359 282 375
+rect 64 301 80 335
+rect 114 301 130 335
+rect 316 318 350 553
+rect 752 554 829 589
+rect 578 483 612 489
+rect 386 451 444 483
+rect 420 449 444 451
+rect 650 449 666 483
+rect 700 449 716 483
+rect 386 401 420 417
+rect 578 346 612 449
+rect 666 409 700 449
+rect 752 409 786 554
+rect 1066 532 1100 598
+rect 1247 949 1281 1049
+rect 1177 598 1202 615
+rect 1143 581 1202 598
+rect 1247 593 1281 609
+rect 1333 949 1367 965
+rect 1066 516 1134 532
+rect 1066 485 1100 516
+rect 820 449 836 483
+rect 870 449 886 483
+rect 1089 482 1100 485
+rect 1100 466 1134 482
+rect 932 445 966 461
+rect 932 409 966 411
+rect 1168 409 1202 581
+rect 1333 557 1367 609
+rect 752 375 879 409
+rect 1143 375 1202 409
+rect 1265 513 1299 529
+rect 293 284 350 318
+rect 466 301 482 335
+rect 516 301 532 335
+rect 578 296 612 312
+rect 736 301 752 335
+rect 786 301 811 335
+rect 293 261 327 284
+rect 35 233 241 252
+rect 69 218 207 233
+rect 35 115 69 131
+rect 121 165 155 181
+rect 121 61 155 131
+rect 207 114 241 131
+rect 777 261 811 301
+rect 293 114 327 131
+rect 451 233 485 249
+rect 451 61 485 131
+rect 537 233 743 252
+rect 571 218 709 233
+rect 537 114 571 131
+rect 623 165 657 181
+rect 623 61 657 131
+rect 845 181 879 375
+rect 998 301 1014 335
+rect 1048 301 1064 335
+rect 709 114 743 131
+rect 795 165 879 181
+rect 829 131 879 165
+rect 1045 233 1079 249
+rect 795 114 829 131
+rect 1045 61 1079 131
+rect 1143 165 1177 375
+rect 1265 261 1299 479
+rect 1245 227 1299 261
+rect 1333 233 1367 523
+rect 1143 115 1177 131
+rect 1247 165 1281 181
+rect 1247 61 1281 131
+rect 1333 115 1367 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 459 61
+rect 493 17 595 61
+rect 629 17 731 61
+rect 765 17 867 61
+rect 901 17 1003 61
+rect 1037 17 1139 61
+rect 1173 17 1275 61
+rect 1309 17 1408 61
+rect 0 0 1408 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 459 1083 493 1093
+rect 459 1059 493 1083
+rect 595 1083 629 1093
+rect 595 1059 629 1083
+rect 731 1083 765 1093
+rect 731 1059 765 1083
+rect 867 1083 901 1093
+rect 867 1059 901 1083
+rect 1003 1083 1037 1093
+rect 1003 1059 1037 1083
+rect 1139 1083 1173 1093
+rect 1139 1059 1173 1083
+rect 1275 1083 1309 1093
+rect 1275 1059 1309 1083
+rect 80 449 114 483
+rect 248 375 282 409
+rect 80 301 114 335
+rect 444 449 478 483
+rect 578 449 612 483
+rect 666 375 700 409
+rect 1143 598 1177 632
+rect 836 449 870 483
+rect 932 375 966 409
+rect 482 301 516 335
+rect 293 233 327 261
+rect 293 227 327 233
+rect 777 227 811 261
+rect 1014 301 1048 335
+rect 1211 227 1245 261
+rect 1333 523 1367 557
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+rect 459 27 493 51
+rect 459 17 493 27
+rect 595 27 629 51
+rect 595 17 629 27
+rect 731 27 765 51
+rect 731 17 765 27
+rect 867 27 901 51
+rect 867 17 901 27
+rect 1003 27 1037 51
+rect 1003 17 1037 27
+rect 1139 27 1173 51
+rect 1139 17 1173 27
+rect 1275 27 1309 51
+rect 1275 17 1309 27
+<< metal1 >>
+rect 0 1093 1408 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 459 1093
+rect 493 1059 595 1093
+rect 629 1059 731 1093
+rect 765 1059 867 1093
+rect 901 1059 1003 1093
+rect 1037 1059 1139 1093
+rect 1173 1059 1275 1093
+rect 1309 1059 1408 1093
+rect 0 1049 1408 1059
+rect 1131 632 1189 638
+rect 1109 598 1143 632
+rect 1177 598 1189 632
+rect 1131 592 1189 598
+rect 1321 557 1379 563
+rect 1299 523 1333 557
+rect 1367 523 1379 557
+rect 1321 517 1379 523
+rect 68 483 126 489
+rect 432 483 490 489
+rect 566 483 624 489
+rect 824 483 882 489
+rect 68 449 80 483
+rect 114 449 444 483
+rect 478 449 578 483
+rect 612 450 836 483
+rect 612 449 734 450
+rect 812 449 836 450
+rect 870 449 882 483
+rect 68 443 126 449
+rect 432 443 490 449
+rect 566 443 624 449
+rect 824 443 882 449
+rect 236 409 294 415
+rect 654 409 712 415
+rect 920 409 978 415
+rect 80 375 248 409
+rect 282 375 666 409
+rect 700 375 932 409
+rect 966 375 978 409
+rect 236 369 294 375
+rect 654 369 712 375
+rect 920 369 978 375
+rect 68 335 126 341
+rect 470 335 528 341
+rect 1002 335 1060 341
+rect 68 301 80 335
+rect 114 301 482 335
+rect 516 301 1014 335
+rect 1048 301 1060 335
+rect 68 295 126 301
+rect 470 295 528 301
+rect 1002 295 1060 301
+rect 281 261 339 267
+rect 765 261 823 267
+rect 1199 261 1257 267
+rect 281 227 293 261
+rect 327 227 777 261
+rect 811 227 1211 261
+rect 1245 227 1257 261
+rect 281 221 339 227
+rect 765 221 823 227
+rect 1199 221 1257 227
+rect 0 51 1408 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 459 51
+rect 493 17 595 51
+rect 629 17 731 51
+rect 765 17 867 51
+rect 901 17 1003 51
+rect 1037 17 1139 51
+rect 1173 17 1275 51
+rect 1309 17 1408 51
+rect 0 0 1408 17
+<< labels >>
+rlabel viali 97 318 97 318 1 A
+port 1 n
+rlabel viali 265 392 265 392 1 CI
+port 2 n
+rlabel metal1 129 466 129 466 1 B
+port 3 n
+rlabel viali 1228 244 1228 244 1 CON
+port 4 n
+rlabel viali 1160 615 1160 615 1 S
+port 5 n
+rlabel viali 1350 540 1350 540 1 CO
+port 6 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__addf_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__addf_l.mag
new file mode 100644
index 0000000..d92f310
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__addf_l.mag
@@ -0,0 +1,652 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007748
+<< checkpaint >>
+rect -1269 -242 2695 2379
+<< nwell >>
+rect -9 529 1435 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 410 115 440 263
+rect 496 115 526 263
+rect 582 115 612 263
+rect 668 115 698 263
+rect 754 115 784 263
+rect 840 115 870 263
+rect 922 115 952 263
+rect 1004 115 1034 263
+rect 1102 115 1132 219
+rect 1292 115 1322 219
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+rect 410 565 440 965
+rect 496 565 526 965
+rect 582 565 612 965
+rect 668 565 698 965
+rect 754 565 784 965
+rect 840 565 870 965
+rect 922 565 952 965
+rect 1004 565 1034 965
+rect 1102 713 1132 965
+rect 1292 713 1322 965
+<< ndiff >>
+rect 27 233 80 263
+rect 27 131 35 233
+rect 69 131 80 233
+rect 27 115 80 131
+rect 110 165 166 263
+rect 110 131 121 165
+rect 155 131 166 165
+rect 110 115 166 131
+rect 196 233 252 263
+rect 196 131 207 233
+rect 241 131 252 233
+rect 196 115 252 131
+rect 282 233 338 263
+rect 282 131 293 233
+rect 327 131 338 233
+rect 282 115 338 131
+rect 368 115 410 263
+rect 440 233 496 263
+rect 440 131 451 233
+rect 485 131 496 233
+rect 440 115 496 131
+rect 526 233 582 263
+rect 526 131 537 233
+rect 571 131 582 233
+rect 526 115 582 131
+rect 612 165 668 263
+rect 612 131 623 165
+rect 657 131 668 165
+rect 612 115 668 131
+rect 698 233 754 263
+rect 698 131 709 233
+rect 743 131 754 233
+rect 698 115 754 131
+rect 784 165 840 263
+rect 784 131 795 165
+rect 829 131 840 165
+rect 784 115 840 131
+rect 870 115 922 263
+rect 952 115 1004 263
+rect 1034 233 1087 263
+rect 1034 131 1045 233
+rect 1079 219 1087 233
+rect 1079 131 1102 219
+rect 1034 115 1102 131
+rect 1132 165 1185 219
+rect 1132 131 1143 165
+rect 1177 131 1185 165
+rect 1132 115 1185 131
+rect 1239 165 1292 219
+rect 1239 131 1247 165
+rect 1281 131 1292 165
+rect 1239 115 1292 131
+rect 1322 165 1375 219
+rect 1322 131 1333 165
+rect 1367 131 1375 165
+rect 1322 115 1375 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 677 35 949
+rect 69 677 80 949
+rect 27 565 80 677
+rect 110 949 166 965
+rect 110 745 121 949
+rect 155 745 166 949
+rect 110 565 166 745
+rect 196 949 252 965
+rect 196 677 207 949
+rect 241 677 252 949
+rect 196 565 252 677
+rect 282 949 338 965
+rect 282 677 293 949
+rect 327 677 338 949
+rect 282 565 338 677
+rect 368 565 410 965
+rect 440 949 496 965
+rect 440 677 451 949
+rect 485 677 496 949
+rect 440 565 496 677
+rect 526 949 582 965
+rect 526 677 537 949
+rect 571 677 582 949
+rect 526 565 582 677
+rect 612 949 668 965
+rect 612 745 623 949
+rect 657 745 668 949
+rect 612 565 668 745
+rect 698 949 754 965
+rect 698 677 709 949
+rect 743 677 754 949
+rect 698 565 754 677
+rect 784 949 840 965
+rect 784 677 795 949
+rect 829 677 840 949
+rect 784 565 840 677
+rect 870 565 922 965
+rect 952 565 1004 965
+rect 1034 949 1102 965
+rect 1034 745 1045 949
+rect 1079 745 1102 949
+rect 1034 713 1102 745
+rect 1132 949 1185 965
+rect 1132 813 1143 949
+rect 1177 813 1185 949
+rect 1132 713 1185 813
+rect 1239 949 1292 965
+rect 1239 813 1247 949
+rect 1281 813 1292 949
+rect 1239 713 1292 813
+rect 1322 949 1375 965
+rect 1322 813 1333 949
+rect 1367 813 1375 949
+rect 1322 713 1375 813
+rect 1034 565 1087 713
+<< ndiffc >>
+rect 35 131 69 233
+rect 121 131 155 165
+rect 207 131 241 233
+rect 293 131 327 233
+rect 451 131 485 233
+rect 537 131 571 233
+rect 623 131 657 165
+rect 709 131 743 233
+rect 795 131 829 165
+rect 1045 131 1079 233
+rect 1143 131 1177 165
+rect 1247 131 1281 165
+rect 1333 131 1367 165
+<< pdiffc >>
+rect 35 677 69 949
+rect 121 745 155 949
+rect 207 677 241 949
+rect 293 677 327 949
+rect 451 677 485 949
+rect 537 677 571 949
+rect 623 745 657 949
+rect 709 677 743 949
+rect 795 677 829 949
+rect 1045 745 1079 949
+rect 1143 813 1177 949
+rect 1247 813 1281 949
+rect 1333 813 1367 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+rect 571 27 595 61
+rect 629 27 653 61
+rect 707 27 731 61
+rect 765 27 789 61
+rect 843 27 867 61
+rect 901 27 925 61
+rect 979 27 1003 61
+rect 1037 27 1061 61
+rect 1115 27 1139 61
+rect 1173 27 1197 61
+rect 1251 27 1275 61
+rect 1309 27 1333 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+rect 571 1049 595 1083
+rect 629 1049 653 1083
+rect 707 1049 731 1083
+rect 765 1049 789 1083
+rect 843 1049 867 1083
+rect 901 1049 925 1083
+rect 979 1049 1003 1083
+rect 1037 1049 1061 1083
+rect 1115 1049 1139 1083
+rect 1173 1049 1197 1083
+rect 1251 1049 1275 1083
+rect 1309 1049 1333 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+rect 595 27 629 61
+rect 731 27 765 61
+rect 867 27 901 61
+rect 1003 27 1037 61
+rect 1139 27 1173 61
+rect 1275 27 1309 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+rect 595 1049 629 1083
+rect 731 1049 765 1083
+rect 867 1049 901 1083
+rect 1003 1049 1037 1083
+rect 1139 1049 1173 1083
+rect 1275 1049 1309 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 993
+rect 338 965 368 993
+rect 410 965 440 991
+rect 496 965 526 991
+rect 582 965 612 993
+rect 668 965 698 993
+rect 754 965 784 993
+rect 840 965 870 993
+rect 922 965 952 993
+rect 1004 965 1034 993
+rect 1102 965 1132 993
+rect 1292 965 1322 993
+rect 80 351 110 565
+rect 166 533 196 565
+rect 152 517 206 533
+rect 152 483 162 517
+rect 196 483 206 517
+rect 152 467 206 483
+rect 70 335 124 351
+rect 70 301 80 335
+rect 114 301 124 335
+rect 70 285 124 301
+rect 80 263 110 285
+rect 166 263 196 467
+rect 252 425 282 565
+rect 338 467 368 565
+rect 410 540 440 565
+rect 496 540 526 565
+rect 410 510 526 540
+rect 338 451 430 467
+rect 238 409 292 425
+rect 238 375 248 409
+rect 282 375 292 409
+rect 238 359 292 375
+rect 338 417 386 451
+rect 420 417 430 451
+rect 338 401 430 417
+rect 252 263 282 359
+rect 338 263 368 401
+rect 472 351 502 510
+rect 582 362 612 565
+rect 668 499 698 565
+rect 656 483 710 499
+rect 656 449 666 483
+rect 700 449 710 483
+rect 656 433 710 449
+rect 472 335 526 351
+rect 472 315 482 335
+rect 410 301 482 315
+rect 516 301 526 335
+rect 410 285 526 301
+rect 568 346 622 362
+rect 568 312 578 346
+rect 612 312 622 346
+rect 568 296 622 312
+rect 410 263 440 285
+rect 496 263 526 285
+rect 582 263 612 296
+rect 668 263 698 433
+rect 754 351 784 565
+rect 840 499 870 565
+rect 826 483 880 499
+rect 826 449 836 483
+rect 870 449 880 483
+rect 826 433 880 449
+rect 922 461 952 565
+rect 1004 533 1034 565
+rect 1004 503 1048 533
+rect 1102 532 1132 713
+rect 922 445 976 461
+rect 742 335 796 351
+rect 742 301 752 335
+rect 786 301 796 335
+rect 742 285 796 301
+rect 754 263 784 285
+rect 840 263 870 433
+rect 922 411 932 445
+rect 966 411 976 445
+rect 922 395 976 411
+rect 922 263 952 395
+rect 1018 351 1048 503
+rect 1090 516 1144 532
+rect 1292 529 1322 713
+rect 1090 482 1100 516
+rect 1134 482 1144 516
+rect 1090 466 1144 482
+rect 1255 513 1322 529
+rect 1255 479 1265 513
+rect 1299 479 1322 513
+rect 1004 335 1058 351
+rect 1004 301 1014 335
+rect 1048 301 1058 335
+rect 1004 285 1058 301
+rect 1004 263 1034 285
+rect 1102 219 1132 466
+rect 1255 463 1322 479
+rect 1292 219 1322 463
+rect 80 81 110 115
+rect 166 82 196 115
+rect 252 82 282 115
+rect 338 82 368 115
+rect 410 82 440 115
+rect 496 82 526 115
+rect 582 82 612 115
+rect 668 82 698 115
+rect 754 82 784 115
+rect 840 82 870 115
+rect 922 82 952 115
+rect 1004 82 1034 115
+rect 1102 80 1132 115
+rect 1292 80 1322 115
+<< polycont >>
+rect 162 483 196 517
+rect 80 301 114 335
+rect 248 375 282 409
+rect 386 417 420 451
+rect 666 449 700 483
+rect 482 301 516 335
+rect 578 312 612 346
+rect 836 449 870 483
+rect 752 301 786 335
+rect 932 411 966 445
+rect 1100 482 1134 516
+rect 1265 479 1299 513
+rect 1014 301 1048 335
+<< locali >>
+rect 0 1093 1408 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 459 1093
+rect 493 1049 595 1093
+rect 629 1049 731 1093
+rect 765 1049 867 1093
+rect 901 1049 1003 1093
+rect 1037 1049 1139 1093
+rect 1173 1049 1275 1093
+rect 1309 1049 1408 1093
+rect 35 949 69 965
+rect 121 949 155 1049
+rect 121 729 155 745
+rect 207 949 241 965
+rect 35 657 69 677
+rect 207 657 241 677
+rect 35 623 241 657
+rect 293 949 327 965
+rect 293 590 327 677
+rect 451 949 485 1049
+rect 451 661 485 677
+rect 537 949 571 965
+rect 623 949 657 1049
+rect 623 729 657 745
+rect 709 949 743 965
+rect 537 656 571 677
+rect 709 656 743 677
+rect 537 622 743 656
+rect 795 949 829 965
+rect 1045 949 1079 1049
+rect 1045 729 1079 745
+rect 1143 949 1177 965
+rect 795 632 829 677
+rect 1143 638 1177 813
+rect 1247 949 1281 1049
+rect 1247 797 1281 813
+rect 1333 949 1367 965
+rect 795 598 1100 632
+rect 293 553 350 590
+rect 795 589 829 598
+rect 80 483 162 517
+rect 196 483 212 517
+rect 248 409 282 425
+rect 248 359 282 375
+rect 64 301 80 335
+rect 114 301 130 335
+rect 316 318 350 553
+rect 752 554 829 589
+rect 578 483 612 489
+rect 386 451 444 483
+rect 420 449 444 451
+rect 650 449 666 483
+rect 700 449 716 483
+rect 386 401 420 417
+rect 578 346 612 449
+rect 666 409 700 449
+rect 752 409 786 554
+rect 1066 532 1100 598
+rect 1177 604 1202 615
+rect 1143 581 1202 604
+rect 1066 516 1134 532
+rect 1066 485 1100 516
+rect 820 449 836 483
+rect 870 449 886 483
+rect 1089 482 1100 485
+rect 1100 466 1134 482
+rect 932 445 966 461
+rect 932 409 966 411
+rect 1168 409 1202 581
+rect 1333 557 1367 813
+rect 752 375 879 409
+rect 1143 375 1202 409
+rect 1265 513 1299 529
+rect 293 284 350 318
+rect 466 301 482 335
+rect 516 301 532 335
+rect 578 296 612 312
+rect 736 301 752 335
+rect 786 301 811 335
+rect 293 261 327 284
+rect 35 233 241 252
+rect 69 218 207 233
+rect 35 115 69 131
+rect 121 165 155 181
+rect 121 61 155 131
+rect 207 114 241 131
+rect 777 261 811 301
+rect 293 114 327 131
+rect 451 233 485 249
+rect 451 61 485 131
+rect 537 233 743 252
+rect 571 218 709 233
+rect 537 114 571 131
+rect 623 165 657 181
+rect 623 61 657 131
+rect 845 181 879 375
+rect 998 301 1014 335
+rect 1048 301 1064 335
+rect 709 114 743 131
+rect 795 165 879 181
+rect 829 131 879 165
+rect 1045 233 1079 249
+rect 795 114 829 131
+rect 1045 61 1079 131
+rect 1143 165 1177 375
+rect 1265 261 1299 479
+rect 1245 227 1299 261
+rect 1143 115 1177 131
+rect 1247 165 1281 181
+rect 1247 61 1281 131
+rect 1333 165 1367 523
+rect 1333 115 1367 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 459 61
+rect 493 17 595 61
+rect 629 17 731 61
+rect 765 17 867 61
+rect 901 17 1003 61
+rect 1037 17 1139 61
+rect 1173 17 1275 61
+rect 1309 17 1408 61
+rect 0 0 1408 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 459 1083 493 1093
+rect 459 1059 493 1083
+rect 595 1083 629 1093
+rect 595 1059 629 1083
+rect 731 1083 765 1093
+rect 731 1059 765 1083
+rect 867 1083 901 1093
+rect 867 1059 901 1083
+rect 1003 1083 1037 1093
+rect 1003 1059 1037 1083
+rect 1139 1083 1173 1093
+rect 1139 1059 1173 1083
+rect 1275 1083 1309 1093
+rect 1275 1059 1309 1083
+rect 80 449 114 483
+rect 248 375 282 409
+rect 80 301 114 335
+rect 444 449 478 483
+rect 578 449 612 483
+rect 666 375 700 409
+rect 1143 604 1177 638
+rect 836 449 870 483
+rect 932 375 966 409
+rect 482 301 516 335
+rect 293 233 327 261
+rect 293 227 327 233
+rect 777 227 811 261
+rect 1014 301 1048 335
+rect 1211 227 1245 261
+rect 1333 523 1367 557
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+rect 459 27 493 51
+rect 459 17 493 27
+rect 595 27 629 51
+rect 595 17 629 27
+rect 731 27 765 51
+rect 731 17 765 27
+rect 867 27 901 51
+rect 867 17 901 27
+rect 1003 27 1037 51
+rect 1003 17 1037 27
+rect 1139 27 1173 51
+rect 1139 17 1173 27
+rect 1275 27 1309 51
+rect 1275 17 1309 27
+<< metal1 >>
+rect 0 1093 1408 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 459 1093
+rect 493 1059 595 1093
+rect 629 1059 731 1093
+rect 765 1059 867 1093
+rect 901 1059 1003 1093
+rect 1037 1059 1139 1093
+rect 1173 1059 1275 1093
+rect 1309 1059 1408 1093
+rect 0 1049 1408 1059
+rect 1131 638 1189 644
+rect 1109 604 1143 638
+rect 1177 604 1189 638
+rect 1131 598 1189 604
+rect 1321 557 1379 563
+rect 1299 523 1333 557
+rect 1367 523 1379 557
+rect 1321 517 1379 523
+rect 68 483 126 489
+rect 432 483 490 489
+rect 566 483 624 489
+rect 824 483 882 489
+rect 68 449 80 483
+rect 114 449 444 483
+rect 478 449 578 483
+rect 612 450 836 483
+rect 612 449 734 450
+rect 812 449 836 450
+rect 870 449 882 483
+rect 68 443 126 449
+rect 432 443 490 449
+rect 566 443 624 449
+rect 824 443 882 449
+rect 236 409 294 415
+rect 654 409 712 415
+rect 920 409 978 415
+rect 80 375 248 409
+rect 282 375 666 409
+rect 700 375 932 409
+rect 966 375 978 409
+rect 236 369 294 375
+rect 654 369 712 375
+rect 920 369 978 375
+rect 68 335 126 341
+rect 470 335 528 341
+rect 1002 335 1060 341
+rect 68 301 80 335
+rect 114 301 482 335
+rect 516 301 1014 335
+rect 1048 301 1060 335
+rect 68 295 126 301
+rect 470 295 528 301
+rect 1002 295 1060 301
+rect 281 261 339 267
+rect 765 261 823 267
+rect 1199 261 1257 267
+rect 281 227 293 261
+rect 327 227 777 261
+rect 811 227 1211 261
+rect 1245 227 1257 261
+rect 281 221 339 227
+rect 765 221 823 227
+rect 1199 221 1257 227
+rect 0 51 1408 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 459 51
+rect 493 17 595 51
+rect 629 17 731 51
+rect 765 17 867 51
+rect 901 17 1003 51
+rect 1037 17 1139 51
+rect 1173 17 1275 51
+rect 1309 17 1408 51
+rect 0 0 1408 17
+<< labels >>
+rlabel viali 97 318 97 318 1 A
+port 1 n
+rlabel viali 265 392 265 392 1 CI
+port 2 n
+rlabel metal1 129 466 129 466 1 B
+port 3 n
+rlabel viali 1350 540 1350 540 1 CO
+port 5 n
+rlabel viali 1160 621 1160 621 1 S
+port 6 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 1228 244 1228 244 1 CON
+port 4 n
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__addh_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__addh_1.mag
new file mode 100644
index 0000000..99d1cdf
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__addh_1.mag
@@ -0,0 +1,393 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007748
+<< checkpaint >>
+rect -1269 -242 2097 2379
+<< nwell >>
+rect -9 529 837 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 178 115 208 263
+rect 250 115 280 263
+rect 442 115 472 263
+rect 540 115 570 263
+rect 626 115 656 263
+rect 712 115 742 263
+<< pmos >>
+rect 80 565 110 965
+rect 178 565 208 965
+rect 264 565 294 965
+rect 362 565 392 965
+rect 552 565 582 965
+rect 638 565 668 965
+rect 710 565 740 965
+<< ndiff >>
+rect 27 233 80 263
+rect 27 131 35 233
+rect 69 131 80 233
+rect 27 115 80 131
+rect 110 233 178 263
+rect 110 131 133 233
+rect 167 131 178 233
+rect 110 115 178 131
+rect 208 115 250 263
+rect 280 233 333 263
+rect 280 131 291 233
+rect 325 131 333 233
+rect 280 115 333 131
+rect 389 233 442 263
+rect 389 131 397 233
+rect 431 131 442 233
+rect 389 115 442 131
+rect 472 233 540 263
+rect 472 131 495 233
+rect 529 131 540 233
+rect 472 115 540 131
+rect 570 233 626 263
+rect 570 131 581 233
+rect 615 131 626 233
+rect 570 115 626 131
+rect 656 247 712 263
+rect 656 179 667 247
+rect 701 179 712 247
+rect 656 115 712 179
+rect 742 233 795 263
+rect 742 131 753 233
+rect 787 131 795 233
+rect 742 115 795 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 609 35 949
+rect 69 609 80 949
+rect 27 565 80 609
+rect 110 949 178 965
+rect 110 609 133 949
+rect 167 609 178 949
+rect 110 565 178 609
+rect 208 949 264 965
+rect 208 677 219 949
+rect 253 677 264 949
+rect 208 565 264 677
+rect 294 949 362 965
+rect 294 677 305 949
+rect 339 677 362 949
+rect 294 565 362 677
+rect 392 949 445 965
+rect 392 609 403 949
+rect 437 609 445 949
+rect 392 565 445 609
+rect 499 949 552 965
+rect 499 609 507 949
+rect 541 609 552 949
+rect 499 565 552 609
+rect 582 949 638 965
+rect 582 609 593 949
+rect 627 609 638 949
+rect 582 565 638 609
+rect 668 565 710 965
+rect 740 949 796 965
+rect 740 609 751 949
+rect 785 609 796 949
+rect 740 565 796 609
+<< ndiffc >>
+rect 35 131 69 233
+rect 133 131 167 233
+rect 291 131 325 233
+rect 397 131 431 233
+rect 495 131 529 233
+rect 581 131 615 233
+rect 667 179 701 247
+rect 753 131 787 233
+<< pdiffc >>
+rect 35 609 69 949
+rect 133 609 167 949
+rect 219 677 253 949
+rect 305 677 339 949
+rect 403 609 437 949
+rect 507 609 541 949
+rect 593 609 627 949
+rect 751 609 785 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+rect 571 27 595 61
+rect 629 27 653 61
+rect 707 27 731 61
+rect 765 27 789 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+rect 571 1049 595 1083
+rect 629 1049 653 1083
+rect 707 1049 731 1083
+rect 765 1049 789 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+rect 595 27 629 61
+rect 731 27 765 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+rect 595 1049 629 1083
+rect 731 1049 765 1083
+<< poly >>
+rect 80 965 110 991
+rect 178 965 208 991
+rect 264 965 294 991
+rect 362 965 392 991
+rect 552 965 582 991
+rect 638 965 668 991
+rect 710 965 740 991
+rect 80 351 110 565
+rect 178 425 208 565
+rect 264 499 294 565
+rect 154 409 208 425
+rect 154 375 164 409
+rect 198 375 208 409
+rect 154 359 208 375
+rect 43 335 110 351
+rect 43 301 53 335
+rect 87 301 110 335
+rect 43 285 110 301
+rect 80 263 110 285
+rect 178 263 208 359
+rect 250 483 304 499
+rect 250 449 260 483
+rect 294 449 304 483
+rect 250 433 304 449
+rect 362 497 392 565
+rect 552 497 582 565
+rect 362 467 582 497
+rect 250 263 280 433
+rect 362 372 392 467
+rect 638 425 668 565
+rect 710 499 740 565
+rect 710 483 764 499
+rect 710 449 720 483
+rect 754 449 764 483
+rect 710 433 764 449
+rect 338 356 392 372
+rect 614 409 668 425
+rect 614 375 624 409
+rect 658 375 668 409
+rect 614 359 668 375
+rect 338 322 348 356
+rect 382 323 392 356
+rect 382 322 570 323
+rect 338 293 570 322
+rect 442 263 472 293
+rect 540 263 570 293
+rect 626 263 656 359
+rect 712 263 742 433
+rect 80 89 110 115
+rect 178 89 208 115
+rect 250 89 280 115
+rect 442 89 472 115
+rect 540 89 570 115
+rect 626 89 656 115
+rect 712 89 742 115
+<< polycont >>
+rect 164 375 198 409
+rect 53 301 87 335
+rect 260 449 294 483
+rect 720 449 754 483
+rect 624 375 658 409
+rect 348 322 382 356
+<< locali >>
+rect 0 1093 836 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 459 1093
+rect 493 1049 595 1093
+rect 629 1049 731 1093
+rect 765 1049 836 1093
+rect 35 949 69 965
+rect 35 575 69 597
+rect 133 949 167 1049
+rect 133 593 167 609
+rect 219 949 253 965
+rect 219 567 253 677
+rect 305 949 339 1049
+rect 305 661 339 677
+rect 403 949 437 965
+rect 219 533 362 567
+rect 260 483 294 499
+rect 260 433 294 449
+rect 148 375 164 409
+rect 198 375 214 409
+rect 328 372 362 533
+rect 403 557 437 609
+rect 507 949 541 965
+rect 403 523 418 557
+rect 328 356 382 372
+rect 328 340 348 356
+rect 37 301 53 335
+rect 87 301 110 335
+rect 291 322 348 340
+rect 291 306 382 322
+rect 35 115 69 131
+rect 133 233 167 249
+rect 133 61 167 131
+rect 291 233 325 306
+rect 418 267 452 523
+rect 507 555 541 609
+rect 593 949 627 1049
+rect 593 593 627 609
+rect 751 949 785 965
+rect 751 555 785 609
+rect 507 521 785 555
+rect 507 335 541 521
+rect 704 449 720 483
+rect 754 449 770 483
+rect 608 375 624 409
+rect 658 375 674 409
+rect 541 301 667 335
+rect 291 115 325 131
+rect 397 233 452 267
+rect 495 233 529 249
+rect 397 115 431 131
+rect 495 61 529 131
+rect 581 233 615 249
+rect 667 247 701 301
+rect 667 163 701 179
+rect 753 233 787 249
+rect 581 129 615 131
+rect 753 129 787 131
+rect 581 95 787 129
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 459 61
+rect 493 17 595 61
+rect 629 17 731 61
+rect 765 17 836 61
+rect 0 0 836 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 459 1083 493 1093
+rect 459 1059 493 1083
+rect 595 1083 629 1093
+rect 595 1059 629 1083
+rect 731 1083 765 1093
+rect 731 1059 765 1083
+rect 35 609 69 631
+rect 35 597 69 609
+rect 260 449 294 483
+rect 164 375 198 409
+rect 418 523 452 557
+rect 110 301 144 335
+rect 35 233 69 260
+rect 35 226 69 233
+rect 720 449 754 483
+rect 624 375 658 409
+rect 507 301 541 335
+rect 667 301 701 335
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+rect 459 27 493 51
+rect 459 17 493 27
+rect 595 27 629 51
+rect 595 17 629 27
+rect 731 27 765 51
+rect 731 17 765 27
+<< metal1 >>
+rect 0 1093 836 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 459 1093
+rect 493 1059 595 1093
+rect 629 1059 731 1093
+rect 765 1059 836 1093
+rect 0 1049 836 1059
+rect 23 631 81 637
+rect 23 597 35 631
+rect 69 597 81 631
+rect 23 591 81 597
+rect 35 266 69 591
+rect 406 557 464 563
+rect 406 523 418 557
+rect 452 523 486 557
+rect 406 517 464 523
+rect 248 483 306 489
+rect 708 483 766 489
+rect 248 449 260 483
+rect 294 449 720 483
+rect 754 449 766 483
+rect 248 448 766 449
+rect 248 443 306 448
+rect 708 443 766 448
+rect 152 410 210 415
+rect 612 410 670 415
+rect 152 409 670 410
+rect 152 375 164 409
+rect 198 375 624 409
+rect 658 375 670 409
+rect 152 369 210 375
+rect 612 369 670 375
+rect 98 335 156 341
+rect 495 335 553 341
+rect 655 335 713 341
+rect 98 301 110 335
+rect 144 301 507 335
+rect 541 301 553 335
+rect 633 301 667 335
+rect 701 301 713 335
+rect 98 295 156 301
+rect 495 295 553 301
+rect 655 295 713 301
+rect 23 260 81 266
+rect 23 226 35 260
+rect 69 226 81 260
+rect 23 220 81 226
+rect 0 51 836 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 459 51
+rect 493 17 595 51
+rect 629 17 731 51
+rect 765 17 836 51
+rect 0 0 836 17
+<< labels >>
+rlabel metal1 50 425 50 425 1 S
+port 1 n
+rlabel viali 737 466 737 466 1 A
+port 2 n
+rlabel viali 642 392 642 392 1 B
+port 3 n
+rlabel viali 435 540 435 540 1 CO
+port 4 n
+rlabel viali 684 318 684 318 1 CON
+port 5 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__addh_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__addh_l.mag
new file mode 100644
index 0000000..099e933
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__addh_l.mag
@@ -0,0 +1,397 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007748
+<< checkpaint >>
+rect -1269 -242 2097 2379
+<< nwell >>
+rect -9 529 837 1119
+<< nmoslvt >>
+rect 80 115 110 219
+rect 178 115 208 263
+rect 250 115 280 263
+rect 442 115 472 237
+rect 540 115 570 263
+rect 626 115 656 263
+rect 712 115 742 263
+<< pmos >>
+rect 80 713 110 965
+rect 178 565 208 965
+rect 264 565 294 965
+rect 362 713 392 965
+rect 552 565 582 965
+rect 638 565 668 965
+rect 710 565 740 965
+<< ndiff >>
+rect 125 233 178 263
+rect 125 219 133 233
+rect 27 199 80 219
+rect 27 131 35 199
+rect 69 131 80 199
+rect 27 115 80 131
+rect 110 131 133 219
+rect 167 131 178 233
+rect 110 115 178 131
+rect 208 115 250 263
+rect 280 233 333 263
+rect 487 237 540 263
+rect 280 131 291 233
+rect 325 131 333 233
+rect 280 115 333 131
+rect 389 199 442 237
+rect 389 131 397 199
+rect 431 131 442 199
+rect 389 115 442 131
+rect 472 233 540 237
+rect 472 131 495 233
+rect 529 131 540 233
+rect 472 115 540 131
+rect 570 233 626 263
+rect 570 131 581 233
+rect 615 131 626 233
+rect 570 115 626 131
+rect 656 247 712 263
+rect 656 179 667 247
+rect 701 179 712 247
+rect 656 115 712 179
+rect 742 233 795 263
+rect 742 131 753 233
+rect 787 131 795 233
+rect 742 115 795 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 745 35 949
+rect 69 745 80 949
+rect 27 713 80 745
+rect 110 949 178 965
+rect 110 713 133 949
+rect 125 609 133 713
+rect 167 609 178 949
+rect 125 565 178 609
+rect 208 949 264 965
+rect 208 677 219 949
+rect 253 677 264 949
+rect 208 565 264 677
+rect 294 949 362 965
+rect 294 677 305 949
+rect 339 713 362 949
+rect 392 949 445 965
+rect 392 745 403 949
+rect 437 745 445 949
+rect 392 713 445 745
+rect 499 949 552 965
+rect 339 677 347 713
+rect 294 565 347 677
+rect 499 609 507 949
+rect 541 609 552 949
+rect 499 565 552 609
+rect 582 949 638 965
+rect 582 609 593 949
+rect 627 609 638 949
+rect 582 565 638 609
+rect 668 565 710 965
+rect 740 949 796 965
+rect 740 609 751 949
+rect 785 609 796 949
+rect 740 565 796 609
+<< ndiffc >>
+rect 35 131 69 199
+rect 133 131 167 233
+rect 291 131 325 233
+rect 397 131 431 199
+rect 495 131 529 233
+rect 581 131 615 233
+rect 667 179 701 247
+rect 753 131 787 233
+<< pdiffc >>
+rect 35 745 69 949
+rect 133 609 167 949
+rect 219 677 253 949
+rect 305 677 339 949
+rect 403 745 437 949
+rect 507 609 541 949
+rect 593 609 627 949
+rect 751 609 785 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+rect 571 27 595 61
+rect 629 27 653 61
+rect 707 27 731 61
+rect 765 27 789 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+rect 571 1049 595 1083
+rect 629 1049 653 1083
+rect 707 1049 731 1083
+rect 765 1049 789 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+rect 595 27 629 61
+rect 731 27 765 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+rect 595 1049 629 1083
+rect 731 1049 765 1083
+<< poly >>
+rect 80 965 110 991
+rect 178 965 208 991
+rect 264 965 294 991
+rect 362 965 392 991
+rect 552 965 582 991
+rect 638 965 668 991
+rect 710 965 740 991
+rect 80 351 110 713
+rect 178 425 208 565
+rect 264 499 294 565
+rect 154 409 208 425
+rect 154 375 164 409
+rect 198 375 208 409
+rect 154 359 208 375
+rect 43 335 110 351
+rect 43 301 53 335
+rect 87 301 110 335
+rect 43 285 110 301
+rect 80 219 110 285
+rect 178 263 208 359
+rect 250 483 304 499
+rect 250 449 260 483
+rect 294 449 304 483
+rect 250 433 304 449
+rect 362 497 392 713
+rect 552 497 582 565
+rect 362 467 582 497
+rect 250 263 280 433
+rect 362 372 392 467
+rect 638 425 668 565
+rect 710 499 740 565
+rect 710 483 764 499
+rect 710 449 720 483
+rect 754 449 764 483
+rect 710 433 764 449
+rect 338 356 392 372
+rect 614 409 668 425
+rect 614 375 624 409
+rect 658 375 668 409
+rect 614 359 668 375
+rect 338 322 348 356
+rect 382 323 392 356
+rect 382 322 570 323
+rect 338 293 570 322
+rect 442 237 472 293
+rect 540 263 570 293
+rect 626 263 656 359
+rect 712 263 742 433
+rect 80 89 110 115
+rect 178 89 208 115
+rect 250 89 280 115
+rect 442 89 472 115
+rect 540 89 570 115
+rect 626 89 656 115
+rect 712 89 742 115
+<< polycont >>
+rect 164 375 198 409
+rect 53 301 87 335
+rect 260 449 294 483
+rect 720 449 754 483
+rect 624 375 658 409
+rect 348 322 382 356
+<< locali >>
+rect 0 1093 836 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 459 1093
+rect 493 1049 595 1093
+rect 629 1049 731 1093
+rect 765 1049 836 1093
+rect 35 949 69 965
+rect 35 631 69 745
+rect 133 949 167 1049
+rect 133 593 167 609
+rect 219 949 253 965
+rect 219 567 253 677
+rect 305 949 339 1049
+rect 305 661 339 677
+rect 403 949 437 965
+rect 219 533 362 567
+rect 260 483 294 499
+rect 260 433 294 449
+rect 148 375 164 409
+rect 198 375 214 409
+rect 328 372 362 533
+rect 403 557 437 745
+rect 507 949 541 965
+rect 403 523 418 557
+rect 328 356 382 372
+rect 328 340 348 356
+rect 37 301 53 335
+rect 87 301 110 335
+rect 291 322 348 340
+rect 291 306 382 322
+rect 35 199 69 226
+rect 35 115 69 131
+rect 133 233 167 249
+rect 133 61 167 131
+rect 291 233 325 306
+rect 418 260 452 523
+rect 507 555 541 609
+rect 593 949 627 1049
+rect 593 593 627 609
+rect 751 949 785 965
+rect 751 555 785 609
+rect 507 521 785 555
+rect 507 335 541 521
+rect 704 449 720 483
+rect 754 449 770 483
+rect 608 375 624 409
+rect 658 375 674 409
+rect 541 301 667 335
+rect 291 115 325 131
+rect 397 226 452 260
+rect 495 233 529 249
+rect 397 199 431 226
+rect 397 115 431 131
+rect 495 61 529 131
+rect 581 233 615 249
+rect 667 247 701 301
+rect 667 163 701 179
+rect 753 233 787 249
+rect 581 129 615 131
+rect 753 129 787 131
+rect 581 95 787 129
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 459 61
+rect 493 17 595 61
+rect 629 17 731 61
+rect 765 17 836 61
+rect 0 0 836 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 459 1083 493 1093
+rect 459 1059 493 1083
+rect 595 1083 629 1093
+rect 595 1059 629 1083
+rect 731 1083 765 1093
+rect 731 1059 765 1083
+rect 35 597 69 631
+rect 260 449 294 483
+rect 164 375 198 409
+rect 418 523 452 557
+rect 110 301 144 335
+rect 35 226 69 260
+rect 720 449 754 483
+rect 624 375 658 409
+rect 507 301 541 335
+rect 667 301 701 335
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+rect 459 27 493 51
+rect 459 17 493 27
+rect 595 27 629 51
+rect 595 17 629 27
+rect 731 27 765 51
+rect 731 17 765 27
+<< metal1 >>
+rect 0 1093 836 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 459 1093
+rect 493 1059 595 1093
+rect 629 1059 731 1093
+rect 765 1059 836 1093
+rect 0 1049 836 1059
+rect 23 631 81 637
+rect 23 597 35 631
+rect 69 597 81 631
+rect 23 591 81 597
+rect 35 266 69 591
+rect 406 557 464 563
+rect 406 523 418 557
+rect 452 523 486 557
+rect 406 517 464 523
+rect 248 483 306 489
+rect 708 483 766 489
+rect 248 449 260 483
+rect 294 449 720 483
+rect 754 449 766 483
+rect 248 448 766 449
+rect 248 443 306 448
+rect 708 443 766 448
+rect 152 410 210 415
+rect 612 410 670 415
+rect 152 409 670 410
+rect 152 375 164 409
+rect 198 375 624 409
+rect 658 375 670 409
+rect 152 369 210 375
+rect 612 369 670 375
+rect 98 335 156 341
+rect 495 335 553 341
+rect 655 335 713 341
+rect 98 301 110 335
+rect 144 301 507 335
+rect 541 301 553 335
+rect 633 301 667 335
+rect 701 301 713 335
+rect 98 295 156 301
+rect 495 295 553 301
+rect 655 295 713 301
+rect 23 260 81 266
+rect 23 226 35 260
+rect 69 226 81 260
+rect 23 220 81 226
+rect 0 51 836 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 459 51
+rect 493 17 595 51
+rect 629 17 731 51
+rect 765 17 836 51
+rect 0 0 836 17
+<< labels >>
+rlabel metal1 50 425 50 425 1 S
+port 1 n
+rlabel viali 737 466 737 466 1 A
+port 2 n
+rlabel viali 642 392 642 392 1 B
+port 3 n
+rlabel viali 435 540 435 540 1 CO
+port 4 n
+rlabel viali 684 318 684 318 1 CON
+port 5 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_1.mag
new file mode 100644
index 0000000..fcd0f27
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_1.mag
@@ -0,0 +1,186 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007748
+<< checkpaint >>
+rect -1269 -242 1634 2379
+<< nwell >>
+rect -9 529 374 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 252 115 282 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+<< ndiff >>
+rect 27 233 80 263
+rect 27 131 35 233
+rect 69 131 80 233
+rect 27 115 80 131
+rect 110 115 152 263
+rect 182 233 252 263
+rect 182 131 193 233
+rect 227 131 252 233
+rect 182 115 252 131
+rect 282 233 335 263
+rect 282 131 293 233
+rect 327 131 335 233
+rect 282 115 335 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 745 35 949
+rect 69 745 80 949
+rect 27 565 80 745
+rect 110 949 166 965
+rect 110 677 121 949
+rect 155 677 166 949
+rect 110 565 166 677
+rect 196 949 252 965
+rect 196 677 207 949
+rect 241 677 252 949
+rect 196 565 252 677
+rect 282 949 335 965
+rect 282 609 293 949
+rect 327 609 335 949
+rect 282 565 335 609
+<< ndiffc >>
+rect 35 131 69 233
+rect 193 131 227 233
+rect 293 131 327 233
+<< pdiffc >>
+rect 35 745 69 949
+rect 121 677 155 949
+rect 207 677 241 949
+rect 293 609 327 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 80 534 110 565
+rect 27 518 110 534
+rect 27 484 37 518
+rect 71 484 110 518
+rect 27 468 110 484
+rect 80 263 110 468
+rect 166 466 196 565
+rect 252 540 282 565
+rect 252 510 289 540
+rect 152 450 217 466
+rect 152 416 173 450
+rect 207 416 217 450
+rect 152 400 217 416
+rect 152 263 182 400
+rect 259 368 289 510
+rect 259 352 313 368
+rect 259 332 269 352
+rect 252 318 269 332
+rect 303 318 313 352
+rect 252 302 313 318
+rect 252 263 282 302
+rect 80 89 110 115
+rect 152 89 182 115
+rect 252 89 282 115
+<< polycont >>
+rect 37 484 71 518
+rect 173 416 207 450
+rect 269 318 303 352
+<< locali >>
+rect 0 1093 374 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 374 1093
+rect 35 949 69 1049
+rect 35 729 69 745
+rect 121 949 155 965
+rect 105 677 121 695
+rect 105 661 155 677
+rect 207 949 241 1049
+rect 207 661 241 677
+rect 293 949 327 965
+rect 37 518 71 597
+rect 37 468 71 484
+rect 105 352 139 661
+rect 173 450 207 523
+rect 293 483 327 609
+rect 173 400 207 416
+rect 35 318 269 352
+rect 303 318 319 352
+rect 35 233 69 318
+rect 35 115 69 131
+rect 193 233 227 249
+rect 193 61 227 131
+rect 293 115 327 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 374 61
+rect 0 0 374 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 37 597 71 631
+rect 173 523 207 557
+rect 293 449 327 483
+rect 293 233 327 261
+rect 293 227 327 233
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 374 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 374 1093
+rect 0 1049 374 1059
+rect 25 631 83 637
+rect 25 597 37 631
+rect 71 597 105 631
+rect 25 591 83 597
+rect 161 557 219 563
+rect 140 523 173 557
+rect 207 523 219 557
+rect 161 517 219 523
+rect 281 483 339 489
+rect 281 449 293 483
+rect 327 449 339 483
+rect 281 443 339 449
+rect 293 267 327 443
+rect 281 261 339 267
+rect 281 227 293 261
+rect 327 227 339 261
+rect 281 221 339 227
+rect 0 51 374 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 374 51
+rect 0 0 374 17
+<< labels >>
+rlabel metal1 311 392 311 392 1 Y
+port 1 n
+rlabel viali 55 614 55 614 1 A
+port 2 n
+rlabel viali 191 540 191 540 1 B
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_2.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_2.mag
new file mode 100644
index 0000000..cc937e8
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_2.mag
@@ -0,0 +1,221 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007748
+<< checkpaint >>
+rect -1269 -242 1722 2379
+<< nwell >>
+rect -9 529 462 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 252 115 282 263
+rect 338 115 368 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+<< ndiff >>
+rect 27 233 80 263
+rect 27 131 35 233
+rect 69 131 80 233
+rect 27 115 80 131
+rect 110 115 152 263
+rect 182 233 252 263
+rect 182 131 193 233
+rect 227 131 252 233
+rect 182 115 252 131
+rect 282 233 338 263
+rect 282 131 293 233
+rect 327 131 338 233
+rect 282 115 338 131
+rect 368 233 421 263
+rect 368 131 379 233
+rect 413 131 421 233
+rect 368 115 421 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 745 35 949
+rect 69 745 80 949
+rect 27 565 80 745
+rect 110 949 166 965
+rect 110 677 121 949
+rect 155 677 166 949
+rect 110 565 166 677
+rect 196 949 252 965
+rect 196 677 207 949
+rect 241 677 252 949
+rect 196 565 252 677
+rect 282 949 338 965
+rect 282 609 293 949
+rect 327 609 338 949
+rect 282 565 338 609
+rect 368 949 421 965
+rect 368 609 379 949
+rect 413 609 421 949
+rect 368 565 421 609
+<< ndiffc >>
+rect 35 131 69 233
+rect 193 131 227 233
+rect 293 131 327 233
+rect 379 131 413 233
+<< pdiffc >>
+rect 35 745 69 949
+rect 121 677 155 949
+rect 207 677 241 949
+rect 293 609 327 949
+rect 379 609 413 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 338 965 368 992
+rect 80 534 110 565
+rect 27 518 110 534
+rect 27 484 37 518
+rect 71 484 110 518
+rect 27 468 110 484
+rect 80 263 110 468
+rect 166 466 196 565
+rect 252 540 282 565
+rect 338 540 368 565
+rect 252 510 368 540
+rect 152 450 217 466
+rect 152 416 173 450
+rect 207 416 217 450
+rect 152 400 217 416
+rect 152 263 182 400
+rect 259 368 289 510
+rect 259 352 313 368
+rect 259 332 269 352
+rect 252 318 269 332
+rect 303 332 313 352
+rect 303 318 368 332
+rect 252 302 368 318
+rect 252 263 282 302
+rect 338 263 368 302
+rect 80 89 110 115
+rect 152 89 182 115
+rect 252 89 282 115
+rect 338 89 368 115
+<< polycont >>
+rect 37 484 71 518
+rect 173 416 207 450
+rect 269 318 303 352
+<< locali >>
+rect 0 1093 462 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 462 1093
+rect 35 949 69 1049
+rect 35 729 69 745
+rect 121 949 155 965
+rect 105 677 121 695
+rect 105 661 155 677
+rect 207 949 241 1049
+rect 207 661 241 677
+rect 293 949 327 965
+rect 37 518 71 597
+rect 37 468 71 484
+rect 105 352 139 661
+rect 173 450 207 523
+rect 293 483 327 609
+rect 379 949 413 1049
+rect 379 593 413 609
+rect 173 400 207 416
+rect 35 318 269 352
+rect 303 318 319 352
+rect 35 233 69 318
+rect 35 115 69 131
+rect 193 233 227 249
+rect 193 61 227 131
+rect 293 115 327 131
+rect 379 233 413 249
+rect 379 61 413 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 462 61
+rect 0 0 462 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 37 597 71 631
+rect 173 523 207 557
+rect 293 449 327 483
+rect 293 233 327 261
+rect 293 227 327 233
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+<< metal1 >>
+rect 0 1093 462 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 462 1093
+rect 0 1049 462 1059
+rect 25 631 83 637
+rect 25 597 37 631
+rect 71 597 105 631
+rect 25 591 83 597
+rect 161 557 219 563
+rect 140 523 173 557
+rect 207 523 219 557
+rect 161 517 219 523
+rect 281 483 339 489
+rect 281 449 293 483
+rect 327 449 339 483
+rect 281 443 339 449
+rect 293 267 327 443
+rect 281 261 339 267
+rect 281 227 293 261
+rect 327 227 339 261
+rect 281 221 339 227
+rect 0 51 462 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 462 51
+rect 0 0 462 17
+<< labels >>
+rlabel viali 191 540 191 540 1 B
+port 1 n
+rlabel viali 55 614 55 614 1 A
+port 2 n
+rlabel metal1 311 392 311 392 1 Y
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_4.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_4.mag
new file mode 100644
index 0000000..f2ac623
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_4.mag
@@ -0,0 +1,284 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007749
+<< checkpaint >>
+rect -1269 -242 1898 2379
+<< nwell >>
+rect -9 529 638 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+rect 424 565 454 965
+rect 510 565 540 965
+<< ndiff >>
+rect 27 233 80 263
+rect 27 131 35 233
+rect 69 131 80 233
+rect 27 115 80 131
+rect 110 115 152 263
+rect 182 233 252 263
+rect 182 131 193 233
+rect 227 131 252 233
+rect 182 115 252 131
+rect 282 233 338 263
+rect 282 131 293 233
+rect 327 131 338 233
+rect 282 115 338 131
+rect 368 233 424 263
+rect 368 131 379 233
+rect 413 131 424 233
+rect 368 115 424 131
+rect 454 233 510 263
+rect 454 131 465 233
+rect 499 131 510 233
+rect 454 115 510 131
+rect 540 233 593 263
+rect 540 131 551 233
+rect 585 131 593 233
+rect 540 115 593 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 745 35 949
+rect 69 745 80 949
+rect 27 565 80 745
+rect 110 949 166 965
+rect 110 677 121 949
+rect 155 677 166 949
+rect 110 565 166 677
+rect 196 949 252 965
+rect 196 677 207 949
+rect 241 677 252 949
+rect 196 565 252 677
+rect 282 949 338 965
+rect 282 609 293 949
+rect 327 609 338 949
+rect 282 565 338 609
+rect 368 949 424 965
+rect 368 609 379 949
+rect 413 609 424 949
+rect 368 565 424 609
+rect 454 949 510 965
+rect 454 609 465 949
+rect 499 609 510 949
+rect 454 565 510 609
+rect 540 949 593 965
+rect 540 609 551 949
+rect 585 609 593 949
+rect 540 565 593 609
+<< ndiffc >>
+rect 35 131 69 233
+rect 193 131 227 233
+rect 293 131 327 233
+rect 379 131 413 233
+rect 465 131 499 233
+rect 551 131 585 233
+<< pdiffc >>
+rect 35 745 69 949
+rect 121 677 155 949
+rect 207 677 241 949
+rect 293 609 327 949
+rect 379 609 413 949
+rect 465 609 499 949
+rect 551 609 585 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 338 965 368 992
+rect 424 965 454 991
+rect 510 965 540 991
+rect 80 534 110 565
+rect 27 518 110 534
+rect 27 484 37 518
+rect 71 484 110 518
+rect 27 468 110 484
+rect 80 263 110 468
+rect 166 466 196 565
+rect 252 540 282 565
+rect 338 540 368 565
+rect 424 540 454 565
+rect 510 540 540 565
+rect 252 510 540 540
+rect 152 450 217 466
+rect 152 416 173 450
+rect 207 416 217 450
+rect 152 400 217 416
+rect 152 263 182 400
+rect 259 368 289 510
+rect 259 352 313 368
+rect 259 332 269 352
+rect 252 318 269 332
+rect 303 332 313 352
+rect 303 318 540 332
+rect 252 302 540 318
+rect 252 263 282 302
+rect 338 263 368 302
+rect 424 263 454 302
+rect 510 263 540 302
+rect 80 89 110 115
+rect 152 89 182 115
+rect 252 89 282 115
+rect 338 89 368 115
+rect 424 89 454 115
+rect 510 89 540 115
+<< polycont >>
+rect 37 484 71 518
+rect 173 416 207 450
+rect 269 318 303 352
+<< locali >>
+rect 0 1093 638 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 459 1093
+rect 493 1049 638 1093
+rect 35 949 69 1049
+rect 35 729 69 745
+rect 121 949 155 965
+rect 105 677 121 695
+rect 105 661 155 677
+rect 207 949 241 1049
+rect 207 661 241 677
+rect 293 949 327 965
+rect 37 518 71 597
+rect 37 468 71 484
+rect 105 352 139 661
+rect 173 450 207 523
+rect 293 483 327 609
+rect 379 949 413 1049
+rect 379 593 413 609
+rect 465 949 499 965
+rect 465 483 499 609
+rect 551 949 585 1049
+rect 551 593 585 609
+rect 173 400 207 416
+rect 35 318 269 352
+rect 303 318 319 352
+rect 35 233 69 318
+rect 35 115 69 131
+rect 193 233 227 249
+rect 193 61 227 131
+rect 293 115 327 131
+rect 379 233 413 249
+rect 379 61 413 131
+rect 465 115 499 131
+rect 551 233 585 249
+rect 551 61 585 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 459 61
+rect 493 17 638 61
+rect 0 0 638 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 459 1083 493 1093
+rect 459 1059 493 1083
+rect 37 597 71 631
+rect 173 523 207 557
+rect 293 449 327 483
+rect 465 449 499 483
+rect 293 233 327 261
+rect 293 227 327 233
+rect 465 233 499 261
+rect 465 227 499 233
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+rect 459 27 493 51
+rect 459 17 493 27
+<< metal1 >>
+rect 0 1093 638 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 459 1093
+rect 493 1059 638 1093
+rect 0 1049 638 1059
+rect 25 631 83 637
+rect 25 597 37 631
+rect 71 597 105 631
+rect 25 591 83 597
+rect 161 557 219 563
+rect 140 523 173 557
+rect 207 523 219 557
+rect 161 517 219 523
+rect 281 483 339 489
+rect 453 483 511 489
+rect 281 449 293 483
+rect 327 449 465 483
+rect 499 449 511 483
+rect 281 443 339 449
+rect 453 443 511 449
+rect 293 267 327 443
+rect 465 267 499 443
+rect 281 261 339 267
+rect 453 261 511 267
+rect 281 227 293 261
+rect 327 227 465 261
+rect 499 227 511 261
+rect 281 221 339 227
+rect 453 221 511 227
+rect 0 51 638 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 459 51
+rect 493 17 638 51
+rect 0 0 638 17
+<< labels >>
+rlabel metal1 311 392 311 392 1 Y
+port 1 n
+rlabel viali 55 614 55 614 1 A
+port 2 n
+rlabel viali 191 540 191 540 1 B
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_6.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_6.mag
new file mode 100644
index 0000000..4dd735a
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_6.mag
@@ -0,0 +1,313 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007749
+<< checkpaint >>
+rect -1269 -242 2074 2379
+<< nwell >>
+rect -9 529 814 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+rect 596 115 626 263
+rect 682 115 712 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+rect 424 565 454 965
+rect 510 565 540 965
+rect 596 565 626 965
+rect 682 565 712 965
+<< ndiff >>
+rect 27 233 80 263
+rect 27 131 35 233
+rect 69 131 80 233
+rect 27 115 80 131
+rect 110 115 152 263
+rect 182 233 252 263
+rect 182 131 193 233
+rect 227 131 252 233
+rect 182 115 252 131
+rect 282 233 338 263
+rect 282 131 293 233
+rect 327 131 338 233
+rect 282 115 338 131
+rect 368 233 424 263
+rect 368 131 379 233
+rect 413 131 424 233
+rect 368 115 424 131
+rect 454 233 510 263
+rect 454 131 465 233
+rect 499 131 510 233
+rect 454 115 510 131
+rect 540 233 596 263
+rect 540 131 551 233
+rect 585 131 596 233
+rect 540 115 596 131
+rect 626 233 682 263
+rect 626 131 637 233
+rect 671 131 682 233
+rect 626 115 682 131
+rect 712 233 765 263
+rect 712 131 723 233
+rect 757 131 765 233
+rect 712 115 765 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 745 35 949
+rect 69 745 80 949
+rect 27 565 80 745
+rect 110 949 166 965
+rect 110 677 121 949
+rect 155 677 166 949
+rect 110 565 166 677
+rect 196 949 252 965
+rect 196 677 207 949
+rect 241 677 252 949
+rect 196 565 252 677
+rect 282 949 338 965
+rect 282 609 293 949
+rect 327 609 338 949
+rect 282 565 338 609
+rect 368 949 424 965
+rect 368 609 379 949
+rect 413 609 424 949
+rect 368 565 424 609
+rect 454 949 510 965
+rect 454 609 465 949
+rect 499 609 510 949
+rect 454 565 510 609
+rect 540 949 596 965
+rect 540 609 551 949
+rect 585 609 596 949
+rect 540 565 596 609
+rect 626 949 682 965
+rect 626 609 637 949
+rect 671 609 682 949
+rect 626 565 682 609
+rect 712 949 765 965
+rect 712 609 723 949
+rect 757 609 765 949
+rect 712 565 765 609
+<< ndiffc >>
+rect 35 131 69 233
+rect 193 131 227 233
+rect 293 131 327 233
+rect 379 131 413 233
+rect 465 131 499 233
+rect 551 131 585 233
+rect 637 131 671 233
+rect 723 131 757 233
+<< pdiffc >>
+rect 35 745 69 949
+rect 121 677 155 949
+rect 207 677 241 949
+rect 293 609 327 949
+rect 379 609 413 949
+rect 465 609 499 949
+rect 551 609 585 949
+rect 637 609 671 949
+rect 723 609 757 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+rect 571 27 595 61
+rect 629 27 653 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+rect 571 1049 595 1083
+rect 629 1049 653 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+rect 595 27 629 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+rect 595 1049 629 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 338 965 368 992
+rect 424 965 454 991
+rect 510 965 540 991
+rect 596 965 626 991
+rect 682 965 712 991
+rect 80 534 110 565
+rect 20 518 110 534
+rect 20 484 30 518
+rect 64 484 110 518
+rect 20 468 110 484
+rect 80 263 110 468
+rect 166 467 196 565
+rect 252 540 282 565
+rect 338 540 368 565
+rect 424 540 454 565
+rect 510 540 540 565
+rect 596 540 626 565
+rect 682 540 712 565
+rect 252 510 712 540
+rect 152 450 210 467
+rect 152 416 166 450
+rect 200 416 210 450
+rect 152 400 210 416
+rect 152 263 182 400
+rect 252 368 282 510
+rect 252 352 306 368
+rect 252 318 262 352
+rect 296 332 306 352
+rect 596 332 626 510
+rect 296 318 712 332
+rect 252 302 712 318
+rect 252 263 282 302
+rect 338 263 368 302
+rect 424 263 454 302
+rect 510 263 540 302
+rect 596 263 626 302
+rect 682 263 712 302
+rect 80 89 110 115
+rect 152 89 182 115
+rect 252 89 282 115
+rect 338 89 368 115
+rect 424 89 454 115
+rect 510 89 540 115
+rect 596 89 626 115
+rect 682 89 712 115
+<< polycont >>
+rect 30 484 64 518
+rect 166 416 200 450
+rect 262 318 296 352
+<< locali >>
+rect 0 1083 814 1110
+rect 0 1049 51 1083
+rect 85 1049 187 1083
+rect 221 1049 323 1083
+rect 357 1049 459 1083
+rect 493 1049 595 1083
+rect 629 1049 814 1083
+rect 35 949 69 1049
+rect 35 729 69 745
+rect 121 949 155 965
+rect 98 677 121 695
+rect 98 661 155 677
+rect 207 949 241 1049
+rect 207 661 241 677
+rect 293 949 327 965
+rect 30 518 64 597
+rect 30 468 64 484
+rect 98 352 132 661
+rect 166 450 200 523
+rect 293 483 327 609
+rect 379 949 413 1049
+rect 379 593 413 609
+rect 465 949 499 965
+rect 465 483 499 609
+rect 551 949 585 1049
+rect 551 593 585 609
+rect 637 949 671 965
+rect 637 483 671 609
+rect 723 949 757 1049
+rect 723 593 757 609
+rect 166 400 200 416
+rect 35 318 262 352
+rect 296 318 312 352
+rect 35 233 69 318
+rect 35 115 69 131
+rect 193 233 227 249
+rect 193 61 227 131
+rect 293 115 327 131
+rect 379 233 413 249
+rect 379 61 413 131
+rect 465 115 499 131
+rect 551 233 585 249
+rect 551 61 585 131
+rect 637 115 671 131
+rect 723 233 757 249
+rect 723 61 757 131
+rect 0 27 51 61
+rect 85 27 187 61
+rect 221 27 323 61
+rect 357 27 459 61
+rect 493 27 595 61
+rect 629 27 814 61
+rect 0 0 814 27
+<< viali >>
+rect 30 597 64 631
+rect 166 523 200 557
+rect 293 449 327 483
+rect 465 449 499 483
+rect 637 449 671 483
+rect 293 233 327 261
+rect 293 227 327 233
+rect 465 233 499 261
+rect 465 227 499 233
+rect 637 233 671 261
+rect 637 227 671 233
+<< metal1 >>
+rect 0 1049 814 1110
+rect 18 631 76 637
+rect 18 597 30 631
+rect 64 597 98 631
+rect 18 591 76 597
+rect 154 557 212 563
+rect 132 523 166 557
+rect 200 523 212 557
+rect 154 517 212 523
+rect 281 483 339 489
+rect 453 483 511 489
+rect 625 483 683 489
+rect 281 449 293 483
+rect 327 449 465 483
+rect 499 449 637 483
+rect 671 449 683 483
+rect 281 443 339 449
+rect 453 443 511 449
+rect 625 443 683 449
+rect 293 267 327 443
+rect 465 267 499 443
+rect 637 267 671 443
+rect 281 261 339 267
+rect 453 261 511 267
+rect 625 261 683 267
+rect 281 227 293 261
+rect 327 227 465 261
+rect 499 227 637 261
+rect 671 227 683 261
+rect 281 221 339 227
+rect 453 221 511 227
+rect 625 221 683 227
+rect 0 0 814 61
+<< labels >>
+rlabel viali 184 540 184 540 1 B
+port 1 n
+rlabel viali 48 614 48 614 1 A
+port 2 n
+rlabel metal1 311 392 311 392 1 Y
+port 3 n
+rlabel metal1 68 44 68 44 1 gnd
+rlabel metal1 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_8.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_8.mag
new file mode 100644
index 0000000..f4b752e
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_8.mag
@@ -0,0 +1,426 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007749
+<< checkpaint >>
+rect -1269 -242 2250 2379
+<< nwell >>
+rect -9 529 990 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+rect 596 115 626 263
+rect 682 115 712 263
+rect 768 115 798 263
+rect 854 115 884 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+rect 424 565 454 965
+rect 510 565 540 965
+rect 596 565 626 965
+rect 682 565 712 965
+rect 768 565 798 965
+rect 854 565 884 965
+<< ndiff >>
+rect 27 233 80 263
+rect 27 131 35 233
+rect 69 131 80 233
+rect 27 115 80 131
+rect 110 115 152 263
+rect 182 233 252 263
+rect 182 131 193 233
+rect 227 131 252 233
+rect 182 115 252 131
+rect 282 233 338 263
+rect 282 131 293 233
+rect 327 131 338 233
+rect 282 115 338 131
+rect 368 233 424 263
+rect 368 131 379 233
+rect 413 131 424 233
+rect 368 115 424 131
+rect 454 233 510 263
+rect 454 131 465 233
+rect 499 131 510 233
+rect 454 115 510 131
+rect 540 233 596 263
+rect 540 131 551 233
+rect 585 131 596 233
+rect 540 115 596 131
+rect 626 233 682 263
+rect 626 131 637 233
+rect 671 131 682 233
+rect 626 115 682 131
+rect 712 233 768 263
+rect 712 131 723 233
+rect 757 131 768 233
+rect 712 115 768 131
+rect 798 233 854 263
+rect 798 131 809 233
+rect 843 131 854 233
+rect 798 115 854 131
+rect 884 233 937 263
+rect 884 131 895 233
+rect 929 131 937 233
+rect 884 115 937 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 745 35 949
+rect 69 745 80 949
+rect 27 565 80 745
+rect 110 949 166 965
+rect 110 677 121 949
+rect 155 677 166 949
+rect 110 565 166 677
+rect 196 949 252 965
+rect 196 677 207 949
+rect 241 677 252 949
+rect 196 565 252 677
+rect 282 949 338 965
+rect 282 609 293 949
+rect 327 609 338 949
+rect 282 565 338 609
+rect 368 949 424 965
+rect 368 609 379 949
+rect 413 609 424 949
+rect 368 565 424 609
+rect 454 949 510 965
+rect 454 609 465 949
+rect 499 609 510 949
+rect 454 565 510 609
+rect 540 949 596 965
+rect 540 609 551 949
+rect 585 609 596 949
+rect 540 565 596 609
+rect 626 949 682 965
+rect 626 609 637 949
+rect 671 609 682 949
+rect 626 565 682 609
+rect 712 949 768 965
+rect 712 609 723 949
+rect 757 609 768 949
+rect 712 565 768 609
+rect 798 949 854 965
+rect 798 609 809 949
+rect 843 609 854 949
+rect 798 565 854 609
+rect 884 949 937 965
+rect 884 609 895 949
+rect 929 609 937 949
+rect 884 565 937 609
+<< ndiffc >>
+rect 35 131 69 233
+rect 193 131 227 233
+rect 293 131 327 233
+rect 379 131 413 233
+rect 465 131 499 233
+rect 551 131 585 233
+rect 637 131 671 233
+rect 723 131 757 233
+rect 809 131 843 233
+rect 895 131 929 233
+<< pdiffc >>
+rect 35 745 69 949
+rect 121 677 155 949
+rect 207 677 241 949
+rect 293 609 327 949
+rect 379 609 413 949
+rect 465 609 499 949
+rect 551 609 585 949
+rect 637 609 671 949
+rect 723 609 757 949
+rect 809 609 843 949
+rect 895 609 929 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+rect 571 27 595 61
+rect 629 27 653 61
+rect 707 27 731 61
+rect 765 27 789 61
+rect 843 27 867 61
+rect 901 27 925 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+rect 571 1049 595 1083
+rect 629 1049 653 1083
+rect 707 1049 731 1083
+rect 765 1049 789 1083
+rect 843 1049 867 1083
+rect 901 1049 925 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+rect 595 27 629 61
+rect 731 27 765 61
+rect 867 27 901 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+rect 595 1049 629 1083
+rect 731 1049 765 1083
+rect 867 1049 901 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 338 965 368 992
+rect 424 965 454 991
+rect 510 965 540 991
+rect 596 965 626 991
+rect 682 965 712 991
+rect 768 965 798 991
+rect 854 965 884 991
+rect 80 534 110 565
+rect 27 518 110 534
+rect 27 484 37 518
+rect 71 484 110 518
+rect 27 468 110 484
+rect 80 263 110 468
+rect 166 466 196 565
+rect 252 540 282 565
+rect 338 540 368 565
+rect 424 540 454 565
+rect 510 540 540 565
+rect 596 540 626 565
+rect 682 540 712 565
+rect 768 540 798 565
+rect 854 540 884 565
+rect 252 510 884 540
+rect 152 450 217 466
+rect 152 416 173 450
+rect 207 416 217 450
+rect 152 400 217 416
+rect 152 263 182 400
+rect 259 368 289 510
+rect 259 352 313 368
+rect 259 332 269 352
+rect 252 318 269 332
+rect 303 332 313 352
+rect 596 332 626 510
+rect 303 318 884 332
+rect 252 302 884 318
+rect 252 263 282 302
+rect 338 263 368 302
+rect 424 263 454 302
+rect 510 263 540 302
+rect 596 263 626 302
+rect 682 263 712 302
+rect 768 263 798 302
+rect 854 263 884 302
+rect 80 89 110 115
+rect 152 89 182 115
+rect 252 89 282 115
+rect 338 89 368 115
+rect 424 89 454 115
+rect 510 89 540 115
+rect 596 89 626 115
+rect 682 89 712 115
+rect 768 89 798 115
+rect 854 89 884 115
+<< polycont >>
+rect 37 484 71 518
+rect 173 416 207 450
+rect 269 318 303 352
+<< locali >>
+rect 0 1093 990 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 459 1093
+rect 493 1049 595 1093
+rect 629 1049 731 1093
+rect 765 1049 867 1093
+rect 901 1049 990 1093
+rect 35 949 69 1049
+rect 35 729 69 745
+rect 121 949 155 965
+rect 105 677 121 695
+rect 105 661 155 677
+rect 207 949 241 1049
+rect 207 661 241 677
+rect 293 949 327 965
+rect 37 518 71 597
+rect 37 468 71 484
+rect 105 352 139 661
+rect 173 450 207 523
+rect 293 483 327 609
+rect 379 949 413 1049
+rect 379 593 413 609
+rect 465 949 499 965
+rect 465 483 499 609
+rect 551 949 585 1049
+rect 551 593 585 609
+rect 637 949 671 965
+rect 637 483 671 609
+rect 723 949 757 1049
+rect 723 593 757 609
+rect 809 949 843 965
+rect 809 483 843 609
+rect 895 949 929 1049
+rect 895 593 929 609
+rect 173 400 207 416
+rect 35 318 269 352
+rect 303 318 319 352
+rect 35 233 69 318
+rect 35 115 69 131
+rect 193 233 227 249
+rect 193 61 227 131
+rect 293 115 327 131
+rect 379 233 413 249
+rect 379 61 413 131
+rect 465 115 499 131
+rect 551 233 585 249
+rect 551 61 585 131
+rect 637 115 671 131
+rect 723 233 757 249
+rect 723 61 757 131
+rect 809 115 843 131
+rect 895 233 929 249
+rect 895 61 929 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 459 61
+rect 493 17 595 61
+rect 629 17 731 61
+rect 765 17 867 61
+rect 901 17 990 61
+rect 0 0 990 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 459 1083 493 1093
+rect 459 1059 493 1083
+rect 595 1083 629 1093
+rect 595 1059 629 1083
+rect 731 1083 765 1093
+rect 731 1059 765 1083
+rect 867 1083 901 1093
+rect 867 1059 901 1083
+rect 37 597 71 631
+rect 173 523 207 557
+rect 293 449 327 483
+rect 465 449 499 483
+rect 637 449 671 483
+rect 809 449 843 483
+rect 293 233 327 261
+rect 293 227 327 233
+rect 465 233 499 261
+rect 465 227 499 233
+rect 637 233 671 261
+rect 637 227 671 233
+rect 809 233 843 261
+rect 809 227 843 233
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+rect 459 27 493 51
+rect 459 17 493 27
+rect 595 27 629 51
+rect 595 17 629 27
+rect 731 27 765 51
+rect 731 17 765 27
+rect 867 27 901 51
+rect 867 17 901 27
+<< metal1 >>
+rect 0 1093 990 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 459 1093
+rect 493 1059 595 1093
+rect 629 1059 731 1093
+rect 765 1059 867 1093
+rect 901 1059 990 1093
+rect 0 1049 990 1059
+rect 25 631 83 637
+rect 25 597 37 631
+rect 71 597 105 631
+rect 25 591 83 597
+rect 161 557 219 563
+rect 140 523 173 557
+rect 207 523 219 557
+rect 161 517 219 523
+rect 281 483 339 489
+rect 453 483 511 489
+rect 625 483 683 489
+rect 797 483 855 489
+rect 281 449 293 483
+rect 327 449 465 483
+rect 499 449 637 483
+rect 671 449 809 483
+rect 843 449 855 483
+rect 281 443 339 449
+rect 453 443 511 449
+rect 625 443 683 449
+rect 797 443 855 449
+rect 293 267 327 443
+rect 465 267 499 443
+rect 637 267 671 443
+rect 809 267 843 443
+rect 281 261 339 267
+rect 453 261 511 267
+rect 625 261 683 267
+rect 797 261 855 267
+rect 281 227 293 261
+rect 327 227 465 261
+rect 499 227 637 261
+rect 671 227 683 261
+rect 712 227 809 261
+rect 843 227 855 261
+rect 281 221 339 227
+rect 453 221 511 227
+rect 625 221 683 227
+rect 797 221 855 227
+rect 0 51 990 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 459 51
+rect 493 17 595 51
+rect 629 17 731 51
+rect 765 17 867 51
+rect 901 17 990 51
+rect 0 0 990 17
+<< labels >>
+rlabel viali 191 540 191 540 1 B
+port 1 n
+rlabel viali 55 614 55 614 1 A
+port 2 n
+rlabel metal1 311 392 311 392 1 Y
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_l.mag
new file mode 100644
index 0000000..589ad0a
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_l.mag
@@ -0,0 +1,186 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007749
+<< checkpaint >>
+rect -1269 -242 1634 2379
+<< nwell >>
+rect -9 529 374 1119
+<< nmoslvt >>
+rect 80 115 110 219
+rect 152 115 182 219
+rect 252 115 282 219
+<< pmos >>
+rect 80 713 110 965
+rect 166 713 196 965
+rect 252 713 282 965
+<< ndiff >>
+rect 27 199 80 219
+rect 27 131 35 199
+rect 69 131 80 199
+rect 27 115 80 131
+rect 110 115 152 219
+rect 182 199 252 219
+rect 182 131 193 199
+rect 227 131 252 199
+rect 182 115 252 131
+rect 282 199 335 219
+rect 282 131 293 199
+rect 327 131 335 199
+rect 282 115 335 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 813 35 949
+rect 69 813 80 949
+rect 27 713 80 813
+rect 110 949 166 965
+rect 110 813 121 949
+rect 155 813 166 949
+rect 110 713 166 813
+rect 196 949 252 965
+rect 196 813 207 949
+rect 241 813 252 949
+rect 196 713 252 813
+rect 282 949 335 965
+rect 282 813 293 949
+rect 327 813 335 949
+rect 282 713 335 813
+<< ndiffc >>
+rect 35 131 69 199
+rect 193 131 227 199
+rect 293 131 327 199
+<< pdiffc >>
+rect 35 813 69 949
+rect 121 813 155 949
+rect 207 813 241 949
+rect 293 813 327 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 80 534 110 713
+rect 27 518 110 534
+rect 27 484 37 518
+rect 71 484 110 518
+rect 27 468 110 484
+rect 80 219 110 468
+rect 166 466 196 713
+rect 252 540 282 713
+rect 252 510 289 540
+rect 152 450 217 466
+rect 152 416 173 450
+rect 207 416 217 450
+rect 152 400 217 416
+rect 152 219 182 400
+rect 259 368 289 510
+rect 259 352 313 368
+rect 259 332 269 352
+rect 252 318 269 332
+rect 303 318 313 352
+rect 252 302 313 318
+rect 252 219 282 302
+rect 80 89 110 115
+rect 152 89 182 115
+rect 252 89 282 115
+<< polycont >>
+rect 37 484 71 518
+rect 173 416 207 450
+rect 269 318 303 352
+<< locali >>
+rect 0 1093 374 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 374 1093
+rect 35 949 69 1049
+rect 121 949 155 965
+rect 35 797 69 813
+rect 105 813 121 831
+rect 105 797 155 813
+rect 207 949 241 1049
+rect 207 797 241 813
+rect 293 949 327 965
+rect 37 518 71 597
+rect 37 468 71 484
+rect 105 352 139 797
+rect 173 450 207 523
+rect 293 483 327 813
+rect 173 400 207 416
+rect 35 318 269 352
+rect 303 318 319 352
+rect 35 199 69 318
+rect 35 115 69 131
+rect 193 199 227 215
+rect 193 61 227 131
+rect 293 199 327 227
+rect 293 115 327 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 374 61
+rect 0 0 374 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 37 597 71 631
+rect 173 523 207 557
+rect 293 449 327 483
+rect 293 227 327 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 374 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 374 1093
+rect 0 1049 374 1059
+rect 25 631 83 637
+rect 25 597 37 631
+rect 71 597 105 631
+rect 25 591 83 597
+rect 161 557 219 563
+rect 140 523 173 557
+rect 207 523 219 557
+rect 161 517 219 523
+rect 281 483 339 489
+rect 281 449 293 483
+rect 327 449 339 483
+rect 281 443 339 449
+rect 293 267 327 443
+rect 281 261 339 267
+rect 281 227 293 261
+rect 327 227 339 261
+rect 281 221 339 227
+rect 0 51 374 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 374 51
+rect 0 0 374 17
+<< labels >>
+rlabel metal1 311 392 311 392 1 Y
+port 1 n
+rlabel viali 55 614 55 614 1 A
+port 2 n
+rlabel viali 191 540 191 540 1 B
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__ant.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__ant.mag
new file mode 100644
index 0000000..bb494cb
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__ant.mag
@@ -0,0 +1,101 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007750
+<< checkpaint >>
+rect -1269 -242 1459 2379
+<< nwell >>
+rect -9 529 199 1119
+<< nmoslvt >>
+rect 80 115 110 263
+<< pmos >>
+rect 80 565 110 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 163 263
+rect 110 131 121 215
+rect 155 131 163 215
+rect 110 115 163 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 605 35 949
+rect 69 605 80 949
+rect 27 565 80 605
+rect 110 949 163 965
+rect 110 605 121 949
+rect 155 605 163 949
+rect 110 565 163 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+<< pdiffc >>
+rect 35 605 69 949
+rect 121 605 155 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+<< poly >>
+rect 80 965 110 991
+rect 80 499 110 565
+rect 35 483 110 499
+rect 35 449 47 483
+rect 81 449 110 483
+rect 35 433 110 449
+rect 80 263 110 433
+rect 80 89 110 115
+<< polycont >>
+rect 47 449 81 483
+<< locali >>
+rect 0 1093 198 1110
+rect 0 1049 51 1093
+rect 85 1049 198 1093
+rect 35 949 69 965
+rect 35 483 69 605
+rect 121 949 155 1049
+rect 121 589 155 605
+rect 31 449 47 483
+rect 81 449 97 483
+rect 35 365 69 449
+rect 35 331 155 365
+rect 35 215 69 331
+rect 35 115 69 131
+rect 121 215 155 331
+rect 121 115 155 131
+rect 0 17 51 61
+rect 85 17 198 61
+rect 0 0 198 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 47 449 81 483
+rect 51 27 85 51
+rect 51 17 85 27
+<< metal1 >>
+rect 0 1093 198 1110
+rect 0 1059 51 1093
+rect 85 1059 198 1093
+rect 0 1049 198 1059
+rect 35 483 108 489
+rect 35 449 47 483
+rect 81 449 108 483
+rect 35 443 108 449
+rect 0 51 198 61
+rect 0 17 51 51
+rect 85 17 198 51
+rect 0 0 198 17
+<< labels >>
+rlabel viali 64 466 64 466 1 A
+port 1 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__antfill.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__antfill.mag
new file mode 100644
index 0000000..ffd9206
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__antfill.mag
@@ -0,0 +1,58 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007749
+<< checkpaint >>
+rect -1269 -242 1459 2379
+<< nwell >>
+rect -9 529 199 1119
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+<< locali >>
+rect 0 1093 198 1110
+rect 0 1049 51 1093
+rect 85 1049 198 1093
+rect 35 483 69 965
+rect 121 589 155 1049
+rect 31 449 47 483
+rect 81 449 97 483
+rect 35 365 69 449
+rect 35 331 155 365
+rect 35 115 69 331
+rect 121 115 155 331
+rect 0 17 51 61
+rect 85 17 198 61
+rect 0 0 198 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 47 449 81 483
+rect 51 27 85 51
+rect 51 17 85 27
+<< metal1 >>
+rect 0 1093 198 1110
+rect 0 1059 51 1093
+rect 85 1059 198 1093
+rect 0 1049 198 1059
+rect 35 483 108 489
+rect 35 449 47 483
+rect 81 449 108 483
+rect 35 443 108 449
+rect 0 51 198 61
+rect 0 17 51 51
+rect 85 17 198 51
+rect 0 0 198 17
+<< labels >>
+rlabel viali 64 466 64 466 1 A
+port 1 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__aoi21_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__aoi21_l.mag
new file mode 100644
index 0000000..703c600
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__aoi21_l.mag
@@ -0,0 +1,197 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007750
+<< checkpaint >>
+rect -1269 -242 1634 2379
+<< nwell >>
+rect -9 529 374 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 250 115 280 219
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+<< ndiff >>
+rect 27 233 80 263
+rect 27 131 35 233
+rect 69 131 80 233
+rect 27 115 80 131
+rect 110 115 152 263
+rect 182 233 235 263
+rect 182 131 193 233
+rect 227 219 235 233
+rect 227 131 250 219
+rect 182 115 250 131
+rect 280 165 333 219
+rect 280 131 291 165
+rect 325 131 333 165
+rect 280 115 333 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 745 35 949
+rect 69 745 80 949
+rect 27 565 80 745
+rect 110 949 166 965
+rect 110 813 121 949
+rect 155 813 166 949
+rect 110 565 166 813
+rect 196 949 252 965
+rect 196 745 207 949
+rect 241 745 252 949
+rect 196 565 252 745
+rect 282 949 335 965
+rect 282 677 293 949
+rect 327 677 335 949
+rect 282 565 335 677
+<< ndiffc >>
+rect 35 131 69 233
+rect 193 131 227 233
+rect 291 131 325 165
+<< pdiffc >>
+rect 35 745 69 949
+rect 121 813 155 949
+rect 207 745 241 949
+rect 293 677 327 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 80 528 110 565
+rect 44 518 110 528
+rect 44 484 60 518
+rect 94 484 110 518
+rect 44 474 110 484
+rect 44 318 74 474
+rect 166 432 196 565
+rect 252 527 282 565
+rect 252 497 309 527
+rect 134 416 196 432
+rect 134 382 146 416
+rect 180 382 196 416
+rect 134 366 196 382
+rect 44 286 110 318
+rect 80 263 110 286
+rect 152 263 182 366
+rect 279 353 309 497
+rect 279 337 333 353
+rect 279 319 289 337
+rect 250 303 289 319
+rect 323 303 333 337
+rect 250 287 333 303
+rect 250 219 280 287
+rect 80 89 110 115
+rect 152 89 182 115
+rect 250 89 280 115
+<< polycont >>
+rect 60 484 94 518
+rect 146 382 180 416
+rect 289 303 323 337
+<< locali >>
+rect 0 1093 374 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 374 1093
+rect 35 949 69 965
+rect 121 949 155 1049
+rect 121 797 155 813
+rect 207 949 241 965
+rect 69 745 207 763
+rect 35 729 241 745
+rect 293 949 327 965
+rect 60 518 94 597
+rect 60 468 94 484
+rect 128 432 162 523
+rect 128 416 180 432
+rect 128 382 146 416
+rect 128 366 180 382
+rect 216 337 250 449
+rect 293 409 327 677
+rect 216 303 289 337
+rect 323 303 339 337
+rect 35 233 69 249
+rect 35 61 69 131
+rect 193 115 227 131
+rect 291 165 325 181
+rect 291 61 325 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 374 61
+rect 0 0 374 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 60 597 94 631
+rect 128 523 162 557
+rect 216 449 250 483
+rect 293 375 327 409
+rect 193 233 227 261
+rect 193 227 227 233
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 374 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 374 1093
+rect 0 1049 374 1059
+rect 48 631 106 637
+rect 48 597 60 631
+rect 94 597 128 631
+rect 48 591 106 597
+rect 116 557 174 563
+rect 116 523 128 557
+rect 162 523 196 557
+rect 116 517 174 523
+rect 204 483 262 489
+rect 182 449 216 483
+rect 250 449 262 483
+rect 204 443 262 449
+rect 281 409 339 415
+rect 281 375 293 409
+rect 327 375 339 409
+rect 281 369 339 375
+rect 181 261 239 267
+rect 293 261 327 369
+rect 181 227 193 261
+rect 227 227 327 261
+rect 181 221 239 227
+rect 0 51 374 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 374 51
+rect 0 0 374 17
+<< labels >>
+rlabel viali 77 614 77 614 1 A0
+port 1 n
+rlabel viali 233 466 233 466 1 B0
+port 2 n
+rlabel metal1 310 362 310 362 1 Y
+port 3 n
+rlabel viali 145 540 145 540 1 A1
+port 4 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__aoi22_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__aoi22_l.mag
new file mode 100644
index 0000000..0377ffb
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__aoi22_l.mag
@@ -0,0 +1,239 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007750
+<< checkpaint >>
+rect -1269 -242 1722 2379
+<< nwell >>
+rect -9 529 462 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 252 115 282 263
+rect 324 115 354 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+<< ndiff >>
+rect 27 233 80 263
+rect 27 131 35 233
+rect 69 131 80 233
+rect 27 115 80 131
+rect 110 115 152 263
+rect 182 233 252 263
+rect 182 131 200 233
+rect 234 131 252 233
+rect 182 115 252 131
+rect 282 115 324 263
+rect 354 233 407 263
+rect 354 131 365 233
+rect 399 131 407 233
+rect 354 115 407 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 711 35 949
+rect 69 711 80 949
+rect 27 565 80 711
+rect 110 949 166 965
+rect 110 779 121 949
+rect 155 779 166 949
+rect 110 565 166 779
+rect 196 949 252 965
+rect 196 711 207 949
+rect 241 711 252 949
+rect 196 565 252 711
+rect 282 881 338 965
+rect 282 711 293 881
+rect 327 711 338 881
+rect 282 565 338 711
+rect 368 949 421 965
+rect 368 711 379 949
+rect 413 711 421 949
+rect 368 565 421 711
+<< ndiffc >>
+rect 35 131 69 233
+rect 200 131 234 233
+rect 365 131 399 233
+<< pdiffc >>
+rect 35 711 69 949
+rect 121 779 155 949
+rect 207 711 241 949
+rect 293 711 327 881
+rect 379 711 413 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 338 965 368 991
+rect 80 528 110 565
+rect 44 518 110 528
+rect 44 484 60 518
+rect 94 484 110 518
+rect 44 474 110 484
+rect 44 318 74 474
+rect 166 462 196 565
+rect 152 432 196 462
+rect 116 416 182 432
+rect 116 382 128 416
+rect 162 382 182 416
+rect 116 366 182 382
+rect 44 286 110 318
+rect 80 263 110 286
+rect 152 263 182 366
+rect 252 361 282 565
+rect 338 426 368 565
+rect 338 410 416 426
+rect 338 382 370 410
+rect 224 345 282 361
+rect 224 311 234 345
+rect 268 311 282 345
+rect 224 295 282 311
+rect 252 263 282 295
+rect 324 376 370 382
+rect 404 376 416 410
+rect 324 360 416 376
+rect 324 352 368 360
+rect 324 263 354 352
+rect 80 89 110 115
+rect 152 89 182 115
+rect 252 89 282 115
+rect 324 89 354 115
+<< polycont >>
+rect 60 484 94 518
+rect 128 382 162 416
+rect 234 311 268 345
+rect 370 376 404 410
+<< locali >>
+rect 0 1093 462 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 462 1093
+rect 35 949 69 965
+rect 121 949 155 1049
+rect 121 763 155 779
+rect 207 950 413 985
+rect 207 949 241 950
+rect 69 711 207 729
+rect 379 949 413 950
+rect 35 695 241 711
+rect 293 881 327 897
+rect 60 518 94 597
+rect 293 614 327 711
+rect 379 695 413 711
+rect 293 580 336 614
+rect 60 468 94 484
+rect 128 416 162 523
+rect 128 366 162 382
+rect 216 361 250 449
+rect 216 345 268 361
+rect 216 311 234 345
+rect 234 295 268 311
+rect 302 335 336 580
+rect 370 410 404 426
+rect 370 360 404 376
+rect 35 233 69 249
+rect 35 61 69 131
+rect 200 115 234 131
+rect 365 233 399 249
+rect 365 61 399 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 462 61
+rect 0 0 462 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 60 597 94 631
+rect 128 523 162 557
+rect 216 449 250 483
+rect 370 376 404 410
+rect 302 301 336 335
+rect 200 233 234 261
+rect 200 227 234 233
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+<< metal1 >>
+rect 0 1093 462 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 462 1093
+rect 0 1049 462 1059
+rect 48 631 106 637
+rect 48 597 60 631
+rect 94 597 128 631
+rect 48 591 106 597
+rect 116 557 174 563
+rect 116 523 128 557
+rect 162 523 196 557
+rect 116 517 174 523
+rect 204 483 262 489
+rect 182 449 216 483
+rect 250 449 262 483
+rect 204 443 262 449
+rect 358 410 416 416
+rect 336 376 370 410
+rect 404 376 416 410
+rect 358 370 416 376
+rect 290 335 348 341
+rect 290 301 302 335
+rect 336 301 348 335
+rect 290 295 348 301
+rect 188 261 246 267
+rect 304 261 338 295
+rect 188 227 200 261
+rect 234 227 338 261
+rect 188 221 246 227
+rect 0 51 462 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 462 51
+rect 0 0 462 17
+<< labels >>
+rlabel viali 77 614 77 614 1 A0
+port 1 n
+rlabel viali 233 466 233 466 1 B0
+port 2 n
+rlabel viali 145 540 145 540 1 A1
+port 4 n
+rlabel viali 387 393 387 393 1 B1
+rlabel metal1 321 288 321 288 1 Y
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_1.mag
new file mode 100644
index 0000000..fd83fda
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_1.mag
@@ -0,0 +1,156 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007750
+<< checkpaint >>
+rect -1269 -242 1548 2379
+<< nwell >>
+rect -9 529 288 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+<< ndiff >>
+rect 27 233 80 263
+rect 27 131 35 233
+rect 69 131 80 233
+rect 27 115 80 131
+rect 110 233 166 263
+rect 110 131 121 233
+rect 155 131 166 233
+rect 110 115 166 131
+rect 196 233 249 263
+rect 196 131 207 233
+rect 241 131 249 233
+rect 196 115 249 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 609 35 949
+rect 69 609 80 949
+rect 27 565 80 609
+rect 110 949 166 965
+rect 110 745 121 949
+rect 155 745 166 949
+rect 110 565 166 745
+rect 196 949 249 965
+rect 196 609 207 949
+rect 241 609 249 949
+rect 196 565 249 609
+<< ndiffc >>
+rect 35 131 69 233
+rect 121 131 155 233
+rect 207 131 241 233
+<< pdiffc >>
+rect 35 609 69 949
+rect 121 745 155 949
+rect 207 609 241 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 80 477 110 565
+rect 166 550 196 565
+rect 166 520 251 550
+rect 80 461 154 477
+rect 80 427 110 461
+rect 144 427 154 461
+rect 80 411 154 427
+rect 80 263 110 411
+rect 221 368 251 520
+rect 166 352 251 368
+rect 166 318 176 352
+rect 210 318 251 352
+rect 166 302 251 318
+rect 166 263 196 302
+rect 80 89 110 115
+rect 166 89 196 115
+<< polycont >>
+rect 110 427 144 461
+rect 176 318 210 352
+<< locali >>
+rect 0 1093 286 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 286 1093
+rect 35 949 69 965
+rect 121 949 155 1049
+rect 121 729 155 745
+rect 207 949 241 965
+rect 35 352 69 609
+rect 110 461 144 597
+rect 207 557 241 609
+rect 110 411 144 427
+rect 176 352 210 368
+rect 35 318 176 352
+rect 35 233 69 318
+rect 176 302 210 318
+rect 35 115 69 131
+rect 121 233 155 249
+rect 121 61 155 131
+rect 207 115 241 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 286 61
+rect 0 0 286 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 110 597 144 631
+rect 207 523 241 557
+rect 207 233 241 261
+rect 207 227 241 233
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 286 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 286 1093
+rect 0 1049 286 1059
+rect 98 631 156 637
+rect 64 597 110 631
+rect 144 597 156 631
+rect 98 591 156 597
+rect 195 557 253 563
+rect 195 523 207 557
+rect 241 523 253 557
+rect 195 517 253 523
+rect 207 267 241 517
+rect 195 261 253 267
+rect 195 227 207 261
+rect 241 227 253 261
+rect 195 221 253 227
+rect 0 51 286 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 286 51
+rect 0 0 286 17
+<< labels >>
+rlabel metal1 213 403 213 403 1 Y
+port 2 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 127 614 127 614 1 A
+port 1 n
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_2.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_2.mag
new file mode 100644
index 0000000..b72a53f
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_2.mag
@@ -0,0 +1,179 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007750
+<< checkpaint >>
+rect -1269 2461 1636 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1636 -1129
+<< nwell >>
+rect -9 529 376 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 215 252 263
+rect 196 131 207 215
+rect 241 131 252 215
+rect 196 115 252 131
+rect 282 215 335 263
+rect 282 131 293 215
+rect 327 131 335 215
+rect 282 115 335 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 605 35 949
+rect 69 605 80 949
+rect 27 565 80 605
+rect 110 949 166 965
+rect 110 741 121 949
+rect 155 741 166 949
+rect 110 565 166 741
+rect 196 949 252 965
+rect 196 605 207 949
+rect 241 605 252 949
+rect 196 565 252 605
+rect 282 949 335 965
+rect 282 605 293 949
+rect 327 605 335 949
+rect 282 565 335 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 207 131 241 215
+rect 293 131 327 215
+<< pdiffc >>
+rect 35 605 69 949
+rect 121 741 155 949
+rect 207 605 241 949
+rect 293 605 327 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 992
+rect 80 477 110 565
+rect 166 550 196 565
+rect 252 550 282 565
+rect 166 520 282 550
+rect 80 461 154 477
+rect 80 427 110 461
+rect 144 427 154 461
+rect 80 411 154 427
+rect 80 263 110 411
+rect 221 368 251 520
+rect 166 352 251 368
+rect 166 318 176 352
+rect 210 332 251 352
+rect 210 318 282 332
+rect 166 302 282 318
+rect 166 263 196 302
+rect 252 263 282 302
+rect 80 89 110 115
+rect 166 89 196 115
+rect 252 89 282 115
+<< polycont >>
+rect 110 427 144 461
+rect 176 318 210 352
+<< locali >>
+rect 0 1093 374 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 374 1093
+rect 35 949 69 965
+rect 121 949 155 1049
+rect 121 725 155 741
+rect 207 949 241 965
+rect 35 352 69 605
+rect 110 461 144 597
+rect 207 557 241 605
+rect 293 949 327 1049
+rect 293 589 327 605
+rect 110 411 144 427
+rect 176 352 210 368
+rect 35 318 176 352
+rect 35 215 69 318
+rect 176 302 210 318
+rect 35 115 69 131
+rect 121 215 155 231
+rect 121 61 155 131
+rect 207 215 241 227
+rect 207 115 241 131
+rect 293 215 327 231
+rect 293 61 327 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 374 61
+rect 0 0 374 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 110 597 144 631
+rect 207 523 241 557
+rect 207 227 241 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 374 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 374 1093
+rect 0 1049 374 1059
+rect 98 631 156 637
+rect 64 597 110 631
+rect 144 597 156 631
+rect 98 591 156 597
+rect 195 557 253 563
+rect 195 523 207 557
+rect 241 523 253 557
+rect 195 517 253 523
+rect 207 267 241 517
+rect 195 261 253 267
+rect 195 227 207 261
+rect 241 227 253 261
+rect 195 221 253 227
+rect 0 51 374 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 374 51
+rect 0 0 374 17
+<< labels >>
+rlabel viali 127 614 127 614 1 A
+port 1 n
+rlabel metal1 211 402 211 402 1 Y
+port 2 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_4.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_4.mag
new file mode 100644
index 0000000..d085e37
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_4.mag
@@ -0,0 +1,244 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007751
+<< checkpaint >>
+rect -1269 2461 1812 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1812 -1129
+<< nwell >>
+rect -9 529 552 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+rect 424 565 454 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 215 252 263
+rect 196 131 207 215
+rect 241 131 252 215
+rect 196 115 252 131
+rect 282 215 338 263
+rect 282 131 293 215
+rect 327 131 338 215
+rect 282 115 338 131
+rect 368 215 424 263
+rect 368 131 379 215
+rect 413 131 424 215
+rect 368 115 424 131
+rect 454 215 507 263
+rect 454 131 465 215
+rect 499 131 507 215
+rect 454 115 507 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 605 35 949
+rect 69 605 80 949
+rect 27 565 80 605
+rect 110 949 166 965
+rect 110 741 121 949
+rect 155 741 166 949
+rect 110 565 166 741
+rect 196 949 252 965
+rect 196 605 207 949
+rect 241 605 252 949
+rect 196 565 252 605
+rect 282 949 338 965
+rect 282 605 293 949
+rect 327 605 338 949
+rect 282 565 338 605
+rect 368 949 424 965
+rect 368 605 379 949
+rect 413 605 424 949
+rect 368 565 424 605
+rect 454 949 507 965
+rect 454 605 465 949
+rect 499 605 507 949
+rect 454 565 507 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 207 131 241 215
+rect 293 131 327 215
+rect 379 131 413 215
+rect 465 131 499 215
+<< pdiffc >>
+rect 35 605 69 949
+rect 121 741 155 949
+rect 207 605 241 949
+rect 293 605 327 949
+rect 379 605 413 949
+rect 465 605 499 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 992
+rect 338 965 368 991
+rect 424 965 454 991
+rect 80 477 110 565
+rect 166 550 196 565
+rect 252 550 282 565
+rect 338 550 368 565
+rect 424 550 454 565
+rect 166 520 454 550
+rect 80 461 154 477
+rect 80 427 110 461
+rect 144 427 154 461
+rect 80 411 154 427
+rect 80 263 110 411
+rect 221 368 251 520
+rect 166 352 251 368
+rect 166 318 176 352
+rect 210 332 251 352
+rect 210 318 454 332
+rect 166 302 454 318
+rect 166 263 196 302
+rect 252 263 282 302
+rect 338 263 368 302
+rect 424 263 454 302
+rect 80 89 110 115
+rect 166 89 196 115
+rect 252 89 282 115
+rect 338 89 368 115
+rect 424 89 454 115
+<< polycont >>
+rect 110 427 144 461
+rect 176 318 210 352
+<< locali >>
+rect 0 1093 550 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 550 1093
+rect 35 949 69 965
+rect 121 949 155 1049
+rect 121 725 155 741
+rect 207 949 241 965
+rect 35 352 69 605
+rect 110 461 144 597
+rect 207 557 241 605
+rect 293 949 327 1049
+rect 293 589 327 605
+rect 379 949 413 965
+rect 379 557 413 605
+rect 465 949 499 1049
+rect 465 589 499 605
+rect 110 411 144 427
+rect 176 352 210 368
+rect 35 318 176 352
+rect 35 215 69 318
+rect 176 302 210 318
+rect 35 115 69 131
+rect 121 215 155 231
+rect 35 61 69 62
+rect 121 61 155 131
+rect 207 215 241 227
+rect 207 115 241 131
+rect 293 215 327 231
+rect 207 61 241 62
+rect 293 61 327 131
+rect 379 215 413 227
+rect 379 115 413 131
+rect 465 215 499 231
+rect 465 61 499 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 550 61
+rect 0 0 550 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 110 597 144 631
+rect 207 523 241 557
+rect 379 523 413 557
+rect 207 227 241 261
+rect 379 227 413 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+<< metal1 >>
+rect 0 1093 550 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 550 1093
+rect 0 1049 550 1059
+rect 98 631 156 637
+rect 64 597 110 631
+rect 144 597 156 631
+rect 98 591 156 597
+rect 195 557 253 563
+rect 367 557 425 563
+rect 195 523 207 557
+rect 241 523 379 557
+rect 413 523 425 557
+rect 195 517 253 523
+rect 367 517 425 523
+rect 207 267 241 517
+rect 379 267 413 517
+rect 195 261 253 267
+rect 367 261 425 267
+rect 195 227 207 261
+rect 241 227 379 261
+rect 413 227 425 261
+rect 195 221 253 227
+rect 367 221 425 227
+rect 0 51 550 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 550 51
+rect 0 0 550 17
+<< labels >>
+rlabel viali 127 614 127 614 1 A
+port 1 n
+rlabel metal1 211 402 211 402 1 Y
+port 2 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_6.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_6.mag
new file mode 100644
index 0000000..7108f30
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_6.mag
@@ -0,0 +1,286 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007751
+<< checkpaint >>
+rect -1269 2461 1988 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1988 -1129
+<< nwell >>
+rect -9 529 728 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+rect 596 115 626 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+rect 424 565 454 965
+rect 510 565 540 965
+rect 596 565 626 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 215 252 263
+rect 196 131 207 215
+rect 241 131 252 215
+rect 196 115 252 131
+rect 282 215 338 263
+rect 282 131 293 215
+rect 327 131 338 215
+rect 282 115 338 131
+rect 368 215 424 263
+rect 368 131 379 215
+rect 413 131 424 215
+rect 368 115 424 131
+rect 454 215 510 263
+rect 454 131 465 215
+rect 499 131 510 215
+rect 454 115 510 131
+rect 540 215 596 263
+rect 540 131 551 215
+rect 585 131 596 215
+rect 540 115 596 131
+rect 626 215 679 263
+rect 626 131 637 215
+rect 671 131 679 215
+rect 626 115 679 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 605 35 949
+rect 69 605 80 949
+rect 27 565 80 605
+rect 110 949 166 965
+rect 110 741 121 949
+rect 155 741 166 949
+rect 110 565 166 741
+rect 196 949 252 965
+rect 196 605 207 949
+rect 241 605 252 949
+rect 196 565 252 605
+rect 282 949 338 965
+rect 282 605 293 949
+rect 327 605 338 949
+rect 282 565 338 605
+rect 368 949 424 965
+rect 368 605 379 949
+rect 413 605 424 949
+rect 368 565 424 605
+rect 454 949 510 965
+rect 454 605 465 949
+rect 499 605 510 949
+rect 454 565 510 605
+rect 540 949 596 965
+rect 540 605 551 949
+rect 585 605 596 949
+rect 540 565 596 605
+rect 626 949 679 965
+rect 626 605 637 949
+rect 671 605 679 949
+rect 626 565 679 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 207 131 241 215
+rect 293 131 327 215
+rect 379 131 413 215
+rect 465 131 499 215
+rect 551 131 585 215
+rect 637 131 671 215
+<< pdiffc >>
+rect 35 605 69 949
+rect 121 741 155 949
+rect 207 605 241 949
+rect 293 605 327 949
+rect 379 605 413 949
+rect 465 605 499 949
+rect 551 605 585 949
+rect 637 605 671 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+rect 571 27 595 61
+rect 629 27 653 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+rect 571 1049 595 1083
+rect 629 1049 653 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+rect 595 27 629 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+rect 595 1049 629 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 992
+rect 338 965 368 991
+rect 424 965 454 991
+rect 510 965 540 991
+rect 596 965 626 991
+rect 80 477 110 565
+rect 166 550 196 565
+rect 252 550 282 565
+rect 338 550 368 565
+rect 424 550 454 565
+rect 510 550 540 565
+rect 596 550 626 565
+rect 166 520 626 550
+rect 80 461 154 477
+rect 80 427 110 461
+rect 144 427 154 461
+rect 80 411 154 427
+rect 80 263 110 411
+rect 221 368 251 520
+rect 166 352 251 368
+rect 166 318 176 352
+rect 210 332 251 352
+rect 510 332 540 520
+rect 210 318 626 332
+rect 166 302 626 318
+rect 166 263 196 302
+rect 252 263 282 302
+rect 338 263 368 302
+rect 424 263 454 302
+rect 510 263 540 302
+rect 596 263 626 302
+rect 80 89 110 115
+rect 166 89 196 115
+rect 252 89 282 115
+rect 338 89 368 115
+rect 424 89 454 115
+rect 510 89 540 115
+rect 596 89 626 115
+<< polycont >>
+rect 110 427 144 461
+rect 176 318 210 352
+<< locali >>
+rect 0 1083 726 1110
+rect 0 1049 51 1083
+rect 85 1049 187 1083
+rect 221 1049 323 1083
+rect 357 1049 459 1083
+rect 493 1049 595 1083
+rect 629 1049 726 1083
+rect 35 949 69 965
+rect 121 949 155 1049
+rect 121 725 155 741
+rect 207 949 241 965
+rect 35 352 69 605
+rect 110 461 144 597
+rect 207 557 241 605
+rect 293 949 327 1049
+rect 293 589 327 605
+rect 379 949 413 965
+rect 379 557 413 605
+rect 465 949 499 1049
+rect 465 589 499 605
+rect 551 949 585 965
+rect 551 557 585 605
+rect 637 949 671 1049
+rect 637 589 671 605
+rect 110 411 144 427
+rect 176 352 210 368
+rect 35 318 176 352
+rect 35 215 69 318
+rect 176 302 210 318
+rect 35 115 69 131
+rect 121 215 155 231
+rect 121 61 155 131
+rect 207 215 241 227
+rect 207 115 241 131
+rect 293 215 327 231
+rect 293 61 327 131
+rect 379 215 413 227
+rect 379 115 413 131
+rect 465 215 499 231
+rect 465 61 499 131
+rect 551 215 585 227
+rect 551 115 585 131
+rect 637 215 671 231
+rect 637 61 671 131
+rect 0 27 51 61
+rect 85 27 187 61
+rect 221 27 323 61
+rect 357 27 459 61
+rect 493 27 595 61
+rect 629 27 726 61
+rect 0 0 726 27
+<< viali >>
+rect 110 597 144 631
+rect 207 523 241 557
+rect 379 523 413 557
+rect 551 523 585 557
+rect 207 227 241 261
+rect 379 227 413 261
+rect 551 227 585 261
+<< metal1 >>
+rect 0 1049 726 1110
+rect 98 631 156 637
+rect 64 597 110 631
+rect 144 597 156 631
+rect 98 591 156 597
+rect 195 557 253 563
+rect 367 557 425 563
+rect 539 557 597 563
+rect 195 523 207 557
+rect 241 523 379 557
+rect 413 523 551 557
+rect 585 523 597 557
+rect 195 517 253 523
+rect 367 517 425 523
+rect 539 517 597 523
+rect 207 267 241 517
+rect 379 267 413 517
+rect 551 267 585 517
+rect 195 261 253 267
+rect 367 261 425 267
+rect 539 261 597 267
+rect 195 227 207 261
+rect 241 227 379 261
+rect 413 227 551 261
+rect 585 227 597 261
+rect 195 221 253 227
+rect 367 221 425 227
+rect 539 221 597 227
+rect 0 0 726 61
+<< labels >>
+rlabel viali 127 614 127 614 1 A
+port 1 n
+rlabel metal1 211 402 211 402 1 Y
+port 2 n
+rlabel metal1 68 44 68 44 1 gnd
+rlabel metal1 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_8.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_8.mag
new file mode 100644
index 0000000..7987901
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_8.mag
@@ -0,0 +1,383 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007751
+<< checkpaint >>
+rect -1269 2461 2164 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 2164 -1129
+<< nwell >>
+rect -9 529 904 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+rect 596 115 626 263
+rect 682 115 712 263
+rect 768 115 798 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+rect 424 565 454 965
+rect 510 565 540 965
+rect 596 565 626 965
+rect 682 565 712 965
+rect 768 565 798 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 215 252 263
+rect 196 131 207 215
+rect 241 131 252 215
+rect 196 115 252 131
+rect 282 215 338 263
+rect 282 131 293 215
+rect 327 131 338 215
+rect 282 115 338 131
+rect 368 215 424 263
+rect 368 131 379 215
+rect 413 131 424 215
+rect 368 115 424 131
+rect 454 215 510 263
+rect 454 131 465 215
+rect 499 131 510 215
+rect 454 115 510 131
+rect 540 215 596 263
+rect 540 131 551 215
+rect 585 131 596 215
+rect 540 115 596 131
+rect 626 215 682 263
+rect 626 131 637 215
+rect 671 131 682 215
+rect 626 115 682 131
+rect 712 215 768 263
+rect 712 131 723 215
+rect 757 131 768 215
+rect 712 115 768 131
+rect 798 215 851 263
+rect 798 131 809 215
+rect 843 131 851 215
+rect 798 115 851 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 605 35 949
+rect 69 605 80 949
+rect 27 565 80 605
+rect 110 949 166 965
+rect 110 741 121 949
+rect 155 741 166 949
+rect 110 565 166 741
+rect 196 949 252 965
+rect 196 605 207 949
+rect 241 605 252 949
+rect 196 565 252 605
+rect 282 949 338 965
+rect 282 605 293 949
+rect 327 605 338 949
+rect 282 565 338 605
+rect 368 949 424 965
+rect 368 605 379 949
+rect 413 605 424 949
+rect 368 565 424 605
+rect 454 949 510 965
+rect 454 605 465 949
+rect 499 605 510 949
+rect 454 565 510 605
+rect 540 949 596 965
+rect 540 605 551 949
+rect 585 605 596 949
+rect 540 565 596 605
+rect 626 949 682 965
+rect 626 605 637 949
+rect 671 605 682 949
+rect 626 565 682 605
+rect 712 949 768 965
+rect 712 605 723 949
+rect 757 605 768 949
+rect 712 565 768 605
+rect 798 949 851 965
+rect 798 605 809 949
+rect 843 605 851 949
+rect 798 565 851 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 207 131 241 215
+rect 293 131 327 215
+rect 379 131 413 215
+rect 465 131 499 215
+rect 551 131 585 215
+rect 637 131 671 215
+rect 723 131 757 215
+rect 809 131 843 215
+<< pdiffc >>
+rect 35 605 69 949
+rect 121 741 155 949
+rect 207 605 241 949
+rect 293 605 327 949
+rect 379 605 413 949
+rect 465 605 499 949
+rect 551 605 585 949
+rect 637 605 671 949
+rect 723 605 757 949
+rect 809 605 843 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+rect 571 27 595 61
+rect 629 27 653 61
+rect 707 27 731 61
+rect 765 27 789 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+rect 571 1049 595 1083
+rect 629 1049 653 1083
+rect 707 1049 731 1083
+rect 765 1049 789 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+rect 595 27 629 61
+rect 731 27 765 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+rect 595 1049 629 1083
+rect 731 1049 765 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 992
+rect 338 965 368 991
+rect 424 965 454 991
+rect 510 965 540 991
+rect 596 965 626 991
+rect 682 965 712 991
+rect 768 965 798 991
+rect 80 477 110 565
+rect 166 550 196 565
+rect 252 550 282 565
+rect 338 550 368 565
+rect 424 550 454 565
+rect 510 550 540 565
+rect 596 550 626 565
+rect 682 550 712 565
+rect 768 550 798 565
+rect 166 520 798 550
+rect 80 461 154 477
+rect 80 427 110 461
+rect 144 427 154 461
+rect 80 411 154 427
+rect 80 263 110 411
+rect 221 368 251 520
+rect 166 352 251 368
+rect 166 318 176 352
+rect 210 332 251 352
+rect 510 332 540 520
+rect 210 318 798 332
+rect 166 302 798 318
+rect 166 263 196 302
+rect 252 263 282 302
+rect 338 263 368 302
+rect 424 263 454 302
+rect 510 263 540 302
+rect 596 263 626 302
+rect 682 263 712 302
+rect 768 263 798 302
+rect 80 89 110 115
+rect 166 89 196 115
+rect 252 89 282 115
+rect 338 89 368 115
+rect 424 89 454 115
+rect 510 89 540 115
+rect 596 89 626 115
+rect 682 89 712 115
+rect 768 89 798 115
+<< polycont >>
+rect 110 427 144 461
+rect 176 318 210 352
+<< locali >>
+rect 0 1093 902 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 459 1093
+rect 493 1049 595 1093
+rect 629 1049 731 1093
+rect 765 1049 902 1093
+rect 35 949 69 965
+rect 121 949 155 1049
+rect 121 725 155 741
+rect 207 949 241 965
+rect 35 352 69 605
+rect 110 461 144 597
+rect 207 557 241 605
+rect 293 949 327 1049
+rect 293 589 327 605
+rect 379 949 413 965
+rect 379 557 413 605
+rect 465 949 499 1049
+rect 465 589 499 605
+rect 551 949 585 965
+rect 551 557 585 605
+rect 637 949 671 1049
+rect 637 589 671 605
+rect 723 949 757 965
+rect 723 557 757 605
+rect 809 949 843 1049
+rect 809 589 843 605
+rect 110 411 144 427
+rect 176 352 210 368
+rect 35 318 176 352
+rect 35 215 69 318
+rect 176 302 210 318
+rect 35 115 69 131
+rect 121 215 155 231
+rect 121 61 155 131
+rect 207 215 241 227
+rect 207 115 241 131
+rect 293 215 327 231
+rect 293 61 327 131
+rect 379 215 413 227
+rect 379 115 413 131
+rect 465 215 499 231
+rect 465 61 499 131
+rect 551 215 585 227
+rect 551 115 585 131
+rect 637 215 671 231
+rect 637 61 671 131
+rect 723 215 757 227
+rect 723 115 757 131
+rect 809 215 843 231
+rect 809 61 843 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 459 61
+rect 493 17 595 61
+rect 629 17 731 61
+rect 765 17 902 61
+rect 0 0 902 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 459 1083 493 1093
+rect 459 1059 493 1083
+rect 595 1083 629 1093
+rect 595 1059 629 1083
+rect 731 1083 765 1093
+rect 731 1059 765 1083
+rect 110 597 144 631
+rect 207 523 241 557
+rect 379 523 413 557
+rect 551 523 585 557
+rect 723 523 757 557
+rect 207 227 241 261
+rect 379 227 413 261
+rect 551 227 585 261
+rect 723 227 757 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+rect 459 27 493 51
+rect 459 17 493 27
+rect 595 27 629 51
+rect 595 17 629 27
+rect 731 27 765 51
+rect 731 17 765 27
+<< metal1 >>
+rect 0 1093 902 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 459 1093
+rect 493 1059 595 1093
+rect 629 1059 731 1093
+rect 765 1059 902 1093
+rect 0 1049 902 1059
+rect 98 631 156 637
+rect 64 597 110 631
+rect 144 597 156 631
+rect 98 591 156 597
+rect 195 557 253 563
+rect 367 557 425 563
+rect 539 557 597 563
+rect 711 557 769 563
+rect 195 523 207 557
+rect 241 523 379 557
+rect 413 523 551 557
+rect 585 523 723 557
+rect 757 523 769 557
+rect 195 517 253 523
+rect 367 517 425 523
+rect 539 517 597 523
+rect 711 517 769 523
+rect 207 267 241 517
+rect 379 267 413 517
+rect 551 267 585 517
+rect 723 267 757 517
+rect 195 261 253 267
+rect 367 261 425 267
+rect 539 261 597 267
+rect 711 261 769 267
+rect 195 227 207 261
+rect 241 227 379 261
+rect 413 227 551 261
+rect 585 227 723 261
+rect 757 227 769 261
+rect 195 221 253 227
+rect 367 221 425 227
+rect 539 221 597 227
+rect 711 221 769 227
+rect 0 51 902 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 459 51
+rect 493 17 595 51
+rect 629 17 731 51
+rect 765 17 902 51
+rect 0 0 902 17
+<< labels >>
+rlabel viali 127 614 127 614 1 A
+port 1 n
+rlabel metal1 211 402 211 402 1 Y
+port 2 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_l.mag
new file mode 100644
index 0000000..5471d0b
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_l.mag
@@ -0,0 +1,156 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007751
+<< checkpaint >>
+rect -1269 -242 1548 2379
+<< nwell >>
+rect -9 529 288 1119
+<< nmoslvt >>
+rect 80 115 110 219
+rect 166 115 196 219
+<< pmos >>
+rect 80 713 110 965
+rect 166 713 196 965
+<< ndiff >>
+rect 27 165 80 219
+rect 27 131 35 165
+rect 69 131 80 165
+rect 27 115 80 131
+rect 110 165 166 219
+rect 110 131 121 165
+rect 155 131 166 165
+rect 110 115 166 131
+rect 196 165 249 219
+rect 196 131 207 165
+rect 241 131 249 165
+rect 196 115 249 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 831 35 949
+rect 69 831 80 949
+rect 27 713 80 831
+rect 110 949 166 965
+rect 110 831 121 949
+rect 155 831 166 949
+rect 110 713 166 831
+rect 196 949 249 965
+rect 196 831 207 949
+rect 241 831 249 949
+rect 196 713 249 831
+<< ndiffc >>
+rect 35 131 69 165
+rect 121 131 155 165
+rect 207 131 241 165
+<< pdiffc >>
+rect 35 831 69 949
+rect 121 831 155 949
+rect 207 831 241 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 80 477 110 713
+rect 166 550 196 713
+rect 166 520 251 550
+rect 80 461 154 477
+rect 80 427 110 461
+rect 144 427 154 461
+rect 80 411 154 427
+rect 80 219 110 411
+rect 221 368 251 520
+rect 166 352 251 368
+rect 166 318 176 352
+rect 210 318 251 352
+rect 166 302 251 318
+rect 166 219 196 302
+rect 80 89 110 115
+rect 166 89 196 115
+<< polycont >>
+rect 110 427 144 461
+rect 176 318 210 352
+<< locali >>
+rect 0 1093 286 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 286 1093
+rect 35 949 69 965
+rect 35 352 69 831
+rect 121 949 155 1049
+rect 121 815 155 831
+rect 207 949 241 965
+rect 110 461 144 597
+rect 207 557 241 831
+rect 110 411 144 427
+rect 176 352 210 368
+rect 35 318 176 352
+rect 35 165 69 318
+rect 176 302 210 318
+rect 35 115 69 131
+rect 121 165 155 181
+rect 121 61 155 131
+rect 207 165 241 227
+rect 207 115 241 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 286 61
+rect 0 0 286 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 110 597 144 631
+rect 207 523 241 557
+rect 207 227 241 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 286 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 286 1093
+rect 0 1049 286 1059
+rect 98 631 156 637
+rect 64 597 110 631
+rect 144 597 156 631
+rect 98 591 156 597
+rect 195 557 253 563
+rect 195 523 207 557
+rect 241 523 253 557
+rect 195 517 253 523
+rect 207 267 241 517
+rect 195 261 253 267
+rect 195 227 207 261
+rect 241 227 253 261
+rect 195 221 253 227
+rect 0 51 286 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 286 51
+rect 0 0 286 17
+<< labels >>
+rlabel viali 127 614 127 614 1 A
+port 1 n
+rlabel metal1 214 400 214 400 1 Y
+port 2 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__decap_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__decap_1.mag
new file mode 100644
index 0000000..ec0c702
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__decap_1.mag
@@ -0,0 +1,83 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007751
+<< checkpaint >>
+rect -1269 -242 1459 2379
+<< nwell >>
+rect -9 529 199 1119
+<< nmoslvt >>
+rect 80 115 110 367
+<< pmos >>
+rect 80 713 110 965
+<< ndiff >>
+rect 27 335 80 367
+rect 27 131 35 335
+rect 69 131 80 335
+rect 27 115 80 131
+rect 110 335 163 367
+rect 110 131 121 335
+rect 155 131 163 335
+rect 110 115 163 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 745 35 949
+rect 69 745 80 949
+rect 27 713 80 745
+rect 110 949 163 965
+rect 110 745 121 949
+rect 155 745 163 949
+rect 110 713 163 745
+<< ndiffc >>
+rect 35 131 69 335
+rect 121 131 155 335
+<< pdiffc >>
+rect 35 745 69 949
+rect 121 745 155 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+<< poly >>
+rect 80 965 110 991
+rect 80 367 110 713
+rect 80 80 110 115
+<< locali >>
+rect 0 1093 198 1110
+rect 0 1049 51 1093
+rect 85 1049 198 1093
+rect 35 949 69 1049
+rect 35 729 69 745
+rect 121 949 155 1049
+rect 121 729 155 745
+rect 35 335 69 351
+rect 35 61 69 131
+rect 121 335 155 351
+rect 121 61 155 131
+rect 0 17 51 61
+rect 85 17 198 61
+rect 0 0 198 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 51 27 85 51
+rect 51 17 85 27
+<< metal1 >>
+rect 0 1093 198 1110
+rect 0 1059 51 1093
+rect 85 1059 198 1093
+rect 0 1049 198 1059
+rect 0 51 198 61
+rect 0 17 51 51
+rect 85 17 198 51
+rect 0 0 198 17
+<< labels >>
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__decap_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__decap_l.mag
new file mode 100644
index 0000000..1878c42
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__decap_l.mag
@@ -0,0 +1,83 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007751
+<< checkpaint >>
+rect -1269 -242 1459 2379
+<< nwell >>
+rect -9 529 199 1119
+<< nmoslvt >>
+rect 80 115 110 243
+<< pmos >>
+rect 80 837 110 965
+<< ndiff >>
+rect 27 215 80 243
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 163 243
+rect 110 131 121 215
+rect 155 131 163 215
+rect 110 115 163 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 865 35 949
+rect 69 865 80 949
+rect 27 837 80 865
+rect 110 949 163 965
+rect 110 865 121 949
+rect 155 865 163 949
+rect 110 837 163 865
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+<< pdiffc >>
+rect 35 865 69 949
+rect 121 865 155 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+<< poly >>
+rect 80 965 110 991
+rect 80 243 110 837
+rect 80 80 110 115
+<< locali >>
+rect 0 1093 198 1110
+rect 0 1049 51 1093
+rect 85 1049 198 1093
+rect 35 949 69 1049
+rect 35 849 69 865
+rect 121 949 155 1049
+rect 121 849 155 865
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 231
+rect 121 61 155 131
+rect 0 17 51 61
+rect 85 17 198 61
+rect 0 0 198 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 51 27 85 51
+rect 51 17 85 27
+<< metal1 >>
+rect 0 1093 198 1110
+rect 0 1059 51 1093
+rect 85 1059 198 1093
+rect 0 1049 198 1059
+rect 0 51 198 61
+rect 0 17 51 51
+rect 85 17 198 51
+rect 0 0 198 17
+<< labels >>
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__dff_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__dff_1.mag
new file mode 100644
index 0000000..8108b64
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__dff_1.mag
@@ -0,0 +1,634 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007752
+<< checkpaint >>
+rect -1269 -242 2716 2379
+<< nwell >>
+rect -9 529 1456 1119
+<< nmoslvt >>
+rect 85 115 115 263
+rect 171 115 201 263
+rect 243 115 273 263
+rect 363 115 393 263
+rect 435 115 465 263
+rect 521 115 551 263
+rect 593 115 623 263
+rect 713 115 743 263
+rect 785 115 815 263
+rect 871 115 901 263
+rect 1061 115 1091 263
+rect 1251 115 1281 263
+rect 1337 115 1367 263
+<< pmos >>
+rect 85 565 115 965
+rect 171 565 201 965
+rect 243 565 273 965
+rect 363 565 393 965
+rect 435 565 465 965
+rect 521 565 551 965
+rect 593 565 623 965
+rect 713 565 743 965
+rect 785 565 815 965
+rect 871 565 901 965
+rect 1061 565 1091 965
+rect 1251 565 1281 965
+rect 1337 565 1367 965
+<< ndiff >>
+rect 32 215 85 263
+rect 32 131 40 215
+rect 74 131 85 215
+rect 32 115 85 131
+rect 115 215 171 263
+rect 115 131 126 215
+rect 160 131 171 215
+rect 115 115 171 131
+rect 201 115 243 263
+rect 273 215 363 263
+rect 273 131 284 215
+rect 352 131 363 215
+rect 273 115 363 131
+rect 393 115 435 263
+rect 465 165 521 263
+rect 465 131 476 165
+rect 510 131 521 165
+rect 465 115 521 131
+rect 551 115 593 263
+rect 623 215 713 263
+rect 623 131 634 215
+rect 702 131 713 215
+rect 623 115 713 131
+rect 743 115 785 263
+rect 815 215 871 263
+rect 815 131 826 215
+rect 860 131 871 215
+rect 815 115 871 131
+rect 901 215 954 263
+rect 901 131 912 215
+rect 946 131 954 215
+rect 901 115 954 131
+rect 1008 215 1061 263
+rect 1008 131 1016 215
+rect 1050 131 1061 215
+rect 1008 115 1061 131
+rect 1091 215 1144 263
+rect 1091 131 1102 215
+rect 1136 131 1144 215
+rect 1091 115 1144 131
+rect 1198 215 1251 263
+rect 1198 131 1206 215
+rect 1240 131 1251 215
+rect 1198 115 1251 131
+rect 1281 215 1337 263
+rect 1281 131 1292 215
+rect 1326 131 1337 215
+rect 1281 115 1337 131
+rect 1367 215 1420 263
+rect 1367 131 1378 215
+rect 1412 131 1420 215
+rect 1367 115 1420 131
+<< pdiff >>
+rect 32 949 85 965
+rect 32 605 40 949
+rect 74 605 85 949
+rect 32 565 85 605
+rect 115 949 171 965
+rect 115 673 126 949
+rect 160 673 171 949
+rect 115 565 171 673
+rect 201 565 243 965
+rect 273 949 363 965
+rect 273 605 284 949
+rect 352 605 363 949
+rect 273 565 363 605
+rect 393 565 435 965
+rect 465 949 521 965
+rect 465 673 476 949
+rect 510 673 521 949
+rect 465 565 521 673
+rect 551 565 593 965
+rect 623 949 713 965
+rect 623 605 634 949
+rect 702 605 713 949
+rect 623 565 713 605
+rect 743 565 785 965
+rect 815 949 871 965
+rect 815 605 826 949
+rect 860 605 871 949
+rect 815 565 871 605
+rect 901 949 954 965
+rect 901 605 912 949
+rect 946 605 954 949
+rect 901 565 954 605
+rect 1008 949 1061 965
+rect 1008 673 1016 949
+rect 1050 673 1061 949
+rect 1008 565 1061 673
+rect 1091 949 1144 965
+rect 1091 605 1102 949
+rect 1136 605 1144 949
+rect 1091 565 1144 605
+rect 1198 949 1251 965
+rect 1198 605 1206 949
+rect 1240 605 1251 949
+rect 1198 565 1251 605
+rect 1281 949 1337 965
+rect 1281 605 1292 949
+rect 1326 605 1337 949
+rect 1281 565 1337 605
+rect 1367 949 1420 965
+rect 1367 605 1378 949
+rect 1412 605 1420 949
+rect 1367 565 1420 605
+<< ndiffc >>
+rect 40 131 74 215
+rect 126 131 160 215
+rect 284 131 352 215
+rect 476 131 510 165
+rect 634 131 702 215
+rect 826 131 860 215
+rect 912 131 946 215
+rect 1016 131 1050 215
+rect 1102 131 1136 215
+rect 1206 131 1240 215
+rect 1292 131 1326 215
+rect 1378 131 1412 215
+<< pdiffc >>
+rect 40 605 74 949
+rect 126 673 160 949
+rect 284 605 352 949
+rect 476 673 510 949
+rect 634 605 702 949
+rect 826 605 860 949
+rect 912 605 946 949
+rect 1016 673 1050 949
+rect 1102 605 1136 949
+rect 1206 605 1240 949
+rect 1292 605 1326 949
+rect 1378 605 1412 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+rect 571 27 595 61
+rect 629 27 653 61
+rect 707 27 731 61
+rect 765 27 789 61
+rect 843 27 867 61
+rect 901 27 925 61
+rect 979 27 1003 61
+rect 1037 27 1061 61
+rect 1115 27 1139 61
+rect 1173 27 1197 61
+rect 1251 27 1275 61
+rect 1309 27 1333 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+rect 571 1049 595 1083
+rect 629 1049 653 1083
+rect 707 1049 731 1083
+rect 765 1049 789 1083
+rect 843 1049 867 1083
+rect 901 1049 925 1083
+rect 979 1049 1003 1083
+rect 1037 1049 1061 1083
+rect 1115 1049 1139 1083
+rect 1173 1049 1197 1083
+rect 1251 1049 1275 1083
+rect 1309 1049 1333 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+rect 595 27 629 61
+rect 731 27 765 61
+rect 867 27 901 61
+rect 1003 27 1037 61
+rect 1139 27 1173 61
+rect 1275 27 1309 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+rect 595 1049 629 1083
+rect 731 1049 765 1083
+rect 867 1049 901 1083
+rect 1003 1049 1037 1083
+rect 1139 1049 1173 1083
+rect 1275 1049 1309 1083
+<< poly >>
+rect 85 965 115 991
+rect 171 965 201 991
+rect 243 965 273 991
+rect 363 965 393 991
+rect 435 965 465 991
+rect 521 965 551 991
+rect 593 965 623 991
+rect 713 965 743 991
+rect 785 965 815 991
+rect 871 965 901 991
+rect 1061 965 1091 991
+rect 1251 965 1281 991
+rect 1337 965 1367 991
+rect 85 534 115 565
+rect 75 518 129 534
+rect 75 484 85 518
+rect 119 484 129 518
+rect 75 468 129 484
+rect 75 322 105 468
+rect 171 425 201 565
+rect 243 534 273 565
+rect 243 518 297 534
+rect 243 484 253 518
+rect 287 484 297 518
+rect 243 468 297 484
+rect 171 409 225 425
+rect 363 423 393 565
+rect 435 528 465 565
+rect 521 528 551 565
+rect 435 518 551 528
+rect 435 484 467 518
+rect 501 484 551 518
+rect 435 474 551 484
+rect 593 423 623 565
+rect 713 534 743 565
+rect 689 518 743 534
+rect 689 484 699 518
+rect 733 484 743 518
+rect 689 468 743 484
+rect 171 375 181 409
+rect 215 375 225 409
+rect 171 359 225 375
+rect 267 393 719 423
+rect 75 292 115 322
+rect 85 263 115 292
+rect 171 263 201 359
+rect 267 315 297 393
+rect 689 351 719 393
+rect 785 419 815 565
+rect 871 534 901 565
+rect 871 518 942 534
+rect 871 504 898 518
+rect 882 484 898 504
+rect 932 484 942 518
+rect 882 468 942 484
+rect 785 403 839 419
+rect 785 369 795 403
+rect 829 369 839 403
+rect 785 353 839 369
+rect 243 285 297 315
+rect 339 335 393 351
+rect 339 301 349 335
+rect 383 301 393 335
+rect 339 285 393 301
+rect 243 263 273 285
+rect 363 263 393 285
+rect 435 335 551 345
+rect 435 301 467 335
+rect 501 301 551 335
+rect 435 291 551 301
+rect 435 263 465 291
+rect 521 263 551 291
+rect 593 335 647 351
+rect 593 301 603 335
+rect 637 301 647 335
+rect 593 285 647 301
+rect 689 335 743 351
+rect 689 301 699 335
+rect 733 301 743 335
+rect 689 285 743 301
+rect 593 263 623 285
+rect 713 263 743 285
+rect 785 263 815 353
+rect 882 315 912 468
+rect 1061 351 1091 565
+rect 1251 549 1281 565
+rect 1241 519 1281 549
+rect 1241 419 1271 519
+rect 1337 460 1367 565
+rect 1216 403 1271 419
+rect 1216 369 1226 403
+rect 1260 369 1271 403
+rect 1313 444 1367 460
+rect 1313 410 1323 444
+rect 1357 410 1367 444
+rect 1313 394 1367 410
+rect 1216 353 1271 369
+rect 871 285 912 315
+rect 1008 335 1091 351
+rect 1008 301 1018 335
+rect 1052 301 1091 335
+rect 1008 285 1091 301
+rect 871 263 901 285
+rect 1061 263 1091 285
+rect 1241 308 1271 353
+rect 1241 278 1281 308
+rect 1251 263 1281 278
+rect 1337 263 1367 394
+rect 85 89 115 115
+rect 171 89 201 115
+rect 243 89 273 115
+rect 363 89 393 115
+rect 435 89 465 115
+rect 521 89 551 115
+rect 593 89 623 115
+rect 713 89 743 115
+rect 785 89 815 115
+rect 871 89 901 115
+rect 1061 89 1091 115
+rect 1251 89 1281 115
+rect 1337 89 1367 115
+<< polycont >>
+rect 85 484 119 518
+rect 253 484 287 518
+rect 467 484 501 518
+rect 699 484 733 518
+rect 181 375 215 409
+rect 898 484 932 518
+rect 795 369 829 403
+rect 349 301 383 335
+rect 467 301 501 335
+rect 603 301 637 335
+rect 699 301 733 335
+rect 1226 369 1260 403
+rect 1323 410 1357 444
+rect 1018 301 1052 335
+<< locali >>
+rect 0 1093 1452 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 459 1093
+rect 493 1049 595 1093
+rect 629 1049 731 1093
+rect 765 1049 867 1093
+rect 901 1049 1003 1093
+rect 1037 1049 1139 1093
+rect 1173 1049 1275 1093
+rect 1309 1049 1452 1093
+rect 40 949 74 965
+rect 17 605 40 617
+rect 126 949 160 1049
+rect 126 657 160 673
+rect 284 949 352 965
+rect 17 576 74 605
+rect 476 949 510 1049
+rect 476 657 510 673
+rect 634 949 702 965
+rect 352 605 355 623
+rect 284 602 355 605
+rect 634 602 702 605
+rect 17 335 51 576
+rect 108 568 355 602
+rect 535 568 702 602
+rect 826 949 860 1049
+rect 826 589 860 605
+rect 912 949 946 965
+rect 1016 949 1050 1049
+rect 1016 657 1050 673
+rect 1102 949 1136 965
+rect 912 602 946 605
+rect 912 568 1000 602
+rect 108 534 142 568
+rect 85 518 142 534
+rect 119 484 142 518
+rect 85 468 142 484
+rect 17 301 40 335
+rect 17 280 74 301
+rect 108 318 142 468
+rect 253 518 287 534
+rect 253 483 287 484
+rect 467 518 501 534
+rect 287 449 383 483
+rect 181 409 215 425
+rect 181 359 215 375
+rect 349 335 383 449
+rect 467 335 501 484
+rect 108 284 315 318
+rect 349 285 383 301
+rect 467 285 501 301
+rect 535 335 569 568
+rect 699 518 733 534
+rect 699 483 733 484
+rect 40 215 74 280
+rect 281 231 315 284
+rect 535 251 569 301
+rect 603 449 699 483
+rect 898 518 932 534
+rect 898 483 932 484
+rect 603 335 637 449
+rect 966 403 1000 568
+rect 779 369 795 403
+rect 829 369 845 403
+rect 912 369 1000 403
+rect 1102 403 1136 605
+rect 1206 949 1240 965
+rect 1206 557 1240 605
+rect 1292 949 1326 1049
+rect 1292 589 1326 605
+rect 1378 949 1412 965
+rect 1412 597 1435 614
+rect 1378 580 1435 597
+rect 1206 518 1240 523
+rect 1206 484 1357 518
+rect 1323 444 1357 484
+rect 1102 369 1226 403
+rect 1260 369 1276 403
+rect 912 335 946 369
+rect 683 301 699 335
+rect 733 301 946 335
+rect 1002 301 1018 335
+rect 1052 301 1068 335
+rect 603 285 637 301
+rect 40 115 74 131
+rect 126 215 160 231
+rect 281 215 352 231
+rect 535 217 702 251
+rect 281 197 284 215
+rect 126 61 160 131
+rect 634 215 702 217
+rect 284 115 352 131
+rect 476 165 510 181
+rect 476 61 510 131
+rect 634 115 702 131
+rect 826 215 860 231
+rect 826 61 860 131
+rect 912 215 946 301
+rect 912 115 946 131
+rect 1016 215 1050 231
+rect 1016 61 1050 131
+rect 1102 215 1136 369
+rect 1323 335 1357 410
+rect 1102 115 1136 131
+rect 1206 301 1357 335
+rect 1206 215 1240 301
+rect 1401 270 1435 580
+rect 1378 234 1435 270
+rect 1206 115 1240 131
+rect 1292 215 1326 231
+rect 1292 61 1326 131
+rect 1378 215 1412 234
+rect 1378 115 1412 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 459 61
+rect 493 17 595 61
+rect 629 17 731 61
+rect 765 17 867 61
+rect 901 17 1003 61
+rect 1037 17 1139 61
+rect 1173 17 1275 61
+rect 1309 17 1452 61
+rect 0 0 1452 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 459 1083 493 1093
+rect 459 1059 493 1083
+rect 595 1083 629 1093
+rect 595 1059 629 1083
+rect 731 1083 765 1093
+rect 731 1059 765 1083
+rect 867 1083 901 1093
+rect 867 1059 901 1083
+rect 1003 1083 1037 1093
+rect 1003 1059 1037 1083
+rect 1139 1083 1173 1093
+rect 1139 1059 1173 1083
+rect 1275 1083 1309 1093
+rect 1275 1059 1309 1083
+rect 40 301 74 335
+rect 253 449 287 483
+rect 181 375 215 409
+rect 449 301 467 335
+rect 467 301 483 335
+rect 535 301 569 335
+rect 699 449 733 483
+rect 898 449 932 483
+rect 795 369 829 403
+rect 1378 605 1412 631
+rect 1378 597 1412 605
+rect 1206 523 1240 557
+rect 1226 369 1260 403
+rect 1018 301 1052 335
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+rect 459 27 493 51
+rect 459 17 493 27
+rect 595 27 629 51
+rect 595 17 629 27
+rect 731 27 765 51
+rect 731 17 765 27
+rect 867 27 901 51
+rect 867 17 901 27
+rect 1003 27 1037 51
+rect 1003 17 1037 27
+rect 1139 27 1173 51
+rect 1139 17 1173 27
+rect 1275 27 1309 51
+rect 1275 17 1309 27
+<< metal1 >>
+rect 0 1093 1452 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 459 1093
+rect 493 1059 595 1093
+rect 629 1059 731 1093
+rect 765 1059 867 1093
+rect 901 1059 1003 1093
+rect 1037 1059 1139 1093
+rect 1173 1059 1275 1093
+rect 1309 1059 1452 1093
+rect 0 1049 1452 1059
+rect 1366 631 1424 637
+rect 1343 597 1378 631
+rect 1412 597 1424 631
+rect 1366 591 1424 597
+rect 1194 557 1252 563
+rect 1172 523 1206 557
+rect 1240 523 1252 557
+rect 1194 517 1252 523
+rect 241 483 299 489
+rect 687 483 745 489
+rect 886 483 944 489
+rect 241 449 253 483
+rect 287 449 699 483
+rect 733 449 898 483
+rect 932 449 944 483
+rect 241 443 299 449
+rect 687 443 745 449
+rect 886 443 944 449
+rect 169 409 227 415
+rect 169 375 181 409
+rect 215 375 249 409
+rect 783 403 841 409
+rect 1214 403 1272 409
+rect 169 369 227 375
+rect 783 369 795 403
+rect 829 369 1226 403
+rect 1260 369 1272 403
+rect 783 363 841 369
+rect 1214 363 1272 369
+rect 28 335 86 341
+rect 437 335 495 341
+rect 28 301 40 335
+rect 74 301 449 335
+rect 483 301 495 335
+rect 28 295 86 301
+rect 437 295 495 301
+rect 523 335 581 341
+rect 1006 335 1064 341
+rect 523 301 535 335
+rect 569 301 1018 335
+rect 1052 301 1064 335
+rect 523 295 581 301
+rect 1006 295 1064 301
+rect 0 51 1452 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 459 51
+rect 493 17 595 51
+rect 629 17 731 51
+rect 765 17 867 51
+rect 901 17 1003 51
+rect 1037 17 1139 51
+rect 1173 17 1275 51
+rect 1309 17 1452 51
+rect 0 0 1452 17
+<< labels >>
+rlabel viali 198 392 198 392 1 D
+port 1 n
+rlabel viali 915 466 915 466 1 CK
+port 3 n
+rlabel viali 1395 614 1395 614 1 Q
+port 4 n
+rlabel viali 1224 540 1224 540 1 QN
+port 2 n
+rlabel viali 68 45 68 45 1 gnd
+rlabel viali 68 1067 68 1067 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__dff_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__dff_l.mag
new file mode 100644
index 0000000..23f7484
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__dff_l.mag
@@ -0,0 +1,635 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007752
+<< checkpaint >>
+rect -1269 -242 2716 2379
+<< nwell >>
+rect -9 529 1456 1119
+<< nmoslvt >>
+rect 85 115 115 263
+rect 171 115 201 263
+rect 243 115 273 263
+rect 363 115 393 263
+rect 435 115 465 263
+rect 521 115 551 263
+rect 593 115 623 263
+rect 713 115 743 263
+rect 785 115 815 263
+rect 871 115 901 263
+rect 1061 115 1091 263
+rect 1251 115 1281 219
+rect 1337 115 1367 219
+<< pmos >>
+rect 85 565 115 965
+rect 171 565 201 965
+rect 243 565 273 965
+rect 363 565 393 965
+rect 435 565 465 965
+rect 521 565 551 965
+rect 593 565 623 965
+rect 713 565 743 965
+rect 785 565 815 965
+rect 871 565 901 965
+rect 1061 565 1091 965
+rect 1251 713 1281 965
+rect 1337 713 1367 965
+<< ndiff >>
+rect 32 215 85 263
+rect 32 131 40 215
+rect 74 131 85 215
+rect 32 115 85 131
+rect 115 215 171 263
+rect 115 131 126 215
+rect 160 131 171 215
+rect 115 115 171 131
+rect 201 115 243 263
+rect 273 215 363 263
+rect 273 131 284 215
+rect 352 131 363 215
+rect 273 115 363 131
+rect 393 115 435 263
+rect 465 165 521 263
+rect 465 131 476 165
+rect 510 131 521 165
+rect 465 115 521 131
+rect 551 115 593 263
+rect 623 215 713 263
+rect 623 131 634 215
+rect 702 131 713 215
+rect 623 115 713 131
+rect 743 115 785 263
+rect 815 215 871 263
+rect 815 131 826 215
+rect 860 131 871 215
+rect 815 115 871 131
+rect 901 215 954 263
+rect 901 131 912 215
+rect 946 131 954 215
+rect 901 115 954 131
+rect 1008 215 1061 263
+rect 1008 131 1016 215
+rect 1050 131 1061 215
+rect 1008 115 1061 131
+rect 1091 215 1144 263
+rect 1091 131 1102 215
+rect 1136 131 1144 215
+rect 1091 115 1144 131
+rect 1198 165 1251 219
+rect 1198 131 1206 165
+rect 1240 131 1251 165
+rect 1198 115 1251 131
+rect 1281 165 1337 219
+rect 1281 131 1292 165
+rect 1326 131 1337 165
+rect 1281 115 1337 131
+rect 1367 165 1420 219
+rect 1367 131 1378 165
+rect 1412 131 1420 165
+rect 1367 115 1420 131
+<< pdiff >>
+rect 32 949 85 965
+rect 32 605 40 949
+rect 74 605 85 949
+rect 32 565 85 605
+rect 115 949 171 965
+rect 115 673 126 949
+rect 160 673 171 949
+rect 115 565 171 673
+rect 201 565 243 965
+rect 273 949 363 965
+rect 273 605 284 949
+rect 352 605 363 949
+rect 273 565 363 605
+rect 393 565 435 965
+rect 465 949 521 965
+rect 465 673 476 949
+rect 510 673 521 949
+rect 465 565 521 673
+rect 551 565 593 965
+rect 623 949 713 965
+rect 623 673 634 949
+rect 702 673 713 949
+rect 623 565 713 673
+rect 743 565 785 965
+rect 815 949 871 965
+rect 815 605 826 949
+rect 860 605 871 949
+rect 815 565 871 605
+rect 901 949 954 965
+rect 901 605 912 949
+rect 946 605 954 949
+rect 901 565 954 605
+rect 1008 949 1061 965
+rect 1008 673 1016 949
+rect 1050 673 1061 949
+rect 1008 565 1061 673
+rect 1091 949 1144 965
+rect 1091 605 1102 949
+rect 1136 605 1144 949
+rect 1198 949 1251 965
+rect 1198 877 1206 949
+rect 1240 877 1251 949
+rect 1198 713 1251 877
+rect 1281 949 1337 965
+rect 1281 877 1292 949
+rect 1326 877 1337 949
+rect 1281 713 1337 877
+rect 1367 949 1420 965
+rect 1367 877 1378 949
+rect 1412 877 1420 949
+rect 1367 713 1420 877
+rect 1091 565 1144 605
+<< ndiffc >>
+rect 40 131 74 215
+rect 126 131 160 215
+rect 284 131 352 215
+rect 476 131 510 165
+rect 634 131 702 215
+rect 826 131 860 215
+rect 912 131 946 215
+rect 1016 131 1050 215
+rect 1102 131 1136 215
+rect 1206 131 1240 165
+rect 1292 131 1326 165
+rect 1378 131 1412 165
+<< pdiffc >>
+rect 40 605 74 949
+rect 126 673 160 949
+rect 284 605 352 949
+rect 476 673 510 949
+rect 634 673 702 949
+rect 826 605 860 949
+rect 912 605 946 949
+rect 1016 673 1050 949
+rect 1102 605 1136 949
+rect 1206 877 1240 949
+rect 1292 877 1326 949
+rect 1378 877 1412 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+rect 571 27 595 61
+rect 629 27 653 61
+rect 707 27 731 61
+rect 765 27 789 61
+rect 843 27 867 61
+rect 901 27 925 61
+rect 979 27 1003 61
+rect 1037 27 1061 61
+rect 1115 27 1139 61
+rect 1173 27 1197 61
+rect 1251 27 1275 61
+rect 1309 27 1333 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+rect 571 1049 595 1083
+rect 629 1049 653 1083
+rect 707 1049 731 1083
+rect 765 1049 789 1083
+rect 843 1049 867 1083
+rect 901 1049 925 1083
+rect 979 1049 1003 1083
+rect 1037 1049 1061 1083
+rect 1115 1049 1139 1083
+rect 1173 1049 1197 1083
+rect 1251 1049 1275 1083
+rect 1309 1049 1333 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+rect 595 27 629 61
+rect 731 27 765 61
+rect 867 27 901 61
+rect 1003 27 1037 61
+rect 1139 27 1173 61
+rect 1275 27 1309 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+rect 595 1049 629 1083
+rect 731 1049 765 1083
+rect 867 1049 901 1083
+rect 1003 1049 1037 1083
+rect 1139 1049 1173 1083
+rect 1275 1049 1309 1083
+<< poly >>
+rect 85 965 115 991
+rect 171 965 201 991
+rect 243 965 273 991
+rect 363 965 393 991
+rect 435 965 465 991
+rect 521 965 551 991
+rect 593 965 623 991
+rect 713 965 743 991
+rect 785 965 815 991
+rect 871 965 901 991
+rect 1061 965 1091 991
+rect 1251 965 1281 991
+rect 1337 965 1367 991
+rect 85 534 115 565
+rect 75 518 129 534
+rect 75 484 85 518
+rect 119 484 129 518
+rect 75 468 129 484
+rect 75 322 105 468
+rect 171 425 201 565
+rect 243 534 273 565
+rect 243 518 297 534
+rect 243 484 253 518
+rect 287 484 297 518
+rect 243 468 297 484
+rect 171 409 225 425
+rect 363 423 393 565
+rect 435 528 465 565
+rect 521 528 551 565
+rect 435 518 551 528
+rect 435 484 467 518
+rect 501 484 551 518
+rect 435 474 551 484
+rect 593 423 623 565
+rect 713 534 743 565
+rect 689 518 743 534
+rect 689 484 699 518
+rect 733 484 743 518
+rect 689 468 743 484
+rect 171 375 181 409
+rect 215 375 225 409
+rect 171 359 225 375
+rect 267 393 719 423
+rect 75 292 115 322
+rect 85 263 115 292
+rect 171 263 201 359
+rect 267 315 297 393
+rect 689 351 719 393
+rect 785 419 815 565
+rect 871 534 901 565
+rect 871 518 942 534
+rect 871 504 898 518
+rect 882 484 898 504
+rect 932 484 942 518
+rect 882 468 942 484
+rect 785 403 839 419
+rect 785 369 795 403
+rect 829 369 839 403
+rect 785 353 839 369
+rect 243 285 297 315
+rect 339 335 393 351
+rect 339 301 349 335
+rect 383 301 393 335
+rect 339 285 393 301
+rect 243 263 273 285
+rect 363 263 393 285
+rect 435 335 551 345
+rect 435 301 467 335
+rect 501 301 551 335
+rect 435 291 551 301
+rect 435 263 465 291
+rect 521 263 551 291
+rect 593 335 647 351
+rect 593 301 603 335
+rect 637 301 647 335
+rect 593 285 647 301
+rect 689 335 743 351
+rect 689 301 699 335
+rect 733 301 743 335
+rect 689 285 743 301
+rect 593 263 623 285
+rect 713 263 743 285
+rect 785 263 815 353
+rect 882 315 912 468
+rect 1061 351 1091 565
+rect 1251 549 1281 713
+rect 1241 519 1281 549
+rect 1241 419 1271 519
+rect 1337 460 1367 713
+rect 1216 403 1271 419
+rect 1216 369 1226 403
+rect 1260 369 1271 403
+rect 1313 444 1367 460
+rect 1313 410 1323 444
+rect 1357 410 1367 444
+rect 1313 394 1367 410
+rect 1216 353 1271 369
+rect 871 285 912 315
+rect 1008 335 1091 351
+rect 1008 301 1018 335
+rect 1052 301 1091 335
+rect 1008 285 1091 301
+rect 871 263 901 285
+rect 1061 263 1091 285
+rect 1241 308 1271 353
+rect 1241 278 1281 308
+rect 1251 219 1281 278
+rect 1337 219 1367 394
+rect 85 89 115 115
+rect 171 89 201 115
+rect 243 89 273 115
+rect 363 89 393 115
+rect 435 89 465 115
+rect 521 89 551 115
+rect 593 89 623 115
+rect 713 89 743 115
+rect 785 89 815 115
+rect 871 89 901 115
+rect 1061 89 1091 115
+rect 1251 89 1281 115
+rect 1337 89 1367 115
+<< polycont >>
+rect 85 484 119 518
+rect 253 484 287 518
+rect 467 484 501 518
+rect 699 484 733 518
+rect 181 375 215 409
+rect 898 484 932 518
+rect 795 369 829 403
+rect 349 301 383 335
+rect 467 301 501 335
+rect 603 301 637 335
+rect 699 301 733 335
+rect 1226 369 1260 403
+rect 1323 410 1357 444
+rect 1018 301 1052 335
+<< locali >>
+rect 0 1093 1452 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 459 1093
+rect 493 1049 595 1093
+rect 629 1049 731 1093
+rect 765 1049 867 1093
+rect 901 1049 1003 1093
+rect 1037 1049 1139 1093
+rect 1173 1049 1275 1093
+rect 1309 1049 1452 1093
+rect 40 949 74 965
+rect 17 605 40 617
+rect 126 949 160 1049
+rect 126 657 160 673
+rect 284 949 352 965
+rect 17 583 74 605
+rect 476 949 510 1049
+rect 476 657 510 673
+rect 634 949 702 965
+rect 352 605 355 623
+rect 284 602 355 605
+rect 634 602 702 673
+rect 17 335 51 583
+rect 108 568 355 602
+rect 535 568 702 602
+rect 826 949 860 1049
+rect 826 589 860 605
+rect 912 949 946 965
+rect 1016 949 1050 1049
+rect 1016 657 1050 673
+rect 1102 949 1136 965
+rect 912 602 946 605
+rect 912 568 1000 602
+rect 108 534 142 568
+rect 85 518 142 534
+rect 119 484 142 518
+rect 85 468 142 484
+rect 17 301 40 335
+rect 17 280 74 301
+rect 108 318 142 468
+rect 253 518 287 534
+rect 253 483 287 484
+rect 467 518 501 534
+rect 287 449 383 483
+rect 181 409 215 425
+rect 181 359 215 375
+rect 349 335 383 449
+rect 467 335 501 484
+rect 108 284 315 318
+rect 349 285 383 301
+rect 467 285 501 301
+rect 535 335 569 568
+rect 699 518 733 534
+rect 699 483 733 484
+rect 40 215 74 280
+rect 281 231 315 284
+rect 535 251 569 301
+rect 603 449 699 483
+rect 898 518 932 534
+rect 898 483 932 484
+rect 603 335 637 449
+rect 966 403 1000 568
+rect 779 369 795 403
+rect 829 369 845 403
+rect 912 369 1000 403
+rect 1102 403 1136 605
+rect 1206 949 1240 965
+rect 1206 557 1240 877
+rect 1292 949 1326 1049
+rect 1292 861 1326 877
+rect 1378 949 1412 965
+rect 1378 631 1412 877
+rect 1411 614 1412 631
+rect 1411 597 1435 614
+rect 1378 580 1435 597
+rect 1206 518 1240 523
+rect 1206 484 1357 518
+rect 1323 444 1357 484
+rect 1102 369 1226 403
+rect 1260 369 1276 403
+rect 912 335 946 369
+rect 683 301 699 335
+rect 733 301 946 335
+rect 1002 301 1018 335
+rect 1052 301 1068 335
+rect 603 285 637 301
+rect 40 115 74 131
+rect 126 215 160 231
+rect 281 215 352 231
+rect 535 217 702 251
+rect 281 197 284 215
+rect 126 61 160 131
+rect 634 215 702 217
+rect 284 115 352 131
+rect 476 165 510 181
+rect 476 61 510 131
+rect 634 115 702 131
+rect 826 215 860 231
+rect 826 61 860 131
+rect 912 215 946 301
+rect 912 115 946 131
+rect 1016 215 1050 231
+rect 1016 61 1050 131
+rect 1102 215 1136 369
+rect 1323 335 1357 410
+rect 1102 115 1136 131
+rect 1206 301 1357 335
+rect 1206 165 1240 301
+rect 1401 268 1435 580
+rect 1378 234 1435 268
+rect 1206 115 1240 131
+rect 1292 165 1326 181
+rect 1292 61 1326 131
+rect 1378 165 1412 234
+rect 1378 115 1412 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 459 61
+rect 493 17 595 61
+rect 629 17 731 61
+rect 765 17 867 61
+rect 901 17 1003 61
+rect 1037 17 1139 61
+rect 1173 17 1275 61
+rect 1309 17 1452 61
+rect 0 0 1452 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 459 1083 493 1093
+rect 459 1059 493 1083
+rect 595 1083 629 1093
+rect 595 1059 629 1083
+rect 731 1083 765 1093
+rect 731 1059 765 1083
+rect 867 1083 901 1093
+rect 867 1059 901 1083
+rect 1003 1083 1037 1093
+rect 1003 1059 1037 1083
+rect 1139 1083 1173 1093
+rect 1139 1059 1173 1083
+rect 1275 1083 1309 1093
+rect 1275 1059 1309 1083
+rect 40 301 74 335
+rect 253 449 287 483
+rect 181 375 215 409
+rect 449 301 467 335
+rect 467 301 483 335
+rect 535 301 569 335
+rect 699 449 733 483
+rect 898 449 932 483
+rect 795 369 829 403
+rect 1377 597 1411 631
+rect 1206 523 1240 557
+rect 1226 369 1260 403
+rect 1018 301 1052 335
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+rect 459 27 493 51
+rect 459 17 493 27
+rect 595 27 629 51
+rect 595 17 629 27
+rect 731 27 765 51
+rect 731 17 765 27
+rect 867 27 901 51
+rect 867 17 901 27
+rect 1003 27 1037 51
+rect 1003 17 1037 27
+rect 1139 27 1173 51
+rect 1139 17 1173 27
+rect 1275 27 1309 51
+rect 1275 17 1309 27
+<< metal1 >>
+rect 0 1093 1452 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 459 1093
+rect 493 1059 595 1093
+rect 629 1059 731 1093
+rect 765 1059 867 1093
+rect 901 1059 1003 1093
+rect 1037 1059 1139 1093
+rect 1173 1059 1275 1093
+rect 1309 1059 1452 1093
+rect 0 1049 1452 1059
+rect 1365 631 1423 637
+rect 1343 597 1377 631
+rect 1411 597 1423 631
+rect 1365 591 1423 597
+rect 1194 557 1252 563
+rect 1172 523 1206 557
+rect 1240 523 1252 557
+rect 1194 517 1252 523
+rect 241 483 299 489
+rect 687 483 745 489
+rect 886 483 944 489
+rect 241 449 253 483
+rect 287 449 699 483
+rect 733 449 898 483
+rect 932 449 944 483
+rect 241 443 299 449
+rect 687 443 745 449
+rect 886 443 944 449
+rect 169 409 227 415
+rect 169 375 181 409
+rect 215 375 249 409
+rect 783 403 841 409
+rect 1214 403 1272 409
+rect 169 369 227 375
+rect 783 369 795 403
+rect 829 369 1226 403
+rect 1260 369 1272 403
+rect 783 363 841 369
+rect 1214 363 1272 369
+rect 28 335 86 341
+rect 437 335 495 341
+rect 28 301 40 335
+rect 74 301 449 335
+rect 483 301 495 335
+rect 28 295 86 301
+rect 437 295 495 301
+rect 523 335 581 341
+rect 1006 335 1064 341
+rect 523 301 535 335
+rect 569 301 1018 335
+rect 1052 301 1064 335
+rect 523 295 581 301
+rect 1006 295 1064 301
+rect 0 51 1452 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 459 51
+rect 493 17 595 51
+rect 629 17 731 51
+rect 765 17 867 51
+rect 901 17 1003 51
+rect 1037 17 1139 51
+rect 1173 17 1275 51
+rect 1309 17 1452 51
+rect 0 0 1452 17
+<< labels >>
+rlabel viali 198 392 198 392 1 D
+port 1 n
+rlabel viali 1394 614 1394 614 1 Q
+port 2 n
+rlabel viali 1224 540 1224 540 1 QN
+port 3 n
+rlabel viali 915 466 915 466 1 CK
+port 4 n
+rlabel viali 68 45 68 45 1 gnd
+rlabel viali 68 1067 68 1067 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__dffr_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__dffr_1.mag
new file mode 100644
index 0000000..8f4b908
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__dffr_1.mag
@@ -0,0 +1,808 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007752
+<< checkpaint >>
+rect -1270 -242 3177 2379
+<< nwell >>
+rect -10 529 1917 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 270 115 300 219
+rect 356 115 386 219
+rect 546 115 576 263
+rect 618 115 648 263
+rect 738 115 768 263
+rect 810 115 840 263
+rect 896 115 926 263
+rect 968 115 998 263
+rect 1088 115 1118 263
+rect 1160 115 1190 263
+rect 1246 115 1276 263
+rect 1436 115 1466 219
+rect 1522 115 1552 219
+rect 1712 115 1742 263
+rect 1798 115 1828 263
+<< pmos >>
+rect 80 565 110 965
+rect 270 713 300 965
+rect 342 713 372 965
+rect 546 565 576 965
+rect 618 565 648 965
+rect 738 565 768 965
+rect 810 565 840 965
+rect 896 565 926 965
+rect 968 565 998 965
+rect 1088 565 1118 965
+rect 1160 565 1190 965
+rect 1246 565 1276 965
+rect 1436 713 1466 965
+rect 1508 713 1538 965
+rect 1712 565 1742 965
+rect 1798 565 1828 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 163 263
+rect 110 131 121 215
+rect 155 131 163 215
+rect 110 115 163 131
+rect 217 165 270 219
+rect 217 131 225 165
+rect 259 131 270 165
+rect 217 115 270 131
+rect 300 165 356 219
+rect 300 131 311 165
+rect 345 131 356 165
+rect 300 115 356 131
+rect 386 165 439 219
+rect 386 131 397 165
+rect 431 131 439 165
+rect 386 115 439 131
+rect 493 215 546 263
+rect 493 131 501 215
+rect 535 131 546 215
+rect 493 115 546 131
+rect 576 115 618 263
+rect 648 215 738 263
+rect 648 131 659 215
+rect 727 131 738 215
+rect 648 115 738 131
+rect 768 115 810 263
+rect 840 165 896 263
+rect 840 131 851 165
+rect 885 131 896 165
+rect 840 115 896 131
+rect 926 115 968 263
+rect 998 215 1088 263
+rect 998 131 1009 215
+rect 1077 131 1088 215
+rect 998 115 1088 131
+rect 1118 115 1160 263
+rect 1190 215 1246 263
+rect 1190 131 1201 215
+rect 1235 131 1246 215
+rect 1190 115 1246 131
+rect 1276 215 1329 263
+rect 1276 131 1287 215
+rect 1321 131 1329 215
+rect 1276 115 1329 131
+rect 1383 165 1436 219
+rect 1383 131 1391 165
+rect 1425 131 1436 165
+rect 1383 115 1436 131
+rect 1466 165 1522 219
+rect 1466 131 1477 165
+rect 1511 131 1522 165
+rect 1466 115 1522 131
+rect 1552 165 1605 219
+rect 1552 131 1563 165
+rect 1597 131 1605 165
+rect 1552 115 1605 131
+rect 1659 165 1712 263
+rect 1659 131 1667 165
+rect 1701 131 1712 165
+rect 1659 115 1712 131
+rect 1742 165 1798 263
+rect 1742 131 1753 165
+rect 1787 131 1798 165
+rect 1742 115 1798 131
+rect 1828 165 1881 263
+rect 1828 131 1839 165
+rect 1873 131 1881 165
+rect 1828 115 1881 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 741 35 949
+rect 69 741 80 949
+rect 27 565 80 741
+rect 110 949 163 965
+rect 110 605 121 949
+rect 155 605 163 949
+rect 217 949 270 965
+rect 217 809 225 949
+rect 259 809 270 949
+rect 217 713 270 809
+rect 300 713 342 965
+rect 372 949 425 965
+rect 372 809 383 949
+rect 417 809 425 949
+rect 372 713 425 809
+rect 493 949 546 965
+rect 110 565 163 605
+rect 493 673 501 949
+rect 535 673 546 949
+rect 493 565 546 673
+rect 576 565 618 965
+rect 648 949 738 965
+rect 648 605 659 949
+rect 727 605 738 949
+rect 648 565 738 605
+rect 768 565 810 965
+rect 840 949 896 965
+rect 840 673 851 949
+rect 885 673 896 949
+rect 840 565 896 673
+rect 926 565 968 965
+rect 998 949 1088 965
+rect 998 673 1009 949
+rect 1077 673 1088 949
+rect 998 565 1088 673
+rect 1118 565 1160 965
+rect 1190 949 1246 965
+rect 1190 605 1201 949
+rect 1235 605 1246 949
+rect 1190 565 1246 605
+rect 1276 949 1329 965
+rect 1276 605 1287 949
+rect 1321 605 1329 949
+rect 1383 949 1436 965
+rect 1383 809 1391 949
+rect 1425 809 1436 949
+rect 1383 713 1436 809
+rect 1466 713 1508 965
+rect 1538 949 1591 965
+rect 1538 809 1549 949
+rect 1583 809 1591 949
+rect 1538 713 1591 809
+rect 1659 949 1712 965
+rect 1659 809 1667 949
+rect 1701 809 1712 949
+rect 1276 565 1329 605
+rect 1659 565 1712 809
+rect 1742 949 1798 965
+rect 1742 809 1753 949
+rect 1787 809 1798 949
+rect 1742 565 1798 809
+rect 1828 949 1881 965
+rect 1828 809 1839 949
+rect 1873 809 1881 949
+rect 1828 565 1881 809
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 225 131 259 165
+rect 311 131 345 165
+rect 397 131 431 165
+rect 501 131 535 215
+rect 659 131 727 215
+rect 851 131 885 165
+rect 1009 131 1077 215
+rect 1201 131 1235 215
+rect 1287 131 1321 215
+rect 1391 131 1425 165
+rect 1477 131 1511 165
+rect 1563 131 1597 165
+rect 1667 131 1701 165
+rect 1753 131 1787 165
+rect 1839 131 1873 165
+<< pdiffc >>
+rect 35 741 69 949
+rect 121 605 155 949
+rect 225 809 259 949
+rect 383 809 417 949
+rect 501 673 535 949
+rect 659 605 727 949
+rect 851 673 885 949
+rect 1009 673 1077 949
+rect 1201 605 1235 949
+rect 1287 605 1321 949
+rect 1391 809 1425 949
+rect 1549 809 1583 949
+rect 1667 809 1701 949
+rect 1753 809 1787 949
+rect 1839 809 1873 949
+<< psubdiff >>
+rect 26 27 50 61
+rect 84 27 108 61
+rect 162 27 186 61
+rect 220 27 244 61
+rect 298 27 322 61
+rect 356 27 380 61
+rect 434 27 458 61
+rect 492 27 516 61
+rect 570 27 594 61
+rect 628 27 652 61
+rect 706 27 730 61
+rect 764 27 788 61
+rect 842 27 866 61
+rect 900 27 924 61
+rect 978 27 1002 61
+rect 1036 27 1060 61
+rect 1114 27 1138 61
+rect 1172 27 1196 61
+rect 1250 27 1274 61
+rect 1308 27 1332 61
+rect 1386 27 1410 61
+rect 1444 27 1468 61
+rect 1522 27 1546 61
+rect 1580 27 1604 61
+rect 1658 27 1682 61
+rect 1716 27 1740 61
+rect 1794 27 1818 61
+rect 1852 27 1876 61
+<< nsubdiff >>
+rect 26 1049 50 1083
+rect 84 1049 108 1083
+rect 162 1049 186 1083
+rect 220 1049 244 1083
+rect 298 1049 322 1083
+rect 356 1049 380 1083
+rect 434 1049 458 1083
+rect 492 1049 516 1083
+rect 570 1049 594 1083
+rect 628 1049 652 1083
+rect 706 1049 730 1083
+rect 764 1049 788 1083
+rect 842 1049 866 1083
+rect 900 1049 924 1083
+rect 978 1049 1002 1083
+rect 1036 1049 1060 1083
+rect 1114 1049 1138 1083
+rect 1172 1049 1196 1083
+rect 1250 1049 1274 1083
+rect 1308 1049 1332 1083
+rect 1386 1049 1410 1083
+rect 1444 1049 1468 1083
+rect 1522 1049 1546 1083
+rect 1580 1049 1604 1083
+rect 1658 1049 1682 1083
+rect 1716 1049 1740 1083
+rect 1794 1049 1818 1083
+rect 1852 1049 1876 1083
+<< psubdiffcont >>
+rect 50 27 84 61
+rect 186 27 220 61
+rect 322 27 356 61
+rect 458 27 492 61
+rect 594 27 628 61
+rect 730 27 764 61
+rect 866 27 900 61
+rect 1002 27 1036 61
+rect 1138 27 1172 61
+rect 1274 27 1308 61
+rect 1410 27 1444 61
+rect 1546 27 1580 61
+rect 1682 27 1716 61
+rect 1818 27 1852 61
+<< nsubdiffcont >>
+rect 50 1049 84 1083
+rect 186 1049 220 1083
+rect 322 1049 356 1083
+rect 458 1049 492 1083
+rect 594 1049 628 1083
+rect 730 1049 764 1083
+rect 866 1049 900 1083
+rect 1002 1049 1036 1083
+rect 1138 1049 1172 1083
+rect 1274 1049 1308 1083
+rect 1410 1049 1444 1083
+rect 1546 1049 1580 1083
+rect 1682 1049 1716 1083
+rect 1818 1049 1852 1083
+<< poly >>
+rect 80 965 110 991
+rect 270 965 300 991
+rect 342 965 372 991
+rect 546 965 576 991
+rect 618 965 648 991
+rect 738 965 768 991
+rect 810 965 840 991
+rect 896 965 926 991
+rect 968 965 998 991
+rect 1088 965 1118 991
+rect 1160 965 1190 991
+rect 1246 965 1276 991
+rect 1436 965 1466 991
+rect 1508 965 1538 991
+rect 1712 965 1742 991
+rect 1798 965 1828 991
+rect 80 442 110 565
+rect 79 426 133 442
+rect 79 392 89 426
+rect 123 392 133 426
+rect 79 376 133 392
+rect 79 375 110 376
+rect 80 263 110 375
+rect 270 307 300 713
+rect 342 532 372 713
+rect 342 516 415 532
+rect 342 482 371 516
+rect 405 482 415 516
+rect 342 466 415 482
+rect 219 291 300 307
+rect 219 257 229 291
+rect 263 257 300 291
+rect 219 241 300 257
+rect 270 219 300 241
+rect 356 219 386 466
+rect 546 425 576 565
+rect 618 534 648 565
+rect 618 518 672 534
+rect 618 484 628 518
+rect 662 484 672 518
+rect 618 468 672 484
+rect 546 409 600 425
+rect 738 423 768 565
+rect 810 528 840 565
+rect 896 528 926 565
+rect 810 518 926 528
+rect 810 484 842 518
+rect 876 484 926 518
+rect 810 474 926 484
+rect 968 423 998 565
+rect 1088 534 1118 565
+rect 1064 518 1118 534
+rect 1064 484 1074 518
+rect 1108 484 1118 518
+rect 1064 468 1118 484
+rect 546 375 556 409
+rect 590 375 600 409
+rect 546 359 600 375
+rect 642 393 1094 423
+rect 546 263 576 359
+rect 642 315 672 393
+rect 1064 351 1094 393
+rect 1160 419 1190 565
+rect 1246 534 1276 565
+rect 1246 518 1317 534
+rect 1246 504 1273 518
+rect 1257 484 1273 504
+rect 1307 484 1317 518
+rect 1257 468 1317 484
+rect 1160 403 1214 419
+rect 1160 369 1170 403
+rect 1204 369 1214 403
+rect 1160 353 1214 369
+rect 618 285 672 315
+rect 714 335 768 351
+rect 714 301 724 335
+rect 758 301 768 335
+rect 714 285 768 301
+rect 618 263 648 285
+rect 738 263 768 285
+rect 810 335 926 345
+rect 810 301 842 335
+rect 876 301 926 335
+rect 810 291 926 301
+rect 810 263 840 291
+rect 896 263 926 291
+rect 968 335 1022 351
+rect 968 301 978 335
+rect 1012 301 1022 335
+rect 968 285 1022 301
+rect 1064 335 1118 351
+rect 1064 301 1074 335
+rect 1108 301 1118 335
+rect 1064 285 1118 301
+rect 968 263 998 285
+rect 1088 263 1118 285
+rect 1160 263 1190 353
+rect 1257 315 1287 468
+rect 1436 351 1466 713
+rect 1246 285 1287 315
+rect 1399 335 1466 351
+rect 1399 301 1409 335
+rect 1443 301 1466 335
+rect 1399 285 1466 301
+rect 1246 263 1276 285
+rect 1423 284 1466 285
+rect 1436 219 1466 284
+rect 1508 307 1538 713
+rect 1712 549 1742 565
+rect 1702 519 1742 549
+rect 1702 419 1732 519
+rect 1798 460 1828 565
+rect 1677 403 1732 419
+rect 1677 369 1687 403
+rect 1721 369 1732 403
+rect 1774 444 1828 460
+rect 1774 410 1784 444
+rect 1818 410 1828 444
+rect 1774 394 1828 410
+rect 1677 353 1732 369
+rect 1702 308 1732 353
+rect 1508 291 1589 307
+rect 1508 257 1545 291
+rect 1579 257 1589 291
+rect 1702 278 1742 308
+rect 1712 263 1742 278
+rect 1798 263 1828 394
+rect 1508 241 1589 257
+rect 1522 219 1552 241
+rect 80 89 110 115
+rect 270 89 300 115
+rect 356 89 386 115
+rect 546 89 576 115
+rect 618 89 648 115
+rect 738 89 768 115
+rect 810 89 840 115
+rect 896 89 926 115
+rect 968 89 998 115
+rect 1088 89 1118 115
+rect 1160 89 1190 115
+rect 1246 89 1276 115
+rect 1436 89 1466 115
+rect 1522 89 1552 115
+rect 1712 89 1742 115
+rect 1798 89 1828 115
+<< polycont >>
+rect 89 392 123 426
+rect 371 482 405 516
+rect 229 257 263 291
+rect 628 484 662 518
+rect 842 484 876 518
+rect 1074 484 1108 518
+rect 556 375 590 409
+rect 1273 484 1307 518
+rect 1170 369 1204 403
+rect 724 301 758 335
+rect 842 301 876 335
+rect 978 301 1012 335
+rect 1074 301 1108 335
+rect 1409 301 1443 335
+rect 1687 369 1721 403
+rect 1784 410 1818 444
+rect 1545 257 1579 291
+<< locali >>
+rect 0 1093 1914 1110
+rect 0 1049 50 1093
+rect 84 1049 186 1093
+rect 220 1049 322 1093
+rect 356 1049 458 1093
+rect 492 1049 594 1093
+rect 628 1049 730 1093
+rect 764 1049 866 1093
+rect 900 1049 1002 1093
+rect 1036 1049 1138 1093
+rect 1172 1049 1274 1093
+rect 1308 1049 1410 1093
+rect 1444 1049 1546 1093
+rect 1580 1049 1682 1093
+rect 1716 1049 1818 1093
+rect 1852 1049 1914 1093
+rect 35 949 69 1049
+rect 35 725 69 741
+rect 121 949 155 965
+rect 47 442 81 597
+rect 121 513 155 605
+rect 225 949 259 965
+rect 121 479 191 513
+rect 47 426 123 442
+rect 47 392 89 426
+rect 89 376 123 392
+rect 157 291 191 479
+rect 225 375 259 809
+rect 383 949 417 1049
+rect 383 793 417 809
+rect 501 949 535 1049
+rect 501 657 535 673
+rect 659 949 727 965
+rect 851 949 885 1049
+rect 851 657 885 673
+rect 1009 949 1077 965
+rect 659 602 727 605
+rect 1009 602 1077 673
+rect 405 568 727 602
+rect 910 568 1077 602
+rect 1201 949 1235 1049
+rect 1201 589 1235 605
+rect 1287 949 1321 965
+rect 1391 949 1425 965
+rect 1391 721 1425 809
+rect 1549 949 1583 1049
+rect 1549 793 1583 809
+rect 1667 949 1701 965
+rect 1391 687 1511 721
+rect 1287 602 1321 605
+rect 1287 568 1377 602
+rect 405 532 439 568
+rect 371 516 439 532
+rect 405 482 439 516
+rect 371 466 439 482
+rect 225 341 345 375
+rect 311 335 345 341
+rect 229 291 263 307
+rect 121 257 229 291
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 257
+rect 121 115 155 131
+rect 225 165 259 181
+rect 225 61 259 131
+rect 311 165 345 301
+rect 405 318 439 466
+rect 628 518 662 534
+rect 628 483 662 484
+rect 842 518 876 534
+rect 662 449 758 483
+rect 556 409 590 425
+rect 556 359 590 375
+rect 724 335 758 449
+rect 842 335 876 484
+rect 405 284 690 318
+rect 724 285 758 301
+rect 842 285 876 301
+rect 910 335 944 568
+rect 1074 518 1108 534
+rect 1074 483 1108 484
+rect 656 231 690 284
+rect 910 251 944 301
+rect 978 449 1074 483
+rect 1273 518 1307 534
+rect 1273 483 1307 484
+rect 978 335 1012 449
+rect 1341 403 1377 568
+rect 1154 369 1170 403
+rect 1204 369 1220 403
+rect 1287 369 1377 403
+rect 1477 403 1511 687
+rect 1667 557 1701 809
+rect 1753 949 1787 1049
+rect 1753 793 1787 809
+rect 1839 949 1873 965
+rect 1839 631 1873 809
+rect 1872 614 1873 631
+rect 1872 597 1896 614
+rect 1839 580 1896 597
+rect 1667 518 1701 523
+rect 1667 484 1818 518
+rect 1784 444 1818 484
+rect 1477 369 1687 403
+rect 1721 369 1737 403
+rect 1287 335 1321 369
+rect 1058 301 1074 335
+rect 1108 301 1321 335
+rect 978 285 1012 301
+rect 501 215 535 231
+rect 311 115 345 131
+rect 397 165 431 181
+rect 397 61 431 131
+rect 656 215 727 231
+rect 910 217 1077 251
+rect 656 197 659 215
+rect 501 61 535 131
+rect 1009 215 1077 217
+rect 659 115 727 131
+rect 851 165 885 181
+rect 851 61 885 131
+rect 1009 115 1077 131
+rect 1201 215 1235 231
+rect 1201 61 1235 131
+rect 1287 215 1321 301
+rect 1409 335 1443 351
+rect 1409 285 1443 301
+rect 1287 115 1321 131
+rect 1391 165 1425 181
+rect 1391 61 1425 131
+rect 1477 165 1511 369
+rect 1784 335 1818 410
+rect 1545 291 1579 307
+rect 1667 301 1818 335
+rect 1477 115 1511 131
+rect 1563 165 1597 181
+rect 1563 61 1597 131
+rect 1667 165 1701 301
+rect 1862 268 1896 580
+rect 1839 234 1896 268
+rect 1667 115 1701 131
+rect 1753 165 1787 181
+rect 1753 61 1787 131
+rect 1839 165 1873 234
+rect 1839 115 1873 131
+rect 0 17 50 61
+rect 84 17 186 61
+rect 220 17 322 61
+rect 356 17 458 61
+rect 492 17 594 61
+rect 628 17 730 61
+rect 764 17 866 61
+rect 900 17 1002 61
+rect 1036 17 1138 61
+rect 1172 17 1274 61
+rect 1308 17 1410 61
+rect 1444 17 1546 61
+rect 1580 17 1682 61
+rect 1716 17 1818 61
+rect 1852 17 1914 61
+rect 0 0 1914 17
+<< viali >>
+rect 50 1083 84 1093
+rect 50 1059 84 1083
+rect 186 1083 220 1093
+rect 186 1059 220 1083
+rect 322 1083 356 1093
+rect 322 1059 356 1083
+rect 458 1083 492 1093
+rect 458 1059 492 1083
+rect 594 1083 628 1093
+rect 594 1059 628 1083
+rect 730 1083 764 1093
+rect 730 1059 764 1083
+rect 866 1083 900 1093
+rect 866 1059 900 1083
+rect 1002 1083 1036 1093
+rect 1002 1059 1036 1083
+rect 1138 1083 1172 1093
+rect 1138 1059 1172 1083
+rect 1274 1083 1308 1093
+rect 1274 1059 1308 1083
+rect 1410 1083 1444 1093
+rect 1410 1059 1444 1083
+rect 1546 1083 1580 1093
+rect 1546 1059 1580 1083
+rect 1682 1083 1716 1093
+rect 1682 1059 1716 1083
+rect 1818 1083 1852 1093
+rect 1818 1059 1852 1083
+rect 47 597 81 631
+rect 229 257 263 261
+rect 229 227 263 257
+rect 311 301 345 335
+rect 628 449 662 483
+rect 556 375 590 409
+rect 824 301 842 335
+rect 842 301 858 335
+rect 910 301 944 335
+rect 1074 449 1108 483
+rect 1273 449 1307 483
+rect 1170 369 1204 403
+rect 1838 597 1872 631
+rect 1667 523 1701 557
+rect 1687 369 1721 403
+rect 1409 301 1443 335
+rect 1545 257 1579 261
+rect 1545 227 1579 257
+rect 50 27 84 51
+rect 50 17 84 27
+rect 186 27 220 51
+rect 186 17 220 27
+rect 322 27 356 51
+rect 322 17 356 27
+rect 458 27 492 51
+rect 458 17 492 27
+rect 594 27 628 51
+rect 594 17 628 27
+rect 730 27 764 51
+rect 730 17 764 27
+rect 866 27 900 51
+rect 866 17 900 27
+rect 1002 27 1036 51
+rect 1002 17 1036 27
+rect 1138 27 1172 51
+rect 1138 17 1172 27
+rect 1274 27 1308 51
+rect 1274 17 1308 27
+rect 1410 27 1444 51
+rect 1410 17 1444 27
+rect 1546 27 1580 51
+rect 1546 17 1580 27
+rect 1682 27 1716 51
+rect 1682 17 1716 27
+rect 1818 27 1852 51
+rect 1818 17 1852 27
+<< metal1 >>
+rect 0 1093 1914 1110
+rect 0 1059 50 1093
+rect 84 1059 186 1093
+rect 220 1059 322 1093
+rect 356 1059 458 1093
+rect 492 1059 594 1093
+rect 628 1059 730 1093
+rect 764 1059 866 1093
+rect 900 1059 1002 1093
+rect 1036 1059 1138 1093
+rect 1172 1059 1274 1093
+rect 1308 1059 1410 1093
+rect 1444 1059 1546 1093
+rect 1580 1059 1682 1093
+rect 1716 1059 1818 1093
+rect 1852 1059 1914 1093
+rect 0 1049 1914 1059
+rect 35 631 93 637
+rect 1826 631 1884 637
+rect 35 597 47 631
+rect 81 597 127 631
+rect 1804 597 1838 631
+rect 1872 597 1884 631
+rect 35 591 93 597
+rect 1826 591 1884 597
+rect 1655 557 1713 563
+rect 1632 523 1667 557
+rect 1701 523 1713 557
+rect 1655 517 1713 523
+rect 616 483 674 489
+rect 1062 483 1120 489
+rect 1261 483 1319 489
+rect 616 449 628 483
+rect 662 449 1074 483
+rect 1108 449 1273 483
+rect 1307 449 1319 483
+rect 616 443 674 449
+rect 1062 443 1120 449
+rect 1261 443 1319 449
+rect 544 409 602 415
+rect 544 375 556 409
+rect 590 375 624 409
+rect 1158 403 1216 409
+rect 1675 403 1733 409
+rect 544 369 602 375
+rect 1158 369 1170 403
+rect 1204 369 1687 403
+rect 1721 369 1733 403
+rect 1158 363 1216 369
+rect 1675 363 1733 369
+rect 299 335 357 341
+rect 812 335 870 341
+rect 299 301 311 335
+rect 345 301 824 335
+rect 858 301 870 335
+rect 299 295 357 301
+rect 812 295 870 301
+rect 898 335 956 341
+rect 1397 335 1455 341
+rect 898 301 910 335
+rect 944 301 1409 335
+rect 1443 301 1455 335
+rect 898 295 956 301
+rect 1397 295 1455 301
+rect 217 261 275 267
+rect 1533 261 1591 267
+rect 217 227 229 261
+rect 263 227 1545 261
+rect 1579 227 1591 261
+rect 217 221 275 227
+rect 1533 221 1591 227
+rect 0 51 1914 61
+rect 0 17 50 51
+rect 84 17 186 51
+rect 220 17 322 51
+rect 356 17 458 51
+rect 492 17 594 51
+rect 628 17 730 51
+rect 764 17 866 51
+rect 900 17 1002 51
+rect 1036 17 1138 51
+rect 1172 17 1274 51
+rect 1308 17 1410 51
+rect 1444 17 1546 51
+rect 1580 17 1682 51
+rect 1716 17 1818 51
+rect 1852 17 1914 51
+rect 0 0 1914 17
+<< labels >>
+rlabel viali 65 614 65 614 1 RN
+port 1 n
+rlabel viali 573 392 573 392 1 D
+port 2 n
+rlabel viali 1290 466 1290 466 1 CK
+port 3 n
+rlabel viali 1855 614 1855 614 1 Q
+port 4 n
+rlabel viali 1685 540 1685 540 1 QN
+port 5 n
+rlabel viali 67 44 67 44 1 gnd
+rlabel viali 67 1066 67 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__dffr_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__dffr_l.mag
new file mode 100644
index 0000000..d88c5d6
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__dffr_l.mag
@@ -0,0 +1,808 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007752
+<< checkpaint >>
+rect -1270 -242 3177 2379
+<< nwell >>
+rect -10 529 1917 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 270 115 300 219
+rect 356 115 386 219
+rect 546 115 576 263
+rect 618 115 648 263
+rect 738 115 768 263
+rect 810 115 840 263
+rect 896 115 926 263
+rect 968 115 998 263
+rect 1088 115 1118 263
+rect 1160 115 1190 263
+rect 1246 115 1276 263
+rect 1436 115 1466 219
+rect 1522 115 1552 219
+rect 1712 115 1742 219
+rect 1798 115 1828 219
+<< pmos >>
+rect 80 565 110 965
+rect 270 713 300 965
+rect 342 713 372 965
+rect 546 565 576 965
+rect 618 565 648 965
+rect 738 565 768 965
+rect 810 565 840 965
+rect 896 565 926 965
+rect 968 565 998 965
+rect 1088 565 1118 965
+rect 1160 565 1190 965
+rect 1246 565 1276 965
+rect 1436 713 1466 965
+rect 1508 713 1538 965
+rect 1712 713 1742 965
+rect 1798 713 1828 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 163 263
+rect 110 131 121 215
+rect 155 131 163 215
+rect 110 115 163 131
+rect 217 165 270 219
+rect 217 131 225 165
+rect 259 131 270 165
+rect 217 115 270 131
+rect 300 165 356 219
+rect 300 131 311 165
+rect 345 131 356 165
+rect 300 115 356 131
+rect 386 165 439 219
+rect 386 131 397 165
+rect 431 131 439 165
+rect 386 115 439 131
+rect 493 215 546 263
+rect 493 131 501 215
+rect 535 131 546 215
+rect 493 115 546 131
+rect 576 115 618 263
+rect 648 215 738 263
+rect 648 131 659 215
+rect 727 131 738 215
+rect 648 115 738 131
+rect 768 115 810 263
+rect 840 165 896 263
+rect 840 131 851 165
+rect 885 131 896 165
+rect 840 115 896 131
+rect 926 115 968 263
+rect 998 215 1088 263
+rect 998 131 1009 215
+rect 1077 131 1088 215
+rect 998 115 1088 131
+rect 1118 115 1160 263
+rect 1190 215 1246 263
+rect 1190 131 1201 215
+rect 1235 131 1246 215
+rect 1190 115 1246 131
+rect 1276 215 1329 263
+rect 1276 131 1287 215
+rect 1321 131 1329 215
+rect 1276 115 1329 131
+rect 1383 165 1436 219
+rect 1383 131 1391 165
+rect 1425 131 1436 165
+rect 1383 115 1436 131
+rect 1466 165 1522 219
+rect 1466 131 1477 165
+rect 1511 131 1522 165
+rect 1466 115 1522 131
+rect 1552 165 1605 219
+rect 1552 131 1563 165
+rect 1597 131 1605 165
+rect 1552 115 1605 131
+rect 1659 165 1712 219
+rect 1659 131 1667 165
+rect 1701 131 1712 165
+rect 1659 115 1712 131
+rect 1742 165 1798 219
+rect 1742 131 1753 165
+rect 1787 131 1798 165
+rect 1742 115 1798 131
+rect 1828 165 1881 219
+rect 1828 131 1839 165
+rect 1873 131 1881 165
+rect 1828 115 1881 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 741 35 949
+rect 69 741 80 949
+rect 27 565 80 741
+rect 110 949 163 965
+rect 110 605 121 949
+rect 155 605 163 949
+rect 217 949 270 965
+rect 217 809 225 949
+rect 259 809 270 949
+rect 217 713 270 809
+rect 300 713 342 965
+rect 372 949 425 965
+rect 372 809 383 949
+rect 417 809 425 949
+rect 372 713 425 809
+rect 493 949 546 965
+rect 110 565 163 605
+rect 493 673 501 949
+rect 535 673 546 949
+rect 493 565 546 673
+rect 576 565 618 965
+rect 648 949 738 965
+rect 648 605 659 949
+rect 727 605 738 949
+rect 648 565 738 605
+rect 768 565 810 965
+rect 840 949 896 965
+rect 840 673 851 949
+rect 885 673 896 949
+rect 840 565 896 673
+rect 926 565 968 965
+rect 998 949 1088 965
+rect 998 673 1009 949
+rect 1077 673 1088 949
+rect 998 565 1088 673
+rect 1118 565 1160 965
+rect 1190 949 1246 965
+rect 1190 605 1201 949
+rect 1235 605 1246 949
+rect 1190 565 1246 605
+rect 1276 949 1329 965
+rect 1276 605 1287 949
+rect 1321 605 1329 949
+rect 1383 949 1436 965
+rect 1383 809 1391 949
+rect 1425 809 1436 949
+rect 1383 713 1436 809
+rect 1466 713 1508 965
+rect 1538 949 1591 965
+rect 1538 809 1549 949
+rect 1583 809 1591 949
+rect 1538 713 1591 809
+rect 1659 949 1712 965
+rect 1659 809 1667 949
+rect 1701 809 1712 949
+rect 1659 713 1712 809
+rect 1742 949 1798 965
+rect 1742 809 1753 949
+rect 1787 809 1798 949
+rect 1742 713 1798 809
+rect 1828 949 1881 965
+rect 1828 809 1839 949
+rect 1873 809 1881 949
+rect 1828 713 1881 809
+rect 1276 565 1329 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 225 131 259 165
+rect 311 131 345 165
+rect 397 131 431 165
+rect 501 131 535 215
+rect 659 131 727 215
+rect 851 131 885 165
+rect 1009 131 1077 215
+rect 1201 131 1235 215
+rect 1287 131 1321 215
+rect 1391 131 1425 165
+rect 1477 131 1511 165
+rect 1563 131 1597 165
+rect 1667 131 1701 165
+rect 1753 131 1787 165
+rect 1839 131 1873 165
+<< pdiffc >>
+rect 35 741 69 949
+rect 121 605 155 949
+rect 225 809 259 949
+rect 383 809 417 949
+rect 501 673 535 949
+rect 659 605 727 949
+rect 851 673 885 949
+rect 1009 673 1077 949
+rect 1201 605 1235 949
+rect 1287 605 1321 949
+rect 1391 809 1425 949
+rect 1549 809 1583 949
+rect 1667 809 1701 949
+rect 1753 809 1787 949
+rect 1839 809 1873 949
+<< psubdiff >>
+rect 26 27 50 61
+rect 84 27 108 61
+rect 162 27 186 61
+rect 220 27 244 61
+rect 298 27 322 61
+rect 356 27 380 61
+rect 434 27 458 61
+rect 492 27 516 61
+rect 570 27 594 61
+rect 628 27 652 61
+rect 706 27 730 61
+rect 764 27 788 61
+rect 842 27 866 61
+rect 900 27 924 61
+rect 978 27 1002 61
+rect 1036 27 1060 61
+rect 1114 27 1138 61
+rect 1172 27 1196 61
+rect 1250 27 1274 61
+rect 1308 27 1332 61
+rect 1386 27 1410 61
+rect 1444 27 1468 61
+rect 1522 27 1546 61
+rect 1580 27 1604 61
+rect 1658 27 1682 61
+rect 1716 27 1740 61
+rect 1794 27 1818 61
+rect 1852 27 1876 61
+<< nsubdiff >>
+rect 26 1049 50 1083
+rect 84 1049 108 1083
+rect 162 1049 186 1083
+rect 220 1049 244 1083
+rect 298 1049 322 1083
+rect 356 1049 380 1083
+rect 434 1049 458 1083
+rect 492 1049 516 1083
+rect 570 1049 594 1083
+rect 628 1049 652 1083
+rect 706 1049 730 1083
+rect 764 1049 788 1083
+rect 842 1049 866 1083
+rect 900 1049 924 1083
+rect 978 1049 1002 1083
+rect 1036 1049 1060 1083
+rect 1114 1049 1138 1083
+rect 1172 1049 1196 1083
+rect 1250 1049 1274 1083
+rect 1308 1049 1332 1083
+rect 1386 1049 1410 1083
+rect 1444 1049 1468 1083
+rect 1522 1049 1546 1083
+rect 1580 1049 1604 1083
+rect 1658 1049 1682 1083
+rect 1716 1049 1740 1083
+rect 1794 1049 1818 1083
+rect 1852 1049 1876 1083
+<< psubdiffcont >>
+rect 50 27 84 61
+rect 186 27 220 61
+rect 322 27 356 61
+rect 458 27 492 61
+rect 594 27 628 61
+rect 730 27 764 61
+rect 866 27 900 61
+rect 1002 27 1036 61
+rect 1138 27 1172 61
+rect 1274 27 1308 61
+rect 1410 27 1444 61
+rect 1546 27 1580 61
+rect 1682 27 1716 61
+rect 1818 27 1852 61
+<< nsubdiffcont >>
+rect 50 1049 84 1083
+rect 186 1049 220 1083
+rect 322 1049 356 1083
+rect 458 1049 492 1083
+rect 594 1049 628 1083
+rect 730 1049 764 1083
+rect 866 1049 900 1083
+rect 1002 1049 1036 1083
+rect 1138 1049 1172 1083
+rect 1274 1049 1308 1083
+rect 1410 1049 1444 1083
+rect 1546 1049 1580 1083
+rect 1682 1049 1716 1083
+rect 1818 1049 1852 1083
+<< poly >>
+rect 80 965 110 991
+rect 270 965 300 991
+rect 342 965 372 991
+rect 546 965 576 991
+rect 618 965 648 991
+rect 738 965 768 991
+rect 810 965 840 991
+rect 896 965 926 991
+rect 968 965 998 991
+rect 1088 965 1118 991
+rect 1160 965 1190 991
+rect 1246 965 1276 991
+rect 1436 965 1466 991
+rect 1508 965 1538 991
+rect 1712 965 1742 991
+rect 1798 965 1828 991
+rect 80 442 110 565
+rect 79 426 133 442
+rect 79 392 89 426
+rect 123 392 133 426
+rect 79 376 133 392
+rect 79 375 110 376
+rect 80 263 110 375
+rect 270 307 300 713
+rect 342 532 372 713
+rect 342 516 415 532
+rect 342 482 371 516
+rect 405 482 415 516
+rect 342 466 415 482
+rect 219 291 300 307
+rect 219 257 229 291
+rect 263 257 300 291
+rect 219 241 300 257
+rect 270 219 300 241
+rect 356 219 386 466
+rect 546 425 576 565
+rect 618 534 648 565
+rect 618 518 672 534
+rect 618 484 628 518
+rect 662 484 672 518
+rect 618 468 672 484
+rect 546 409 600 425
+rect 738 423 768 565
+rect 810 528 840 565
+rect 896 528 926 565
+rect 810 518 926 528
+rect 810 484 842 518
+rect 876 484 926 518
+rect 810 474 926 484
+rect 968 423 998 565
+rect 1088 534 1118 565
+rect 1064 518 1118 534
+rect 1064 484 1074 518
+rect 1108 484 1118 518
+rect 1064 468 1118 484
+rect 546 375 556 409
+rect 590 375 600 409
+rect 546 359 600 375
+rect 642 393 1094 423
+rect 546 263 576 359
+rect 642 315 672 393
+rect 1064 351 1094 393
+rect 1160 419 1190 565
+rect 1246 534 1276 565
+rect 1246 518 1317 534
+rect 1246 504 1273 518
+rect 1257 484 1273 504
+rect 1307 484 1317 518
+rect 1257 468 1317 484
+rect 1160 403 1214 419
+rect 1160 369 1170 403
+rect 1204 369 1214 403
+rect 1160 353 1214 369
+rect 618 285 672 315
+rect 714 335 768 351
+rect 714 301 724 335
+rect 758 301 768 335
+rect 714 285 768 301
+rect 618 263 648 285
+rect 738 263 768 285
+rect 810 335 926 345
+rect 810 301 842 335
+rect 876 301 926 335
+rect 810 291 926 301
+rect 810 263 840 291
+rect 896 263 926 291
+rect 968 335 1022 351
+rect 968 301 978 335
+rect 1012 301 1022 335
+rect 968 285 1022 301
+rect 1064 335 1118 351
+rect 1064 301 1074 335
+rect 1108 301 1118 335
+rect 1064 285 1118 301
+rect 968 263 998 285
+rect 1088 263 1118 285
+rect 1160 263 1190 353
+rect 1257 315 1287 468
+rect 1436 351 1466 713
+rect 1246 285 1287 315
+rect 1399 335 1466 351
+rect 1399 301 1409 335
+rect 1443 301 1466 335
+rect 1399 285 1466 301
+rect 1246 263 1276 285
+rect 1423 284 1466 285
+rect 1436 219 1466 284
+rect 1508 307 1538 713
+rect 1712 549 1742 713
+rect 1702 519 1742 549
+rect 1702 419 1732 519
+rect 1798 460 1828 713
+rect 1677 403 1732 419
+rect 1677 369 1687 403
+rect 1721 369 1732 403
+rect 1774 444 1828 460
+rect 1774 410 1784 444
+rect 1818 410 1828 444
+rect 1774 394 1828 410
+rect 1677 353 1732 369
+rect 1702 308 1732 353
+rect 1508 291 1589 307
+rect 1508 257 1545 291
+rect 1579 257 1589 291
+rect 1702 278 1742 308
+rect 1508 241 1589 257
+rect 1522 219 1552 241
+rect 1712 219 1742 278
+rect 1798 219 1828 394
+rect 80 89 110 115
+rect 270 89 300 115
+rect 356 89 386 115
+rect 546 89 576 115
+rect 618 89 648 115
+rect 738 89 768 115
+rect 810 89 840 115
+rect 896 89 926 115
+rect 968 89 998 115
+rect 1088 89 1118 115
+rect 1160 89 1190 115
+rect 1246 89 1276 115
+rect 1436 89 1466 115
+rect 1522 89 1552 115
+rect 1712 89 1742 115
+rect 1798 89 1828 115
+<< polycont >>
+rect 89 392 123 426
+rect 371 482 405 516
+rect 229 257 263 291
+rect 628 484 662 518
+rect 842 484 876 518
+rect 1074 484 1108 518
+rect 556 375 590 409
+rect 1273 484 1307 518
+rect 1170 369 1204 403
+rect 724 301 758 335
+rect 842 301 876 335
+rect 978 301 1012 335
+rect 1074 301 1108 335
+rect 1409 301 1443 335
+rect 1687 369 1721 403
+rect 1784 410 1818 444
+rect 1545 257 1579 291
+<< locali >>
+rect 0 1093 1914 1110
+rect 0 1049 50 1093
+rect 84 1049 186 1093
+rect 220 1049 322 1093
+rect 356 1049 458 1093
+rect 492 1049 594 1093
+rect 628 1049 730 1093
+rect 764 1049 866 1093
+rect 900 1049 1002 1093
+rect 1036 1049 1138 1093
+rect 1172 1049 1274 1093
+rect 1308 1049 1410 1093
+rect 1444 1049 1546 1093
+rect 1580 1049 1682 1093
+rect 1716 1049 1818 1093
+rect 1852 1049 1914 1093
+rect 35 949 69 1049
+rect 35 725 69 741
+rect 121 949 155 965
+rect 47 442 81 597
+rect 121 513 155 605
+rect 225 949 259 965
+rect 121 479 191 513
+rect 47 426 123 442
+rect 47 392 89 426
+rect 89 376 123 392
+rect 157 291 191 479
+rect 225 377 259 809
+rect 383 949 417 1049
+rect 383 793 417 809
+rect 501 949 535 1049
+rect 501 657 535 673
+rect 659 949 727 965
+rect 851 949 885 1049
+rect 851 657 885 673
+rect 1009 949 1077 965
+rect 659 602 727 605
+rect 1009 602 1077 673
+rect 405 568 727 602
+rect 910 568 1077 602
+rect 1201 949 1235 1049
+rect 1201 589 1235 605
+rect 1287 949 1321 965
+rect 1391 949 1425 965
+rect 1391 721 1425 809
+rect 1549 949 1583 1049
+rect 1549 793 1583 809
+rect 1667 949 1701 965
+rect 1391 687 1511 721
+rect 1287 602 1321 605
+rect 1287 568 1377 602
+rect 405 532 439 568
+rect 371 516 439 532
+rect 405 482 439 516
+rect 371 466 439 482
+rect 225 343 345 377
+rect 311 335 345 343
+rect 229 291 263 307
+rect 121 257 229 291
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 257
+rect 121 115 155 131
+rect 225 165 259 181
+rect 225 61 259 131
+rect 311 165 345 301
+rect 405 318 439 466
+rect 628 518 662 534
+rect 628 483 662 484
+rect 842 518 876 534
+rect 662 449 758 483
+rect 556 409 590 425
+rect 556 359 590 375
+rect 724 335 758 449
+rect 842 335 876 484
+rect 405 284 690 318
+rect 724 285 758 301
+rect 842 285 876 301
+rect 910 335 944 568
+rect 1074 518 1108 534
+rect 1074 483 1108 484
+rect 656 231 690 284
+rect 910 251 944 301
+rect 978 449 1074 483
+rect 1273 518 1307 534
+rect 1273 483 1307 484
+rect 978 335 1012 449
+rect 1341 403 1377 568
+rect 1154 369 1170 403
+rect 1204 369 1220 403
+rect 1287 369 1377 403
+rect 1477 403 1511 687
+rect 1667 557 1701 809
+rect 1753 949 1787 1049
+rect 1753 793 1787 809
+rect 1839 949 1873 965
+rect 1839 631 1873 809
+rect 1872 614 1873 631
+rect 1872 597 1896 614
+rect 1839 580 1896 597
+rect 1667 518 1701 523
+rect 1667 484 1818 518
+rect 1784 444 1818 484
+rect 1477 369 1687 403
+rect 1721 369 1737 403
+rect 1287 335 1321 369
+rect 1058 301 1074 335
+rect 1108 301 1321 335
+rect 978 285 1012 301
+rect 501 215 535 231
+rect 311 115 345 131
+rect 397 165 431 181
+rect 397 61 431 131
+rect 656 215 727 231
+rect 910 217 1077 251
+rect 656 197 659 215
+rect 501 61 535 131
+rect 1009 215 1077 217
+rect 659 115 727 131
+rect 851 165 885 181
+rect 851 61 885 131
+rect 1009 115 1077 131
+rect 1201 215 1235 231
+rect 1201 61 1235 131
+rect 1287 215 1321 301
+rect 1409 335 1443 351
+rect 1409 285 1443 301
+rect 1287 115 1321 131
+rect 1391 165 1425 181
+rect 1391 61 1425 131
+rect 1477 165 1511 369
+rect 1784 335 1818 410
+rect 1545 291 1579 307
+rect 1667 301 1818 335
+rect 1477 115 1511 131
+rect 1563 165 1597 181
+rect 1563 61 1597 131
+rect 1667 165 1701 301
+rect 1862 268 1896 580
+rect 1839 234 1896 268
+rect 1667 115 1701 131
+rect 1753 165 1787 181
+rect 1753 61 1787 131
+rect 1839 165 1873 234
+rect 1839 115 1873 131
+rect 0 17 50 61
+rect 84 17 186 61
+rect 220 17 322 61
+rect 356 17 458 61
+rect 492 17 594 61
+rect 628 17 730 61
+rect 764 17 866 61
+rect 900 17 1002 61
+rect 1036 17 1138 61
+rect 1172 17 1274 61
+rect 1308 17 1410 61
+rect 1444 17 1546 61
+rect 1580 17 1682 61
+rect 1716 17 1818 61
+rect 1852 17 1914 61
+rect 0 0 1914 17
+<< viali >>
+rect 50 1083 84 1093
+rect 50 1059 84 1083
+rect 186 1083 220 1093
+rect 186 1059 220 1083
+rect 322 1083 356 1093
+rect 322 1059 356 1083
+rect 458 1083 492 1093
+rect 458 1059 492 1083
+rect 594 1083 628 1093
+rect 594 1059 628 1083
+rect 730 1083 764 1093
+rect 730 1059 764 1083
+rect 866 1083 900 1093
+rect 866 1059 900 1083
+rect 1002 1083 1036 1093
+rect 1002 1059 1036 1083
+rect 1138 1083 1172 1093
+rect 1138 1059 1172 1083
+rect 1274 1083 1308 1093
+rect 1274 1059 1308 1083
+rect 1410 1083 1444 1093
+rect 1410 1059 1444 1083
+rect 1546 1083 1580 1093
+rect 1546 1059 1580 1083
+rect 1682 1083 1716 1093
+rect 1682 1059 1716 1083
+rect 1818 1083 1852 1093
+rect 1818 1059 1852 1083
+rect 47 597 81 631
+rect 229 257 263 261
+rect 229 227 263 257
+rect 311 301 345 335
+rect 628 449 662 483
+rect 556 375 590 409
+rect 824 301 842 335
+rect 842 301 858 335
+rect 910 301 944 335
+rect 1074 449 1108 483
+rect 1273 449 1307 483
+rect 1170 369 1204 403
+rect 1838 597 1872 631
+rect 1667 523 1701 557
+rect 1687 369 1721 403
+rect 1409 301 1443 335
+rect 1545 257 1579 261
+rect 1545 227 1579 257
+rect 50 27 84 51
+rect 50 17 84 27
+rect 186 27 220 51
+rect 186 17 220 27
+rect 322 27 356 51
+rect 322 17 356 27
+rect 458 27 492 51
+rect 458 17 492 27
+rect 594 27 628 51
+rect 594 17 628 27
+rect 730 27 764 51
+rect 730 17 764 27
+rect 866 27 900 51
+rect 866 17 900 27
+rect 1002 27 1036 51
+rect 1002 17 1036 27
+rect 1138 27 1172 51
+rect 1138 17 1172 27
+rect 1274 27 1308 51
+rect 1274 17 1308 27
+rect 1410 27 1444 51
+rect 1410 17 1444 27
+rect 1546 27 1580 51
+rect 1546 17 1580 27
+rect 1682 27 1716 51
+rect 1682 17 1716 27
+rect 1818 27 1852 51
+rect 1818 17 1852 27
+<< metal1 >>
+rect 0 1093 1914 1110
+rect 0 1059 50 1093
+rect 84 1059 186 1093
+rect 220 1059 322 1093
+rect 356 1059 458 1093
+rect 492 1059 594 1093
+rect 628 1059 730 1093
+rect 764 1059 866 1093
+rect 900 1059 1002 1093
+rect 1036 1059 1138 1093
+rect 1172 1059 1274 1093
+rect 1308 1059 1410 1093
+rect 1444 1059 1546 1093
+rect 1580 1059 1682 1093
+rect 1716 1059 1818 1093
+rect 1852 1059 1914 1093
+rect 0 1049 1914 1059
+rect 35 631 93 637
+rect 1826 631 1884 637
+rect 35 597 47 631
+rect 81 597 127 631
+rect 1804 597 1838 631
+rect 1872 597 1884 631
+rect 35 591 93 597
+rect 1826 591 1884 597
+rect 1655 557 1713 563
+rect 1632 523 1667 557
+rect 1701 523 1713 557
+rect 1655 517 1713 523
+rect 616 483 674 489
+rect 1062 483 1120 489
+rect 1261 483 1319 489
+rect 616 449 628 483
+rect 662 449 1074 483
+rect 1108 449 1273 483
+rect 1307 449 1319 483
+rect 616 443 674 449
+rect 1062 443 1120 449
+rect 1261 443 1319 449
+rect 544 409 602 415
+rect 544 375 556 409
+rect 590 375 624 409
+rect 1158 403 1216 409
+rect 1675 403 1733 409
+rect 544 369 602 375
+rect 1158 369 1170 403
+rect 1204 369 1687 403
+rect 1721 369 1733 403
+rect 1158 363 1216 369
+rect 1675 363 1733 369
+rect 299 335 357 341
+rect 812 335 870 341
+rect 299 301 311 335
+rect 345 301 824 335
+rect 858 301 870 335
+rect 299 295 357 301
+rect 812 295 870 301
+rect 898 335 956 341
+rect 1397 335 1455 341
+rect 898 301 910 335
+rect 944 301 1409 335
+rect 1443 301 1455 335
+rect 898 295 956 301
+rect 1397 295 1455 301
+rect 217 261 275 267
+rect 1533 261 1591 267
+rect 217 227 229 261
+rect 263 227 1545 261
+rect 1579 227 1591 261
+rect 217 221 275 227
+rect 1533 221 1591 227
+rect 0 51 1914 61
+rect 0 17 50 51
+rect 84 17 186 51
+rect 220 17 322 51
+rect 356 17 458 51
+rect 492 17 594 51
+rect 628 17 730 51
+rect 764 17 866 51
+rect 900 17 1002 51
+rect 1036 17 1138 51
+rect 1172 17 1274 51
+rect 1308 17 1410 51
+rect 1444 17 1546 51
+rect 1580 17 1682 51
+rect 1716 17 1818 51
+rect 1852 17 1914 51
+rect 0 0 1914 17
+<< labels >>
+rlabel viali 65 614 65 614 1 RN
+port 1 n
+rlabel viali 573 392 573 392 1 D
+port 2 n
+rlabel viali 1290 466 1290 466 1 CK
+port 3 n
+rlabel viali 1855 614 1855 614 1 Q
+port 4 n
+rlabel viali 1685 540 1685 540 1 QN
+port 5 n
+rlabel viali 67 44 67 44 1 gnd
+rlabel viali 67 1066 67 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__dffs_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__dffs_1.mag
new file mode 100644
index 0000000..a224e18
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__dffs_1.mag
@@ -0,0 +1,723 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007752
+<< checkpaint >>
+rect -1270 -242 3001 2379
+<< nwell >>
+rect -10 529 1741 1119
+<< nmoslvt >>
+rect 80 115 110 219
+rect 152 115 182 219
+rect 356 115 386 263
+rect 428 115 458 263
+rect 548 115 578 263
+rect 620 115 650 263
+rect 706 115 736 263
+rect 778 115 808 263
+rect 898 115 928 263
+rect 970 115 1000 263
+rect 1056 115 1086 263
+rect 1246 115 1276 219
+rect 1318 115 1348 219
+rect 1522 115 1552 263
+rect 1608 115 1638 263
+<< pmos >>
+rect 80 713 110 965
+rect 166 713 196 965
+rect 356 565 386 965
+rect 428 565 458 965
+rect 548 565 578 965
+rect 620 565 650 965
+rect 706 565 736 965
+rect 778 565 808 965
+rect 898 565 928 965
+rect 970 565 1000 965
+rect 1056 565 1086 965
+rect 1246 713 1276 965
+rect 1332 713 1362 965
+rect 1522 565 1552 965
+rect 1608 565 1638 965
+<< ndiff >>
+rect 27 165 80 219
+rect 27 131 35 165
+rect 69 131 80 165
+rect 27 115 80 131
+rect 110 115 152 219
+rect 182 165 235 219
+rect 182 131 193 165
+rect 227 131 235 165
+rect 182 115 235 131
+rect 303 215 356 263
+rect 303 131 311 215
+rect 345 131 356 215
+rect 303 115 356 131
+rect 386 115 428 263
+rect 458 215 548 263
+rect 458 131 469 215
+rect 537 131 548 215
+rect 458 115 548 131
+rect 578 115 620 263
+rect 650 165 706 263
+rect 650 131 661 165
+rect 695 131 706 165
+rect 650 115 706 131
+rect 736 115 778 263
+rect 808 215 898 263
+rect 808 131 819 215
+rect 887 131 898 215
+rect 808 115 898 131
+rect 928 115 970 263
+rect 1000 215 1056 263
+rect 1000 131 1011 215
+rect 1045 131 1056 215
+rect 1000 115 1056 131
+rect 1086 215 1139 263
+rect 1086 131 1097 215
+rect 1131 131 1139 215
+rect 1086 115 1139 131
+rect 1193 165 1246 219
+rect 1193 131 1201 165
+rect 1235 131 1246 165
+rect 1193 115 1246 131
+rect 1276 115 1318 219
+rect 1348 165 1401 219
+rect 1348 131 1359 165
+rect 1393 131 1401 165
+rect 1348 115 1401 131
+rect 1469 165 1522 263
+rect 1469 131 1477 165
+rect 1511 131 1522 165
+rect 1469 115 1522 131
+rect 1552 165 1608 263
+rect 1552 131 1563 165
+rect 1597 131 1608 165
+rect 1552 115 1608 131
+rect 1638 165 1691 263
+rect 1638 131 1649 165
+rect 1683 131 1691 165
+rect 1638 115 1691 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 877 35 949
+rect 69 877 80 949
+rect 27 713 80 877
+rect 110 949 166 965
+rect 110 877 121 949
+rect 155 877 166 949
+rect 110 713 166 877
+rect 196 949 249 965
+rect 196 877 207 949
+rect 241 877 249 949
+rect 196 713 249 877
+rect 303 949 356 965
+rect 303 673 311 949
+rect 345 673 356 949
+rect 303 565 356 673
+rect 386 565 428 965
+rect 458 949 548 965
+rect 458 605 469 949
+rect 537 605 548 949
+rect 458 565 548 605
+rect 578 565 620 965
+rect 650 949 706 965
+rect 650 673 661 949
+rect 695 673 706 949
+rect 650 565 706 673
+rect 736 565 778 965
+rect 808 949 898 965
+rect 808 673 819 949
+rect 887 673 898 949
+rect 808 565 898 673
+rect 928 565 970 965
+rect 1000 949 1056 965
+rect 1000 605 1011 949
+rect 1045 605 1056 949
+rect 1000 565 1056 605
+rect 1086 949 1139 965
+rect 1086 605 1097 949
+rect 1131 605 1139 949
+rect 1193 949 1246 965
+rect 1193 877 1201 949
+rect 1235 877 1246 949
+rect 1193 713 1246 877
+rect 1276 949 1332 965
+rect 1276 877 1287 949
+rect 1321 877 1332 949
+rect 1276 713 1332 877
+rect 1362 949 1415 965
+rect 1362 877 1373 949
+rect 1407 877 1415 949
+rect 1362 713 1415 877
+rect 1469 949 1522 965
+rect 1469 809 1477 949
+rect 1511 809 1522 949
+rect 1086 565 1139 605
+rect 1469 565 1522 809
+rect 1552 949 1608 965
+rect 1552 809 1563 949
+rect 1597 809 1608 949
+rect 1552 565 1608 809
+rect 1638 949 1691 965
+rect 1638 809 1649 949
+rect 1683 809 1691 949
+rect 1638 565 1691 809
+<< ndiffc >>
+rect 35 131 69 165
+rect 193 131 227 165
+rect 311 131 345 215
+rect 469 131 537 215
+rect 661 131 695 165
+rect 819 131 887 215
+rect 1011 131 1045 215
+rect 1097 131 1131 215
+rect 1201 131 1235 165
+rect 1359 131 1393 165
+rect 1477 131 1511 165
+rect 1563 131 1597 165
+rect 1649 131 1683 165
+<< pdiffc >>
+rect 35 877 69 949
+rect 121 877 155 949
+rect 207 877 241 949
+rect 311 673 345 949
+rect 469 605 537 949
+rect 661 673 695 949
+rect 819 673 887 949
+rect 1011 605 1045 949
+rect 1097 605 1131 949
+rect 1201 877 1235 949
+rect 1287 877 1321 949
+rect 1373 877 1407 949
+rect 1477 809 1511 949
+rect 1563 809 1597 949
+rect 1649 809 1683 949
+<< psubdiff >>
+rect 26 27 50 61
+rect 84 27 108 61
+rect 162 27 186 61
+rect 220 27 244 61
+rect 298 27 322 61
+rect 356 27 380 61
+rect 434 27 458 61
+rect 492 27 516 61
+rect 570 27 594 61
+rect 628 27 652 61
+rect 706 27 730 61
+rect 764 27 788 61
+rect 842 27 866 61
+rect 900 27 924 61
+rect 978 27 1002 61
+rect 1036 27 1060 61
+rect 1114 27 1138 61
+rect 1172 27 1196 61
+rect 1250 27 1274 61
+rect 1308 27 1332 61
+rect 1386 27 1410 61
+rect 1444 27 1468 61
+rect 1522 27 1546 61
+rect 1580 27 1604 61
+<< nsubdiff >>
+rect 26 1049 50 1083
+rect 84 1049 108 1083
+rect 162 1049 186 1083
+rect 220 1049 244 1083
+rect 298 1049 322 1083
+rect 356 1049 380 1083
+rect 434 1049 458 1083
+rect 492 1049 516 1083
+rect 570 1049 594 1083
+rect 628 1049 652 1083
+rect 706 1049 730 1083
+rect 764 1049 788 1083
+rect 842 1049 866 1083
+rect 900 1049 924 1083
+rect 978 1049 1002 1083
+rect 1036 1049 1060 1083
+rect 1114 1049 1138 1083
+rect 1172 1049 1196 1083
+rect 1250 1049 1274 1083
+rect 1308 1049 1332 1083
+rect 1386 1049 1410 1083
+rect 1444 1049 1468 1083
+rect 1522 1049 1546 1083
+rect 1580 1049 1604 1083
+<< psubdiffcont >>
+rect 50 27 84 61
+rect 186 27 220 61
+rect 322 27 356 61
+rect 458 27 492 61
+rect 594 27 628 61
+rect 730 27 764 61
+rect 866 27 900 61
+rect 1002 27 1036 61
+rect 1138 27 1172 61
+rect 1274 27 1308 61
+rect 1410 27 1444 61
+rect 1546 27 1580 61
+<< nsubdiffcont >>
+rect 50 1049 84 1083
+rect 186 1049 220 1083
+rect 322 1049 356 1083
+rect 458 1049 492 1083
+rect 594 1049 628 1083
+rect 730 1049 764 1083
+rect 866 1049 900 1083
+rect 1002 1049 1036 1083
+rect 1138 1049 1172 1083
+rect 1274 1049 1308 1083
+rect 1410 1049 1444 1083
+rect 1546 1049 1580 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 356 965 386 991
+rect 428 965 458 991
+rect 548 965 578 991
+rect 620 965 650 991
+rect 706 965 736 991
+rect 778 965 808 991
+rect 898 965 928 991
+rect 970 965 1000 991
+rect 1056 965 1086 991
+rect 1246 965 1276 991
+rect 1332 965 1362 991
+rect 1522 965 1552 991
+rect 1608 965 1638 991
+rect 80 351 110 713
+rect 166 442 196 713
+rect 37 335 110 351
+rect 37 301 47 335
+rect 81 301 110 335
+rect 37 285 110 301
+rect 80 219 110 285
+rect 152 426 233 442
+rect 152 392 189 426
+rect 223 392 233 426
+rect 152 376 233 392
+rect 356 425 386 565
+rect 428 534 458 565
+rect 428 518 482 534
+rect 428 484 438 518
+rect 472 484 482 518
+rect 428 468 482 484
+rect 356 409 410 425
+rect 548 423 578 565
+rect 620 528 650 565
+rect 706 528 736 565
+rect 620 518 736 528
+rect 620 484 652 518
+rect 686 484 736 518
+rect 620 474 736 484
+rect 778 423 808 565
+rect 898 534 928 565
+rect 874 518 928 534
+rect 874 484 884 518
+rect 918 484 928 518
+rect 874 468 928 484
+rect 152 219 182 376
+rect 356 375 366 409
+rect 400 375 410 409
+rect 356 359 410 375
+rect 452 393 904 423
+rect 356 263 386 359
+rect 452 315 482 393
+rect 874 351 904 393
+rect 970 419 1000 565
+rect 1056 534 1086 565
+rect 1056 518 1127 534
+rect 1056 504 1083 518
+rect 1067 484 1083 504
+rect 1117 484 1127 518
+rect 1067 468 1127 484
+rect 970 403 1024 419
+rect 970 369 980 403
+rect 1014 369 1024 403
+rect 970 353 1024 369
+rect 428 285 482 315
+rect 524 335 578 351
+rect 524 301 534 335
+rect 568 301 578 335
+rect 524 285 578 301
+rect 428 263 458 285
+rect 548 263 578 285
+rect 620 335 736 345
+rect 620 301 652 335
+rect 686 301 736 335
+rect 620 291 736 301
+rect 620 263 650 291
+rect 706 263 736 291
+rect 778 335 832 351
+rect 778 301 788 335
+rect 822 301 832 335
+rect 778 285 832 301
+rect 874 335 928 351
+rect 874 301 884 335
+rect 918 301 928 335
+rect 874 285 928 301
+rect 778 263 808 285
+rect 898 263 928 285
+rect 970 263 1000 353
+rect 1067 315 1097 468
+rect 1246 351 1276 713
+rect 1056 285 1097 315
+rect 1193 335 1276 351
+rect 1193 301 1203 335
+rect 1237 301 1276 335
+rect 1193 285 1276 301
+rect 1056 263 1086 285
+rect 1246 219 1276 285
+rect 1332 307 1362 713
+rect 1522 549 1552 565
+rect 1512 519 1552 549
+rect 1512 419 1542 519
+rect 1608 460 1638 565
+rect 1487 403 1542 419
+rect 1487 369 1497 403
+rect 1531 369 1542 403
+rect 1584 444 1638 460
+rect 1584 410 1594 444
+rect 1628 410 1638 444
+rect 1584 394 1638 410
+rect 1487 353 1542 369
+rect 1512 308 1542 353
+rect 1332 291 1399 307
+rect 1332 283 1355 291
+rect 1318 257 1355 283
+rect 1389 257 1399 291
+rect 1512 278 1552 308
+rect 1522 263 1552 278
+rect 1608 263 1638 394
+rect 1318 241 1399 257
+rect 1318 219 1348 241
+rect 80 89 110 115
+rect 152 89 182 115
+rect 356 89 386 115
+rect 428 89 458 115
+rect 548 89 578 115
+rect 620 89 650 115
+rect 706 89 736 115
+rect 778 89 808 115
+rect 898 89 928 115
+rect 970 89 1000 115
+rect 1056 89 1086 115
+rect 1246 89 1276 115
+rect 1318 89 1348 115
+rect 1522 89 1552 115
+rect 1608 89 1638 115
+<< polycont >>
+rect 47 301 81 335
+rect 189 392 223 426
+rect 438 484 472 518
+rect 652 484 686 518
+rect 884 484 918 518
+rect 366 375 400 409
+rect 1083 484 1117 518
+rect 980 369 1014 403
+rect 534 301 568 335
+rect 652 301 686 335
+rect 788 301 822 335
+rect 884 301 918 335
+rect 1203 301 1237 335
+rect 1497 369 1531 403
+rect 1594 410 1628 444
+rect 1355 257 1389 291
+<< locali >>
+rect 0 1093 1738 1110
+rect 0 1049 50 1093
+rect 84 1049 186 1093
+rect 220 1049 322 1093
+rect 356 1049 458 1093
+rect 492 1049 594 1093
+rect 628 1049 730 1093
+rect 764 1049 866 1093
+rect 900 1049 1002 1093
+rect 1036 1049 1138 1093
+rect 1172 1049 1274 1093
+rect 1308 1049 1410 1093
+rect 1444 1049 1546 1093
+rect 1580 1049 1738 1093
+rect 35 949 69 1049
+rect 35 861 69 877
+rect 121 949 155 965
+rect 47 335 81 351
+rect 47 261 81 301
+rect 121 335 155 877
+rect 207 949 241 1049
+rect 207 861 241 877
+rect 311 949 345 1049
+rect 311 657 345 673
+rect 469 949 537 965
+rect 661 949 695 1049
+rect 661 657 695 673
+rect 819 949 887 965
+rect 469 602 537 605
+rect 819 602 887 673
+rect 121 193 155 301
+rect 189 568 537 602
+rect 720 568 887 602
+rect 1011 949 1045 1049
+rect 1011 589 1045 605
+rect 1097 949 1131 965
+rect 1201 949 1235 1049
+rect 1201 861 1235 877
+rect 1287 949 1321 965
+rect 1097 602 1131 605
+rect 1097 568 1187 602
+rect 189 426 223 568
+rect 438 518 472 534
+rect 438 483 472 484
+rect 652 518 686 534
+rect 472 449 568 483
+rect 189 318 223 392
+rect 366 409 400 425
+rect 366 359 400 375
+rect 534 335 568 449
+rect 652 335 686 484
+rect 189 284 500 318
+rect 534 285 568 301
+rect 652 285 686 301
+rect 720 335 754 568
+rect 884 518 918 534
+rect 884 483 918 484
+rect 466 231 500 284
+rect 720 251 754 301
+rect 788 449 884 483
+rect 1083 518 1117 534
+rect 1083 483 1117 484
+rect 788 335 822 449
+rect 1151 415 1187 568
+rect 964 369 980 403
+rect 1014 369 1030 403
+rect 1097 381 1187 415
+rect 1287 403 1321 877
+rect 1373 949 1407 1049
+rect 1373 861 1407 877
+rect 1477 949 1511 965
+rect 1477 557 1511 809
+rect 1563 949 1597 1049
+rect 1563 793 1597 809
+rect 1649 949 1683 965
+rect 1649 631 1683 809
+rect 1682 614 1683 631
+rect 1682 597 1706 614
+rect 1649 580 1706 597
+rect 1477 518 1511 523
+rect 1477 484 1628 518
+rect 1594 444 1628 484
+rect 1097 335 1131 381
+rect 1287 369 1497 403
+rect 1531 369 1547 403
+rect 868 301 884 335
+rect 918 301 1131 335
+rect 1187 301 1203 335
+rect 1237 301 1253 335
+rect 788 285 822 301
+rect 35 165 155 193
+rect 311 215 345 231
+rect 69 159 155 165
+rect 193 165 227 181
+rect 35 115 69 131
+rect 193 61 227 131
+rect 466 215 537 231
+rect 720 217 887 251
+rect 466 197 469 215
+rect 311 61 345 131
+rect 819 215 887 217
+rect 469 115 537 131
+rect 661 165 695 181
+rect 661 61 695 131
+rect 819 115 887 131
+rect 1011 215 1045 231
+rect 1011 61 1045 131
+rect 1097 215 1131 301
+rect 1287 199 1321 369
+rect 1594 335 1628 410
+rect 1355 291 1389 307
+rect 1477 301 1628 335
+rect 1097 115 1131 131
+rect 1201 165 1321 199
+rect 1359 165 1393 181
+rect 1201 115 1235 131
+rect 1359 61 1393 131
+rect 1477 165 1511 301
+rect 1672 268 1706 580
+rect 1649 234 1706 268
+rect 1477 115 1511 131
+rect 1563 165 1597 181
+rect 1563 61 1597 131
+rect 1649 165 1683 234
+rect 1649 115 1683 131
+rect 0 17 50 61
+rect 84 17 186 61
+rect 220 17 322 61
+rect 356 17 458 61
+rect 492 17 594 61
+rect 628 17 730 61
+rect 764 17 866 61
+rect 900 17 1002 61
+rect 1036 17 1138 61
+rect 1172 17 1274 61
+rect 1308 17 1410 61
+rect 1444 17 1546 61
+rect 1580 17 1738 61
+rect 0 0 1738 17
+<< viali >>
+rect 50 1083 84 1093
+rect 50 1059 84 1083
+rect 186 1083 220 1093
+rect 186 1059 220 1083
+rect 322 1083 356 1093
+rect 322 1059 356 1083
+rect 458 1083 492 1093
+rect 458 1059 492 1083
+rect 594 1083 628 1093
+rect 594 1059 628 1083
+rect 730 1083 764 1093
+rect 730 1059 764 1083
+rect 866 1083 900 1093
+rect 866 1059 900 1083
+rect 1002 1083 1036 1093
+rect 1002 1059 1036 1083
+rect 1138 1083 1172 1093
+rect 1138 1059 1172 1083
+rect 1274 1083 1308 1093
+rect 1274 1059 1308 1083
+rect 1410 1083 1444 1093
+rect 1410 1059 1444 1083
+rect 1546 1083 1580 1093
+rect 1546 1059 1580 1083
+rect 47 227 81 261
+rect 121 301 155 335
+rect 438 449 472 483
+rect 366 375 400 409
+rect 634 301 652 335
+rect 652 301 668 335
+rect 720 301 754 335
+rect 884 449 918 483
+rect 1083 449 1117 483
+rect 980 369 1014 403
+rect 1648 597 1682 631
+rect 1477 523 1511 557
+rect 1497 369 1531 403
+rect 1203 301 1237 335
+rect 1355 257 1389 261
+rect 1355 227 1389 257
+rect 50 27 84 51
+rect 50 17 84 27
+rect 186 27 220 51
+rect 186 17 220 27
+rect 322 27 356 51
+rect 322 17 356 27
+rect 458 27 492 51
+rect 458 17 492 27
+rect 594 27 628 51
+rect 594 17 628 27
+rect 730 27 764 51
+rect 730 17 764 27
+rect 866 27 900 51
+rect 866 17 900 27
+rect 1002 27 1036 51
+rect 1002 17 1036 27
+rect 1138 27 1172 51
+rect 1138 17 1172 27
+rect 1274 27 1308 51
+rect 1274 17 1308 27
+rect 1410 27 1444 51
+rect 1410 17 1444 27
+rect 1546 27 1580 51
+rect 1546 17 1580 27
+<< metal1 >>
+rect 0 1093 1738 1110
+rect 0 1059 50 1093
+rect 84 1059 186 1093
+rect 220 1059 322 1093
+rect 356 1059 458 1093
+rect 492 1059 594 1093
+rect 628 1059 730 1093
+rect 764 1059 866 1093
+rect 900 1059 1002 1093
+rect 1036 1059 1138 1093
+rect 1172 1059 1274 1093
+rect 1308 1059 1410 1093
+rect 1444 1059 1546 1093
+rect 1580 1059 1738 1093
+rect 0 1049 1738 1059
+rect 1636 631 1694 637
+rect 1614 597 1648 631
+rect 1682 597 1694 631
+rect 1636 591 1694 597
+rect 1465 557 1523 563
+rect 1442 523 1477 557
+rect 1511 523 1523 557
+rect 1465 517 1523 523
+rect 426 483 484 489
+rect 872 483 930 489
+rect 1071 483 1129 489
+rect 426 449 438 483
+rect 472 449 884 483
+rect 918 449 1083 483
+rect 1117 449 1129 483
+rect 426 443 484 449
+rect 872 443 930 449
+rect 1071 443 1129 449
+rect 354 409 412 415
+rect 354 375 366 409
+rect 400 375 434 409
+rect 968 403 1026 409
+rect 1485 403 1543 409
+rect 354 369 412 375
+rect 968 369 980 403
+rect 1014 369 1497 403
+rect 1531 369 1543 403
+rect 968 363 1026 369
+rect 1485 363 1543 369
+rect 109 335 167 341
+rect 622 335 680 341
+rect 109 301 121 335
+rect 155 301 634 335
+rect 668 301 680 335
+rect 109 295 167 301
+rect 622 295 680 301
+rect 708 335 766 341
+rect 1191 335 1249 341
+rect 708 301 720 335
+rect 754 301 1203 335
+rect 1237 301 1249 335
+rect 708 295 766 301
+rect 1191 295 1249 301
+rect 35 261 93 267
+rect 1343 261 1401 267
+rect 35 227 47 261
+rect 81 227 1355 261
+rect 1389 227 1401 261
+rect 35 221 93 227
+rect 1343 221 1401 227
+rect 0 51 1738 61
+rect 0 17 50 51
+rect 84 17 186 51
+rect 220 17 322 51
+rect 356 17 458 51
+rect 492 17 594 51
+rect 628 17 730 51
+rect 764 17 866 51
+rect 900 17 1002 51
+rect 1036 17 1138 51
+rect 1172 17 1274 51
+rect 1308 17 1410 51
+rect 1444 17 1546 51
+rect 1580 17 1738 51
+rect 0 0 1738 17
+<< labels >>
+rlabel viali 383 392 383 392 1 D
+port 1 n
+rlabel viali 1100 466 1100 466 1 CK
+port 2 n
+rlabel viali 1665 614 1665 614 1 Q
+port 4 n
+rlabel viali 1495 540 1495 540 1 QN
+port 3 n
+rlabel viali 64 244 64 244 1 SN
+rlabel viali 67 44 67 44 1 gnd
+rlabel viali 67 1066 67 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__dffs_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__dffs_l.mag
new file mode 100644
index 0000000..36f7992
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__dffs_l.mag
@@ -0,0 +1,723 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007753
+<< checkpaint >>
+rect -1270 -242 3001 2379
+<< nwell >>
+rect -10 529 1741 1119
+<< nmoslvt >>
+rect 80 115 110 219
+rect 152 115 182 219
+rect 356 115 386 263
+rect 428 115 458 263
+rect 548 115 578 263
+rect 620 115 650 263
+rect 706 115 736 263
+rect 778 115 808 263
+rect 898 115 928 263
+rect 970 115 1000 263
+rect 1056 115 1086 263
+rect 1246 115 1276 219
+rect 1318 115 1348 219
+rect 1522 115 1552 219
+rect 1608 115 1638 219
+<< pmos >>
+rect 80 713 110 965
+rect 166 713 196 965
+rect 356 565 386 965
+rect 428 565 458 965
+rect 548 565 578 965
+rect 620 565 650 965
+rect 706 565 736 965
+rect 778 565 808 965
+rect 898 565 928 965
+rect 970 565 1000 965
+rect 1056 565 1086 965
+rect 1246 713 1276 965
+rect 1332 713 1362 965
+rect 1522 713 1552 965
+rect 1608 713 1638 965
+<< ndiff >>
+rect 27 165 80 219
+rect 27 131 35 165
+rect 69 131 80 165
+rect 27 115 80 131
+rect 110 115 152 219
+rect 182 165 235 219
+rect 182 131 193 165
+rect 227 131 235 165
+rect 182 115 235 131
+rect 303 215 356 263
+rect 303 131 311 215
+rect 345 131 356 215
+rect 303 115 356 131
+rect 386 115 428 263
+rect 458 215 548 263
+rect 458 131 469 215
+rect 537 131 548 215
+rect 458 115 548 131
+rect 578 115 620 263
+rect 650 165 706 263
+rect 650 131 661 165
+rect 695 131 706 165
+rect 650 115 706 131
+rect 736 115 778 263
+rect 808 215 898 263
+rect 808 131 819 215
+rect 887 131 898 215
+rect 808 115 898 131
+rect 928 115 970 263
+rect 1000 215 1056 263
+rect 1000 131 1011 215
+rect 1045 131 1056 215
+rect 1000 115 1056 131
+rect 1086 215 1139 263
+rect 1086 131 1097 215
+rect 1131 131 1139 215
+rect 1086 115 1139 131
+rect 1193 165 1246 219
+rect 1193 131 1201 165
+rect 1235 131 1246 165
+rect 1193 115 1246 131
+rect 1276 115 1318 219
+rect 1348 165 1401 219
+rect 1348 131 1359 165
+rect 1393 131 1401 165
+rect 1348 115 1401 131
+rect 1469 165 1522 219
+rect 1469 131 1477 165
+rect 1511 131 1522 165
+rect 1469 115 1522 131
+rect 1552 165 1608 219
+rect 1552 131 1563 165
+rect 1597 131 1608 165
+rect 1552 115 1608 131
+rect 1638 165 1691 219
+rect 1638 131 1649 165
+rect 1683 131 1691 165
+rect 1638 115 1691 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 877 35 949
+rect 69 877 80 949
+rect 27 713 80 877
+rect 110 949 166 965
+rect 110 877 121 949
+rect 155 877 166 949
+rect 110 713 166 877
+rect 196 949 249 965
+rect 196 877 207 949
+rect 241 877 249 949
+rect 196 713 249 877
+rect 303 949 356 965
+rect 303 673 311 949
+rect 345 673 356 949
+rect 303 565 356 673
+rect 386 565 428 965
+rect 458 949 548 965
+rect 458 605 469 949
+rect 537 605 548 949
+rect 458 565 548 605
+rect 578 565 620 965
+rect 650 949 706 965
+rect 650 673 661 949
+rect 695 673 706 949
+rect 650 565 706 673
+rect 736 565 778 965
+rect 808 949 898 965
+rect 808 673 819 949
+rect 887 673 898 949
+rect 808 565 898 673
+rect 928 565 970 965
+rect 1000 949 1056 965
+rect 1000 605 1011 949
+rect 1045 605 1056 949
+rect 1000 565 1056 605
+rect 1086 949 1139 965
+rect 1086 605 1097 949
+rect 1131 605 1139 949
+rect 1193 949 1246 965
+rect 1193 877 1201 949
+rect 1235 877 1246 949
+rect 1193 713 1246 877
+rect 1276 949 1332 965
+rect 1276 877 1287 949
+rect 1321 877 1332 949
+rect 1276 713 1332 877
+rect 1362 949 1415 965
+rect 1362 877 1373 949
+rect 1407 877 1415 949
+rect 1362 713 1415 877
+rect 1469 949 1522 965
+rect 1469 809 1477 949
+rect 1511 809 1522 949
+rect 1469 713 1522 809
+rect 1552 949 1608 965
+rect 1552 809 1563 949
+rect 1597 809 1608 949
+rect 1552 713 1608 809
+rect 1638 949 1691 965
+rect 1638 809 1649 949
+rect 1683 809 1691 949
+rect 1638 713 1691 809
+rect 1086 565 1139 605
+<< ndiffc >>
+rect 35 131 69 165
+rect 193 131 227 165
+rect 311 131 345 215
+rect 469 131 537 215
+rect 661 131 695 165
+rect 819 131 887 215
+rect 1011 131 1045 215
+rect 1097 131 1131 215
+rect 1201 131 1235 165
+rect 1359 131 1393 165
+rect 1477 131 1511 165
+rect 1563 131 1597 165
+rect 1649 131 1683 165
+<< pdiffc >>
+rect 35 877 69 949
+rect 121 877 155 949
+rect 207 877 241 949
+rect 311 673 345 949
+rect 469 605 537 949
+rect 661 673 695 949
+rect 819 673 887 949
+rect 1011 605 1045 949
+rect 1097 605 1131 949
+rect 1201 877 1235 949
+rect 1287 877 1321 949
+rect 1373 877 1407 949
+rect 1477 809 1511 949
+rect 1563 809 1597 949
+rect 1649 809 1683 949
+<< psubdiff >>
+rect 26 27 50 61
+rect 84 27 108 61
+rect 162 27 186 61
+rect 220 27 244 61
+rect 298 27 322 61
+rect 356 27 380 61
+rect 434 27 458 61
+rect 492 27 516 61
+rect 570 27 594 61
+rect 628 27 652 61
+rect 706 27 730 61
+rect 764 27 788 61
+rect 842 27 866 61
+rect 900 27 924 61
+rect 978 27 1002 61
+rect 1036 27 1060 61
+rect 1114 27 1138 61
+rect 1172 27 1196 61
+rect 1250 27 1274 61
+rect 1308 27 1332 61
+rect 1386 27 1410 61
+rect 1444 27 1468 61
+rect 1522 27 1546 61
+rect 1580 27 1604 61
+<< nsubdiff >>
+rect 26 1049 50 1083
+rect 84 1049 108 1083
+rect 162 1049 186 1083
+rect 220 1049 244 1083
+rect 298 1049 322 1083
+rect 356 1049 380 1083
+rect 434 1049 458 1083
+rect 492 1049 516 1083
+rect 570 1049 594 1083
+rect 628 1049 652 1083
+rect 706 1049 730 1083
+rect 764 1049 788 1083
+rect 842 1049 866 1083
+rect 900 1049 924 1083
+rect 978 1049 1002 1083
+rect 1036 1049 1060 1083
+rect 1114 1049 1138 1083
+rect 1172 1049 1196 1083
+rect 1250 1049 1274 1083
+rect 1308 1049 1332 1083
+rect 1386 1049 1410 1083
+rect 1444 1049 1468 1083
+rect 1522 1049 1546 1083
+rect 1580 1049 1604 1083
+<< psubdiffcont >>
+rect 50 27 84 61
+rect 186 27 220 61
+rect 322 27 356 61
+rect 458 27 492 61
+rect 594 27 628 61
+rect 730 27 764 61
+rect 866 27 900 61
+rect 1002 27 1036 61
+rect 1138 27 1172 61
+rect 1274 27 1308 61
+rect 1410 27 1444 61
+rect 1546 27 1580 61
+<< nsubdiffcont >>
+rect 50 1049 84 1083
+rect 186 1049 220 1083
+rect 322 1049 356 1083
+rect 458 1049 492 1083
+rect 594 1049 628 1083
+rect 730 1049 764 1083
+rect 866 1049 900 1083
+rect 1002 1049 1036 1083
+rect 1138 1049 1172 1083
+rect 1274 1049 1308 1083
+rect 1410 1049 1444 1083
+rect 1546 1049 1580 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 356 965 386 991
+rect 428 965 458 991
+rect 548 965 578 991
+rect 620 965 650 991
+rect 706 965 736 991
+rect 778 965 808 991
+rect 898 965 928 991
+rect 970 965 1000 991
+rect 1056 965 1086 991
+rect 1246 965 1276 991
+rect 1332 965 1362 991
+rect 1522 965 1552 991
+rect 1608 965 1638 991
+rect 80 351 110 713
+rect 166 442 196 713
+rect 37 335 110 351
+rect 37 301 47 335
+rect 81 301 110 335
+rect 37 285 110 301
+rect 80 219 110 285
+rect 152 426 233 442
+rect 152 392 189 426
+rect 223 392 233 426
+rect 152 376 233 392
+rect 356 425 386 565
+rect 428 534 458 565
+rect 428 518 482 534
+rect 428 484 438 518
+rect 472 484 482 518
+rect 428 468 482 484
+rect 356 409 410 425
+rect 548 423 578 565
+rect 620 528 650 565
+rect 706 528 736 565
+rect 620 518 736 528
+rect 620 484 652 518
+rect 686 484 736 518
+rect 620 474 736 484
+rect 778 423 808 565
+rect 898 534 928 565
+rect 874 518 928 534
+rect 874 484 884 518
+rect 918 484 928 518
+rect 874 468 928 484
+rect 152 219 182 376
+rect 356 375 366 409
+rect 400 375 410 409
+rect 356 359 410 375
+rect 452 393 904 423
+rect 356 263 386 359
+rect 452 315 482 393
+rect 874 351 904 393
+rect 970 419 1000 565
+rect 1056 534 1086 565
+rect 1056 518 1127 534
+rect 1056 504 1083 518
+rect 1067 484 1083 504
+rect 1117 484 1127 518
+rect 1067 468 1127 484
+rect 970 403 1024 419
+rect 970 369 980 403
+rect 1014 369 1024 403
+rect 970 353 1024 369
+rect 428 285 482 315
+rect 524 335 578 351
+rect 524 301 534 335
+rect 568 301 578 335
+rect 524 285 578 301
+rect 428 263 458 285
+rect 548 263 578 285
+rect 620 335 736 345
+rect 620 301 652 335
+rect 686 301 736 335
+rect 620 291 736 301
+rect 620 263 650 291
+rect 706 263 736 291
+rect 778 335 832 351
+rect 778 301 788 335
+rect 822 301 832 335
+rect 778 285 832 301
+rect 874 335 928 351
+rect 874 301 884 335
+rect 918 301 928 335
+rect 874 285 928 301
+rect 778 263 808 285
+rect 898 263 928 285
+rect 970 263 1000 353
+rect 1067 315 1097 468
+rect 1246 351 1276 713
+rect 1056 285 1097 315
+rect 1193 335 1276 351
+rect 1193 301 1203 335
+rect 1237 301 1276 335
+rect 1193 285 1276 301
+rect 1056 263 1086 285
+rect 1246 219 1276 285
+rect 1332 307 1362 713
+rect 1522 549 1552 713
+rect 1512 519 1552 549
+rect 1512 419 1542 519
+rect 1608 460 1638 713
+rect 1487 403 1542 419
+rect 1487 369 1497 403
+rect 1531 369 1542 403
+rect 1584 444 1638 460
+rect 1584 410 1594 444
+rect 1628 410 1638 444
+rect 1584 394 1638 410
+rect 1487 353 1542 369
+rect 1512 308 1542 353
+rect 1332 291 1399 307
+rect 1332 283 1355 291
+rect 1318 257 1355 283
+rect 1389 257 1399 291
+rect 1512 278 1552 308
+rect 1318 241 1399 257
+rect 1318 219 1348 241
+rect 1522 219 1552 278
+rect 1608 219 1638 394
+rect 80 89 110 115
+rect 152 89 182 115
+rect 356 89 386 115
+rect 428 89 458 115
+rect 548 89 578 115
+rect 620 89 650 115
+rect 706 89 736 115
+rect 778 89 808 115
+rect 898 89 928 115
+rect 970 89 1000 115
+rect 1056 89 1086 115
+rect 1246 89 1276 115
+rect 1318 89 1348 115
+rect 1522 89 1552 115
+rect 1608 89 1638 115
+<< polycont >>
+rect 47 301 81 335
+rect 189 392 223 426
+rect 438 484 472 518
+rect 652 484 686 518
+rect 884 484 918 518
+rect 366 375 400 409
+rect 1083 484 1117 518
+rect 980 369 1014 403
+rect 534 301 568 335
+rect 652 301 686 335
+rect 788 301 822 335
+rect 884 301 918 335
+rect 1203 301 1237 335
+rect 1497 369 1531 403
+rect 1594 410 1628 444
+rect 1355 257 1389 291
+<< locali >>
+rect 0 1093 1738 1110
+rect 0 1049 50 1093
+rect 84 1049 186 1093
+rect 220 1049 322 1093
+rect 356 1049 458 1093
+rect 492 1049 594 1093
+rect 628 1049 730 1093
+rect 764 1049 866 1093
+rect 900 1049 1002 1093
+rect 1036 1049 1138 1093
+rect 1172 1049 1274 1093
+rect 1308 1049 1410 1093
+rect 1444 1049 1546 1093
+rect 1580 1049 1738 1093
+rect 35 949 69 1049
+rect 35 861 69 877
+rect 121 949 155 965
+rect 47 335 81 351
+rect 47 261 81 301
+rect 121 335 155 877
+rect 207 949 241 1049
+rect 207 861 241 877
+rect 311 949 345 1049
+rect 311 657 345 673
+rect 469 949 537 965
+rect 661 949 695 1049
+rect 661 657 695 673
+rect 819 949 887 965
+rect 469 602 537 605
+rect 819 602 887 673
+rect 121 193 155 301
+rect 189 568 537 602
+rect 720 568 887 602
+rect 1011 949 1045 1049
+rect 1011 589 1045 605
+rect 1097 949 1131 965
+rect 1201 949 1235 1049
+rect 1201 861 1235 877
+rect 1287 949 1321 965
+rect 1097 602 1131 605
+rect 1097 568 1187 602
+rect 189 426 223 568
+rect 438 518 472 534
+rect 438 483 472 484
+rect 652 518 686 534
+rect 472 449 568 483
+rect 189 318 223 392
+rect 366 409 400 425
+rect 366 359 400 375
+rect 534 335 568 449
+rect 652 335 686 484
+rect 189 284 500 318
+rect 534 285 568 301
+rect 652 285 686 301
+rect 720 335 754 568
+rect 884 518 918 534
+rect 884 483 918 484
+rect 466 231 500 284
+rect 720 251 754 301
+rect 788 449 884 483
+rect 1083 518 1117 534
+rect 1083 483 1117 484
+rect 788 335 822 449
+rect 1151 415 1187 568
+rect 964 369 980 403
+rect 1014 369 1030 403
+rect 1097 381 1187 415
+rect 1287 403 1321 877
+rect 1373 949 1407 1049
+rect 1373 861 1407 877
+rect 1477 949 1511 965
+rect 1477 557 1511 809
+rect 1563 949 1597 1049
+rect 1563 793 1597 809
+rect 1649 949 1683 965
+rect 1649 631 1683 809
+rect 1682 614 1683 631
+rect 1682 597 1706 614
+rect 1649 580 1706 597
+rect 1477 518 1511 523
+rect 1477 484 1628 518
+rect 1594 444 1628 484
+rect 1097 335 1131 381
+rect 1287 369 1497 403
+rect 1531 369 1547 403
+rect 868 301 884 335
+rect 918 301 1131 335
+rect 1187 301 1203 335
+rect 1237 301 1253 335
+rect 788 285 822 301
+rect 35 165 155 193
+rect 311 215 345 231
+rect 69 159 155 165
+rect 193 165 227 181
+rect 35 115 69 131
+rect 193 61 227 131
+rect 466 215 537 231
+rect 720 217 887 251
+rect 466 197 469 215
+rect 311 61 345 131
+rect 819 215 887 217
+rect 469 115 537 131
+rect 661 165 695 181
+rect 661 61 695 131
+rect 819 115 887 131
+rect 1011 215 1045 231
+rect 1011 61 1045 131
+rect 1097 215 1131 301
+rect 1287 199 1321 369
+rect 1594 335 1628 410
+rect 1355 291 1389 307
+rect 1477 301 1628 335
+rect 1097 115 1131 131
+rect 1201 165 1321 199
+rect 1359 165 1393 181
+rect 1201 115 1235 131
+rect 1359 61 1393 131
+rect 1477 165 1511 301
+rect 1672 268 1706 580
+rect 1649 234 1706 268
+rect 1477 115 1511 131
+rect 1563 165 1597 181
+rect 1563 61 1597 131
+rect 1649 165 1683 234
+rect 1649 115 1683 131
+rect 0 17 50 61
+rect 84 17 186 61
+rect 220 17 322 61
+rect 356 17 458 61
+rect 492 17 594 61
+rect 628 17 730 61
+rect 764 17 866 61
+rect 900 17 1002 61
+rect 1036 17 1138 61
+rect 1172 17 1274 61
+rect 1308 17 1410 61
+rect 1444 17 1546 61
+rect 1580 17 1738 61
+rect 0 0 1738 17
+<< viali >>
+rect 50 1083 84 1093
+rect 50 1059 84 1083
+rect 186 1083 220 1093
+rect 186 1059 220 1083
+rect 322 1083 356 1093
+rect 322 1059 356 1083
+rect 458 1083 492 1093
+rect 458 1059 492 1083
+rect 594 1083 628 1093
+rect 594 1059 628 1083
+rect 730 1083 764 1093
+rect 730 1059 764 1083
+rect 866 1083 900 1093
+rect 866 1059 900 1083
+rect 1002 1083 1036 1093
+rect 1002 1059 1036 1083
+rect 1138 1083 1172 1093
+rect 1138 1059 1172 1083
+rect 1274 1083 1308 1093
+rect 1274 1059 1308 1083
+rect 1410 1083 1444 1093
+rect 1410 1059 1444 1083
+rect 1546 1083 1580 1093
+rect 1546 1059 1580 1083
+rect 47 227 81 261
+rect 121 301 155 335
+rect 438 449 472 483
+rect 366 375 400 409
+rect 634 301 652 335
+rect 652 301 668 335
+rect 720 301 754 335
+rect 884 449 918 483
+rect 1083 449 1117 483
+rect 980 369 1014 403
+rect 1648 597 1682 631
+rect 1477 523 1511 557
+rect 1497 369 1531 403
+rect 1203 301 1237 335
+rect 1355 257 1389 261
+rect 1355 227 1389 257
+rect 50 27 84 51
+rect 50 17 84 27
+rect 186 27 220 51
+rect 186 17 220 27
+rect 322 27 356 51
+rect 322 17 356 27
+rect 458 27 492 51
+rect 458 17 492 27
+rect 594 27 628 51
+rect 594 17 628 27
+rect 730 27 764 51
+rect 730 17 764 27
+rect 866 27 900 51
+rect 866 17 900 27
+rect 1002 27 1036 51
+rect 1002 17 1036 27
+rect 1138 27 1172 51
+rect 1138 17 1172 27
+rect 1274 27 1308 51
+rect 1274 17 1308 27
+rect 1410 27 1444 51
+rect 1410 17 1444 27
+rect 1546 27 1580 51
+rect 1546 17 1580 27
+<< metal1 >>
+rect 0 1093 1738 1110
+rect 0 1059 50 1093
+rect 84 1059 186 1093
+rect 220 1059 322 1093
+rect 356 1059 458 1093
+rect 492 1059 594 1093
+rect 628 1059 730 1093
+rect 764 1059 866 1093
+rect 900 1059 1002 1093
+rect 1036 1059 1138 1093
+rect 1172 1059 1274 1093
+rect 1308 1059 1410 1093
+rect 1444 1059 1546 1093
+rect 1580 1059 1738 1093
+rect 0 1049 1738 1059
+rect 1636 631 1694 637
+rect 1614 597 1648 631
+rect 1682 597 1694 631
+rect 1636 591 1694 597
+rect 1465 557 1523 563
+rect 1442 523 1477 557
+rect 1511 523 1523 557
+rect 1465 517 1523 523
+rect 426 483 484 489
+rect 872 483 930 489
+rect 1071 483 1129 489
+rect 426 449 438 483
+rect 472 449 884 483
+rect 918 449 1083 483
+rect 1117 449 1129 483
+rect 426 443 484 449
+rect 872 443 930 449
+rect 1071 443 1129 449
+rect 354 409 412 415
+rect 354 375 366 409
+rect 400 375 434 409
+rect 968 403 1026 409
+rect 1485 403 1543 409
+rect 354 369 412 375
+rect 968 369 980 403
+rect 1014 369 1497 403
+rect 1531 369 1543 403
+rect 968 363 1026 369
+rect 1485 363 1543 369
+rect 109 335 167 341
+rect 622 335 680 341
+rect 109 301 121 335
+rect 155 301 634 335
+rect 668 301 680 335
+rect 109 295 167 301
+rect 622 295 680 301
+rect 708 335 766 341
+rect 1191 335 1249 341
+rect 708 301 720 335
+rect 754 301 1203 335
+rect 1237 301 1249 335
+rect 708 295 766 301
+rect 1191 295 1249 301
+rect 35 261 93 267
+rect 1343 261 1401 267
+rect 35 227 47 261
+rect 81 227 1355 261
+rect 1389 227 1401 261
+rect 35 221 93 227
+rect 1343 221 1401 227
+rect 0 51 1738 61
+rect 0 17 50 51
+rect 84 17 186 51
+rect 220 17 322 51
+rect 356 17 458 51
+rect 492 17 594 51
+rect 628 17 730 51
+rect 764 17 866 51
+rect 900 17 1002 51
+rect 1036 17 1138 51
+rect 1172 17 1274 51
+rect 1308 17 1410 51
+rect 1444 17 1546 51
+rect 1580 17 1738 51
+rect 0 0 1738 17
+<< labels >>
+rlabel viali 383 392 383 392 1 D
+port 1 n
+rlabel viali 1100 466 1100 466 1 CK
+port 2 n
+rlabel viali 1665 614 1665 614 1 Q
+port 4 n
+rlabel viali 1495 540 1495 540 1 QN
+port 3 n
+rlabel viali 64 244 64 244 1 SN
+rlabel viali 67 44 67 44 1 gnd
+rlabel viali 67 1066 67 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__dffsr_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__dffsr_1.mag
new file mode 100644
index 0000000..3847568
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__dffsr_1.mag
@@ -0,0 +1,900 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007753
+<< checkpaint >>
+rect -1270 -242 3350 2379
+<< nwell >>
+rect -10 529 2090 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 272 115 302 219
+rect 370 115 400 263
+rect 442 115 472 263
+rect 632 115 662 263
+rect 704 115 734 263
+rect 824 115 854 263
+rect 896 115 926 263
+rect 982 115 1012 263
+rect 1054 115 1084 263
+rect 1174 115 1204 263
+rect 1246 115 1276 263
+rect 1332 115 1362 263
+rect 1522 115 1552 263
+rect 1594 115 1624 263
+rect 1692 115 1722 219
+rect 1884 115 1914 263
+rect 1970 115 2000 263
+<< pmos >>
+rect 80 565 110 965
+rect 270 565 300 965
+rect 356 565 386 965
+rect 442 565 472 965
+rect 632 565 662 965
+rect 704 565 734 965
+rect 824 565 854 965
+rect 896 565 926 965
+rect 982 565 1012 965
+rect 1054 565 1084 965
+rect 1174 565 1204 965
+rect 1246 565 1276 965
+rect 1332 565 1362 965
+rect 1522 565 1552 965
+rect 1608 565 1638 965
+rect 1694 565 1724 965
+rect 1884 565 1914 965
+rect 1970 565 2000 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 163 263
+rect 317 219 370 263
+rect 110 131 121 215
+rect 155 131 163 215
+rect 110 115 163 131
+rect 219 165 272 219
+rect 219 131 227 165
+rect 261 131 272 165
+rect 219 115 272 131
+rect 302 215 370 219
+rect 302 131 325 215
+rect 359 131 370 215
+rect 302 115 370 131
+rect 400 115 442 263
+rect 472 215 525 263
+rect 472 131 483 215
+rect 517 131 525 215
+rect 472 115 525 131
+rect 579 215 632 263
+rect 579 131 587 215
+rect 621 131 632 215
+rect 579 115 632 131
+rect 662 115 704 263
+rect 734 215 824 263
+rect 734 131 745 215
+rect 813 131 824 215
+rect 734 115 824 131
+rect 854 115 896 263
+rect 926 165 982 263
+rect 926 131 937 165
+rect 971 131 982 165
+rect 926 115 982 131
+rect 1012 115 1054 263
+rect 1084 215 1174 263
+rect 1084 131 1095 215
+rect 1163 131 1174 215
+rect 1084 115 1174 131
+rect 1204 115 1246 263
+rect 1276 215 1332 263
+rect 1276 131 1287 215
+rect 1321 131 1332 215
+rect 1276 115 1332 131
+rect 1362 215 1415 263
+rect 1362 131 1373 215
+rect 1407 131 1415 215
+rect 1362 115 1415 131
+rect 1469 215 1522 263
+rect 1469 131 1477 215
+rect 1511 131 1522 215
+rect 1469 115 1522 131
+rect 1552 115 1594 263
+rect 1624 219 1677 263
+rect 1624 215 1692 219
+rect 1624 131 1635 215
+rect 1669 131 1692 215
+rect 1624 115 1692 131
+rect 1722 165 1775 219
+rect 1722 131 1733 165
+rect 1767 131 1775 165
+rect 1722 115 1775 131
+rect 1831 215 1884 263
+rect 1831 131 1839 215
+rect 1873 131 1884 215
+rect 1831 115 1884 131
+rect 1914 215 1970 263
+rect 1914 131 1925 215
+rect 1959 131 1970 215
+rect 1914 115 1970 131
+rect 2000 215 2053 263
+rect 2000 131 2011 215
+rect 2045 131 2053 215
+rect 2000 115 2053 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 741 35 949
+rect 69 741 80 949
+rect 27 565 80 741
+rect 110 949 163 965
+rect 110 605 121 949
+rect 155 605 163 949
+rect 110 565 163 605
+rect 217 949 270 965
+rect 217 673 225 949
+rect 259 673 270 949
+rect 217 565 270 673
+rect 300 949 356 965
+rect 300 673 311 949
+rect 345 673 356 949
+rect 300 565 356 673
+rect 386 949 442 965
+rect 386 741 397 949
+rect 431 741 442 949
+rect 386 565 442 741
+rect 472 949 525 965
+rect 472 673 483 949
+rect 517 673 525 949
+rect 472 565 525 673
+rect 579 949 632 965
+rect 579 673 587 949
+rect 621 673 632 949
+rect 579 565 632 673
+rect 662 565 704 965
+rect 734 949 824 965
+rect 734 605 745 949
+rect 813 605 824 949
+rect 734 565 824 605
+rect 854 565 896 965
+rect 926 949 982 965
+rect 926 673 937 949
+rect 971 673 982 949
+rect 926 565 982 673
+rect 1012 565 1054 965
+rect 1084 949 1174 965
+rect 1084 673 1095 949
+rect 1163 673 1174 949
+rect 1084 565 1174 673
+rect 1204 565 1246 965
+rect 1276 949 1332 965
+rect 1276 605 1287 949
+rect 1321 605 1332 949
+rect 1276 565 1332 605
+rect 1362 949 1415 965
+rect 1362 605 1373 949
+rect 1407 605 1415 949
+rect 1362 565 1415 605
+rect 1469 949 1522 965
+rect 1469 673 1477 949
+rect 1511 673 1522 949
+rect 1469 565 1522 673
+rect 1552 949 1608 965
+rect 1552 741 1563 949
+rect 1597 741 1608 949
+rect 1552 565 1608 741
+rect 1638 949 1694 965
+rect 1638 673 1649 949
+rect 1683 673 1694 949
+rect 1638 565 1694 673
+rect 1724 949 1777 965
+rect 1724 673 1735 949
+rect 1769 673 1777 949
+rect 1724 565 1777 673
+rect 1831 949 1884 965
+rect 1831 605 1839 949
+rect 1873 605 1884 949
+rect 1831 565 1884 605
+rect 1914 949 1970 965
+rect 1914 605 1925 949
+rect 1959 605 1970 949
+rect 1914 565 1970 605
+rect 2000 949 2053 965
+rect 2000 605 2011 949
+rect 2045 605 2053 949
+rect 2000 565 2053 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 227 131 261 165
+rect 325 131 359 215
+rect 483 131 517 215
+rect 587 131 621 215
+rect 745 131 813 215
+rect 937 131 971 165
+rect 1095 131 1163 215
+rect 1287 131 1321 215
+rect 1373 131 1407 215
+rect 1477 131 1511 215
+rect 1635 131 1669 215
+rect 1733 131 1767 165
+rect 1839 131 1873 215
+rect 1925 131 1959 215
+rect 2011 131 2045 215
+<< pdiffc >>
+rect 35 741 69 949
+rect 121 605 155 949
+rect 225 673 259 949
+rect 311 673 345 949
+rect 397 741 431 949
+rect 483 673 517 949
+rect 587 673 621 949
+rect 745 605 813 949
+rect 937 673 971 949
+rect 1095 673 1163 949
+rect 1287 605 1321 949
+rect 1373 605 1407 949
+rect 1477 673 1511 949
+rect 1563 741 1597 949
+rect 1649 673 1683 949
+rect 1735 673 1769 949
+rect 1839 605 1873 949
+rect 1925 605 1959 949
+rect 2011 605 2045 949
+<< psubdiff >>
+rect 26 27 50 61
+rect 84 27 108 61
+rect 162 27 186 61
+rect 220 27 244 61
+rect 298 27 322 61
+rect 356 27 380 61
+rect 434 27 458 61
+rect 492 27 516 61
+rect 570 27 594 61
+rect 628 27 652 61
+rect 706 27 730 61
+rect 764 27 788 61
+rect 842 27 866 61
+rect 900 27 924 61
+rect 978 27 1002 61
+rect 1036 27 1060 61
+rect 1114 27 1138 61
+rect 1172 27 1196 61
+rect 1250 27 1274 61
+rect 1308 27 1332 61
+rect 1386 27 1410 61
+rect 1444 27 1468 61
+rect 1522 27 1546 61
+rect 1580 27 1604 61
+rect 1658 27 1682 61
+rect 1716 27 1740 61
+rect 1794 27 1818 61
+rect 1852 27 1876 61
+rect 1930 27 1954 61
+rect 1988 27 2012 61
+<< nsubdiff >>
+rect 26 1049 50 1083
+rect 84 1049 108 1083
+rect 162 1049 186 1083
+rect 220 1049 244 1083
+rect 298 1049 322 1083
+rect 356 1049 380 1083
+rect 434 1049 458 1083
+rect 492 1049 516 1083
+rect 570 1049 594 1083
+rect 628 1049 652 1083
+rect 706 1049 730 1083
+rect 764 1049 788 1083
+rect 842 1049 866 1083
+rect 900 1049 924 1083
+rect 978 1049 1002 1083
+rect 1036 1049 1060 1083
+rect 1114 1049 1138 1083
+rect 1172 1049 1196 1083
+rect 1250 1049 1274 1083
+rect 1308 1049 1332 1083
+rect 1386 1049 1410 1083
+rect 1444 1049 1468 1083
+rect 1522 1049 1546 1083
+rect 1580 1049 1604 1083
+rect 1658 1049 1682 1083
+rect 1716 1049 1740 1083
+rect 1794 1049 1818 1083
+rect 1852 1049 1876 1083
+rect 1930 1049 1954 1083
+rect 1988 1049 2012 1083
+<< psubdiffcont >>
+rect 50 27 84 61
+rect 186 27 220 61
+rect 322 27 356 61
+rect 458 27 492 61
+rect 594 27 628 61
+rect 730 27 764 61
+rect 866 27 900 61
+rect 1002 27 1036 61
+rect 1138 27 1172 61
+rect 1274 27 1308 61
+rect 1410 27 1444 61
+rect 1546 27 1580 61
+rect 1682 27 1716 61
+rect 1818 27 1852 61
+rect 1954 27 1988 61
+<< nsubdiffcont >>
+rect 50 1049 84 1083
+rect 186 1049 220 1083
+rect 322 1049 356 1083
+rect 458 1049 492 1083
+rect 594 1049 628 1083
+rect 730 1049 764 1083
+rect 866 1049 900 1083
+rect 1002 1049 1036 1083
+rect 1138 1049 1172 1083
+rect 1274 1049 1308 1083
+rect 1410 1049 1444 1083
+rect 1546 1049 1580 1083
+rect 1682 1049 1716 1083
+rect 1818 1049 1852 1083
+rect 1954 1049 1988 1083
+<< poly >>
+rect 80 965 110 991
+rect 270 965 300 991
+rect 356 965 386 991
+rect 442 965 472 991
+rect 632 965 662 991
+rect 704 965 734 991
+rect 824 965 854 991
+rect 896 965 926 991
+rect 982 965 1012 991
+rect 1054 965 1084 991
+rect 1174 965 1204 991
+rect 1246 965 1276 991
+rect 1332 965 1362 991
+rect 1522 965 1552 991
+rect 1608 965 1638 991
+rect 1694 965 1724 991
+rect 1884 965 1914 991
+rect 1970 965 2000 991
+rect 80 442 110 565
+rect 270 527 300 565
+rect 243 497 300 527
+rect 79 426 133 442
+rect 79 392 89 426
+rect 123 392 133 426
+rect 79 376 133 392
+rect 79 375 110 376
+rect 80 263 110 375
+rect 243 307 273 497
+rect 356 455 386 565
+rect 442 534 472 565
+rect 432 518 486 534
+rect 432 484 442 518
+rect 476 484 486 518
+rect 432 468 486 484
+rect 315 439 386 455
+rect 315 405 325 439
+rect 359 425 386 439
+rect 359 405 400 425
+rect 315 389 400 405
+rect 219 291 273 307
+rect 356 303 400 389
+rect 219 257 229 291
+rect 263 271 273 291
+rect 263 257 302 271
+rect 370 263 400 303
+rect 442 263 472 468
+rect 632 425 662 565
+rect 704 534 734 565
+rect 704 518 758 534
+rect 704 484 714 518
+rect 748 484 758 518
+rect 704 468 758 484
+rect 632 409 686 425
+rect 824 423 854 565
+rect 896 528 926 565
+rect 982 528 1012 565
+rect 896 518 1012 528
+rect 896 484 928 518
+rect 962 484 1012 518
+rect 896 474 1012 484
+rect 1054 423 1084 565
+rect 1174 534 1204 565
+rect 1150 518 1204 534
+rect 1150 484 1160 518
+rect 1194 484 1204 518
+rect 1150 468 1204 484
+rect 632 375 642 409
+rect 676 375 686 409
+rect 632 359 686 375
+rect 728 393 1180 423
+rect 632 263 662 359
+rect 728 315 758 393
+rect 1150 351 1180 393
+rect 1246 419 1276 565
+rect 1332 534 1362 565
+rect 1332 518 1403 534
+rect 1522 528 1552 565
+rect 1332 504 1359 518
+rect 1343 484 1359 504
+rect 1393 484 1403 518
+rect 1343 468 1403 484
+rect 1486 518 1552 528
+rect 1486 484 1502 518
+rect 1536 484 1552 518
+rect 1486 474 1552 484
+rect 1246 403 1300 419
+rect 1246 369 1256 403
+rect 1290 369 1300 403
+rect 1246 353 1300 369
+rect 704 285 758 315
+rect 800 335 854 351
+rect 800 301 810 335
+rect 844 301 854 335
+rect 800 285 854 301
+rect 704 263 734 285
+rect 824 263 854 285
+rect 896 335 1012 345
+rect 896 301 928 335
+rect 962 301 1012 335
+rect 896 291 1012 301
+rect 896 263 926 291
+rect 982 263 1012 291
+rect 1054 335 1108 351
+rect 1054 301 1064 335
+rect 1098 301 1108 335
+rect 1054 285 1108 301
+rect 1150 335 1204 351
+rect 1150 301 1160 335
+rect 1194 301 1204 335
+rect 1150 285 1204 301
+rect 1054 263 1084 285
+rect 1174 263 1204 285
+rect 1246 263 1276 353
+rect 1343 315 1373 468
+rect 1332 285 1373 315
+rect 1486 318 1516 474
+rect 1608 432 1638 565
+rect 1694 527 1724 565
+rect 1884 549 1914 565
+rect 1694 501 1751 527
+rect 1874 519 1914 549
+rect 1694 497 1775 501
+rect 1721 469 1775 497
+rect 1576 416 1638 432
+rect 1576 382 1588 416
+rect 1622 382 1638 416
+rect 1576 366 1638 382
+rect 1486 286 1552 318
+rect 1332 263 1362 285
+rect 1522 263 1552 286
+rect 1594 263 1624 366
+rect 1745 307 1775 469
+rect 1874 419 1904 519
+rect 1970 460 2000 565
+rect 1849 403 1904 419
+rect 1849 369 1859 403
+rect 1893 369 1904 403
+rect 1946 444 2000 460
+rect 1946 410 1956 444
+rect 1990 410 2000 444
+rect 1946 394 2000 410
+rect 1849 353 1904 369
+rect 1874 308 1904 353
+rect 1745 291 1799 307
+rect 1745 271 1755 291
+rect 219 241 302 257
+rect 272 219 302 241
+rect 1692 257 1755 271
+rect 1789 257 1799 291
+rect 1874 278 1914 308
+rect 1884 263 1914 278
+rect 1970 263 2000 394
+rect 1692 241 1799 257
+rect 1692 219 1722 241
+rect 80 89 110 115
+rect 272 89 302 115
+rect 370 89 400 115
+rect 442 89 472 115
+rect 632 89 662 115
+rect 704 89 734 115
+rect 824 89 854 115
+rect 896 89 926 115
+rect 982 89 1012 115
+rect 1054 89 1084 115
+rect 1174 89 1204 115
+rect 1246 89 1276 115
+rect 1332 89 1362 115
+rect 1522 89 1552 115
+rect 1594 89 1624 115
+rect 1692 89 1722 115
+rect 1884 89 1914 115
+rect 1970 89 2000 115
+<< polycont >>
+rect 89 392 123 426
+rect 442 484 476 518
+rect 325 405 359 439
+rect 229 257 263 291
+rect 714 484 748 518
+rect 928 484 962 518
+rect 1160 484 1194 518
+rect 642 375 676 409
+rect 1359 484 1393 518
+rect 1502 484 1536 518
+rect 1256 369 1290 403
+rect 810 301 844 335
+rect 928 301 962 335
+rect 1064 301 1098 335
+rect 1160 301 1194 335
+rect 1588 382 1622 416
+rect 1859 369 1893 403
+rect 1956 410 1990 444
+rect 1755 257 1789 291
+<< locali >>
+rect 0 1093 2090 1110
+rect 0 1049 50 1093
+rect 84 1049 186 1093
+rect 220 1049 322 1093
+rect 356 1049 458 1093
+rect 492 1049 594 1093
+rect 628 1049 730 1093
+rect 764 1049 866 1093
+rect 900 1049 1002 1093
+rect 1036 1049 1138 1093
+rect 1172 1049 1274 1093
+rect 1308 1049 1410 1093
+rect 1444 1049 1546 1093
+rect 1580 1049 1682 1093
+rect 1716 1049 1818 1093
+rect 1852 1049 1954 1093
+rect 1988 1049 2090 1093
+rect 35 949 69 1049
+rect 35 725 69 741
+rect 121 949 155 965
+rect 47 442 81 597
+rect 121 513 155 605
+rect 225 949 259 965
+rect 121 479 191 513
+rect 47 426 123 442
+rect 47 392 89 426
+rect 89 376 123 392
+rect 157 291 191 479
+rect 225 369 259 673
+rect 311 949 345 965
+rect 397 949 431 1049
+rect 397 725 431 741
+rect 483 949 517 965
+rect 345 673 483 691
+rect 311 657 517 673
+rect 587 949 621 1049
+rect 587 657 621 673
+rect 745 949 813 965
+rect 937 949 971 1049
+rect 937 657 971 673
+rect 1095 949 1163 965
+rect 813 605 816 623
+rect 745 602 816 605
+rect 1095 602 1163 673
+rect 442 568 816 602
+rect 996 568 1163 602
+rect 1287 949 1321 1049
+rect 1287 589 1321 605
+rect 1373 949 1407 965
+rect 1477 949 1511 965
+rect 1563 949 1597 1049
+rect 1563 725 1597 741
+rect 1649 949 1683 965
+rect 1511 673 1649 691
+rect 1477 657 1683 673
+rect 1735 949 1769 965
+rect 1373 602 1407 605
+rect 1373 568 1461 602
+rect 325 439 359 523
+rect 442 518 476 568
+rect 309 405 325 439
+rect 359 405 375 439
+rect 225 335 359 369
+rect 121 257 229 291
+rect 263 257 279 291
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 257
+rect 325 215 359 301
+rect 442 318 476 484
+rect 714 518 748 534
+rect 714 483 748 484
+rect 928 518 962 534
+rect 748 449 844 483
+rect 642 409 676 425
+rect 642 359 676 375
+rect 810 335 844 449
+rect 928 335 962 484
+rect 442 284 776 318
+rect 810 285 844 301
+rect 928 285 962 301
+rect 996 335 1030 568
+rect 1160 518 1194 534
+rect 1160 483 1194 484
+rect 742 231 776 284
+rect 996 251 1030 301
+rect 1064 449 1160 483
+rect 1359 518 1393 534
+rect 1359 483 1393 484
+rect 1064 335 1098 449
+rect 1427 403 1461 568
+rect 1240 369 1256 403
+rect 1290 369 1306 403
+rect 1373 369 1461 403
+rect 1502 518 1536 534
+rect 1373 335 1407 369
+rect 1144 301 1160 335
+rect 1194 301 1407 335
+rect 1502 335 1536 484
+rect 1570 432 1604 523
+rect 1570 416 1638 432
+rect 1570 382 1588 416
+rect 1622 382 1638 416
+rect 1735 403 1769 673
+rect 1839 949 1873 965
+rect 1839 557 1873 605
+rect 1925 949 1959 1049
+rect 1925 589 1959 605
+rect 2011 949 2045 965
+rect 2011 583 2045 597
+rect 2011 549 2068 583
+rect 1839 518 1873 523
+rect 1839 484 1990 518
+rect 1956 444 1990 484
+rect 1672 369 1859 403
+rect 1893 369 1909 403
+rect 1672 347 1706 369
+rect 1635 313 1706 347
+rect 1956 335 1990 410
+rect 1064 285 1098 301
+rect 121 115 155 131
+rect 227 165 261 181
+rect 227 61 261 131
+rect 325 115 359 131
+rect 483 215 517 231
+rect 483 61 517 131
+rect 587 215 621 231
+rect 742 215 813 231
+rect 996 217 1163 251
+rect 742 197 745 215
+rect 587 61 621 131
+rect 1095 215 1163 217
+rect 745 115 813 131
+rect 937 165 971 181
+rect 937 61 971 131
+rect 1095 115 1163 131
+rect 1287 215 1321 231
+rect 1287 61 1321 131
+rect 1373 215 1407 301
+rect 1373 115 1407 131
+rect 1477 215 1511 231
+rect 1477 61 1511 131
+rect 1635 215 1669 313
+rect 1839 301 1990 335
+rect 1739 257 1755 291
+rect 1789 257 1805 291
+rect 1839 215 1873 301
+rect 2034 268 2068 549
+rect 2011 234 2068 268
+rect 1635 115 1669 131
+rect 1733 165 1767 181
+rect 1733 61 1767 131
+rect 1839 115 1873 131
+rect 1925 215 1959 231
+rect 1925 61 1959 131
+rect 2011 215 2045 234
+rect 2011 115 2045 131
+rect 0 17 50 61
+rect 84 17 186 61
+rect 220 17 322 61
+rect 356 17 458 61
+rect 492 17 594 61
+rect 628 17 730 61
+rect 764 17 866 61
+rect 900 17 1002 61
+rect 1036 17 1138 61
+rect 1172 17 1274 61
+rect 1308 17 1410 61
+rect 1444 17 1546 61
+rect 1580 17 1682 61
+rect 1716 17 1818 61
+rect 1852 17 1954 61
+rect 1988 17 2090 61
+rect 0 0 2090 17
+<< viali >>
+rect 50 1083 84 1093
+rect 50 1059 84 1083
+rect 186 1083 220 1093
+rect 186 1059 220 1083
+rect 322 1083 356 1093
+rect 322 1059 356 1083
+rect 458 1083 492 1093
+rect 458 1059 492 1083
+rect 594 1083 628 1093
+rect 594 1059 628 1083
+rect 730 1083 764 1093
+rect 730 1059 764 1083
+rect 866 1083 900 1093
+rect 866 1059 900 1083
+rect 1002 1083 1036 1093
+rect 1002 1059 1036 1083
+rect 1138 1083 1172 1093
+rect 1138 1059 1172 1083
+rect 1274 1083 1308 1093
+rect 1274 1059 1308 1083
+rect 1410 1083 1444 1093
+rect 1410 1059 1444 1083
+rect 1546 1083 1580 1093
+rect 1546 1059 1580 1083
+rect 1682 1083 1716 1093
+rect 1682 1059 1716 1083
+rect 1818 1083 1852 1093
+rect 1818 1059 1852 1083
+rect 1954 1083 1988 1093
+rect 1954 1059 1988 1083
+rect 47 597 81 631
+rect 325 523 359 557
+rect 325 301 359 335
+rect 229 257 263 261
+rect 229 227 263 257
+rect 714 449 748 483
+rect 642 375 676 409
+rect 910 301 928 335
+rect 928 301 944 335
+rect 996 301 1030 335
+rect 1160 449 1194 483
+rect 1359 449 1393 483
+rect 1256 369 1290 403
+rect 1570 523 1604 557
+rect 2011 605 2045 631
+rect 2011 597 2045 605
+rect 1839 523 1873 557
+rect 1859 369 1893 403
+rect 1502 301 1536 335
+rect 1755 257 1789 261
+rect 1755 227 1789 257
+rect 50 27 84 51
+rect 50 17 84 27
+rect 186 27 220 51
+rect 186 17 220 27
+rect 322 27 356 51
+rect 322 17 356 27
+rect 458 27 492 51
+rect 458 17 492 27
+rect 594 27 628 51
+rect 594 17 628 27
+rect 730 27 764 51
+rect 730 17 764 27
+rect 866 27 900 51
+rect 866 17 900 27
+rect 1002 27 1036 51
+rect 1002 17 1036 27
+rect 1138 27 1172 51
+rect 1138 17 1172 27
+rect 1274 27 1308 51
+rect 1274 17 1308 27
+rect 1410 27 1444 51
+rect 1410 17 1444 27
+rect 1546 27 1580 51
+rect 1546 17 1580 27
+rect 1682 27 1716 51
+rect 1682 17 1716 27
+rect 1818 27 1852 51
+rect 1818 17 1852 27
+rect 1954 27 1988 51
+rect 1954 17 1988 27
+<< metal1 >>
+rect 0 1093 2090 1110
+rect 0 1059 50 1093
+rect 84 1059 186 1093
+rect 220 1059 322 1093
+rect 356 1059 458 1093
+rect 492 1059 594 1093
+rect 628 1059 730 1093
+rect 764 1059 866 1093
+rect 900 1059 1002 1093
+rect 1036 1059 1138 1093
+rect 1172 1059 1274 1093
+rect 1308 1059 1410 1093
+rect 1444 1059 1546 1093
+rect 1580 1059 1682 1093
+rect 1716 1059 1818 1093
+rect 1852 1059 1954 1093
+rect 1988 1059 2090 1093
+rect 0 1049 2090 1059
+rect 35 631 93 637
+rect 1999 631 2057 637
+rect 35 597 47 631
+rect 81 597 127 631
+rect 1977 597 2011 631
+rect 2045 597 2057 631
+rect 35 591 93 597
+rect 1999 591 2057 597
+rect 313 557 371 563
+rect 1558 557 1616 563
+rect 1827 557 1885 563
+rect 313 523 325 557
+rect 359 523 1570 557
+rect 1604 523 1616 557
+rect 1804 523 1839 557
+rect 1873 523 1885 557
+rect 313 517 371 523
+rect 1558 517 1616 523
+rect 1827 517 1885 523
+rect 702 483 760 489
+rect 1148 483 1206 489
+rect 1347 483 1405 489
+rect 702 449 714 483
+rect 748 449 1160 483
+rect 1194 449 1359 483
+rect 1393 449 1405 483
+rect 702 443 760 449
+rect 1148 443 1206 449
+rect 1347 443 1405 449
+rect 630 409 688 415
+rect 630 375 642 409
+rect 676 375 710 409
+rect 1244 403 1302 409
+rect 1847 403 1905 409
+rect 630 369 688 375
+rect 1244 369 1256 403
+rect 1290 369 1859 403
+rect 1893 369 1905 403
+rect 1244 363 1302 369
+rect 1847 363 1905 369
+rect 313 335 371 341
+rect 898 335 956 341
+rect 313 301 325 335
+rect 359 301 910 335
+rect 944 301 956 335
+rect 313 295 371 301
+rect 898 295 956 301
+rect 984 335 1042 341
+rect 1490 335 1548 341
+rect 984 301 996 335
+rect 1030 301 1502 335
+rect 1536 301 1548 335
+rect 984 295 1042 301
+rect 1490 295 1548 301
+rect 217 261 275 267
+rect 1743 261 1801 267
+rect 217 227 229 261
+rect 263 227 1755 261
+rect 1789 227 1801 261
+rect 217 221 275 227
+rect 1743 221 1801 227
+rect 0 51 2090 61
+rect 0 17 50 51
+rect 84 17 186 51
+rect 220 17 322 51
+rect 356 17 458 51
+rect 492 17 594 51
+rect 628 17 730 51
+rect 764 17 866 51
+rect 900 17 1002 51
+rect 1036 17 1138 51
+rect 1172 17 1274 51
+rect 1308 17 1410 51
+rect 1444 17 1546 51
+rect 1580 17 1682 51
+rect 1716 17 1818 51
+rect 1852 17 1954 51
+rect 1988 17 2090 51
+rect 0 0 2090 17
+<< labels >>
+rlabel viali 659 392 659 392 1 D
+port 1 n
+rlabel viali 1376 466 1376 466 1 CK
+port 2 n
+rlabel viali 1857 540 1857 540 1 QN
+port 3 n
+rlabel viali 1587 540 1587 540 1 SN
+port 4 n
+rlabel viali 65 614 65 614 1 RN
+port 5 n
+rlabel viali 2028 614 2028 614 1 Q
+port 6 n
+rlabel viali 67 44 67 44 1 gnd
+rlabel viali 67 1066 67 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__dffsr_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__dffsr_l.mag
new file mode 100644
index 0000000..8fcb91e
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__dffsr_l.mag
@@ -0,0 +1,899 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007753
+<< checkpaint >>
+rect -1270 -242 3350 2379
+<< nwell >>
+rect -10 529 2090 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 272 115 302 219
+rect 370 115 400 263
+rect 442 115 472 263
+rect 632 115 662 263
+rect 704 115 734 263
+rect 824 115 854 263
+rect 896 115 926 263
+rect 982 115 1012 263
+rect 1054 115 1084 263
+rect 1174 115 1204 263
+rect 1246 115 1276 263
+rect 1332 115 1362 263
+rect 1522 115 1552 263
+rect 1594 115 1624 263
+rect 1692 115 1722 219
+rect 1884 115 1914 219
+rect 1970 115 2000 219
+<< pmos >>
+rect 80 565 110 965
+rect 270 565 300 965
+rect 356 565 386 965
+rect 442 565 472 965
+rect 632 565 662 965
+rect 704 565 734 965
+rect 824 565 854 965
+rect 896 565 926 965
+rect 982 565 1012 965
+rect 1054 565 1084 965
+rect 1174 565 1204 965
+rect 1246 565 1276 965
+rect 1332 565 1362 965
+rect 1522 565 1552 965
+rect 1608 565 1638 965
+rect 1694 565 1724 965
+rect 1884 713 1914 965
+rect 1970 713 2000 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 163 263
+rect 317 219 370 263
+rect 110 131 121 215
+rect 155 131 163 215
+rect 110 115 163 131
+rect 219 165 272 219
+rect 219 131 227 165
+rect 261 131 272 165
+rect 219 115 272 131
+rect 302 215 370 219
+rect 302 131 325 215
+rect 359 131 370 215
+rect 302 115 370 131
+rect 400 115 442 263
+rect 472 215 525 263
+rect 472 131 483 215
+rect 517 131 525 215
+rect 472 115 525 131
+rect 579 215 632 263
+rect 579 131 587 215
+rect 621 131 632 215
+rect 579 115 632 131
+rect 662 115 704 263
+rect 734 215 824 263
+rect 734 131 745 215
+rect 813 131 824 215
+rect 734 115 824 131
+rect 854 115 896 263
+rect 926 165 982 263
+rect 926 131 937 165
+rect 971 131 982 165
+rect 926 115 982 131
+rect 1012 115 1054 263
+rect 1084 215 1174 263
+rect 1084 131 1095 215
+rect 1163 131 1174 215
+rect 1084 115 1174 131
+rect 1204 115 1246 263
+rect 1276 215 1332 263
+rect 1276 131 1287 215
+rect 1321 131 1332 215
+rect 1276 115 1332 131
+rect 1362 215 1415 263
+rect 1362 131 1373 215
+rect 1407 131 1415 215
+rect 1362 115 1415 131
+rect 1469 215 1522 263
+rect 1469 131 1477 215
+rect 1511 131 1522 215
+rect 1469 115 1522 131
+rect 1552 115 1594 263
+rect 1624 219 1677 263
+rect 1624 215 1692 219
+rect 1624 131 1635 215
+rect 1669 131 1692 215
+rect 1624 115 1692 131
+rect 1722 165 1775 219
+rect 1722 131 1733 165
+rect 1767 131 1775 165
+rect 1722 115 1775 131
+rect 1831 165 1884 219
+rect 1831 131 1839 165
+rect 1873 131 1884 165
+rect 1831 115 1884 131
+rect 1914 165 1970 219
+rect 1914 131 1925 165
+rect 1959 131 1970 165
+rect 1914 115 1970 131
+rect 2000 165 2053 219
+rect 2000 131 2011 165
+rect 2045 131 2053 165
+rect 2000 115 2053 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 741 35 949
+rect 69 741 80 949
+rect 27 565 80 741
+rect 110 949 163 965
+rect 110 605 121 949
+rect 155 605 163 949
+rect 110 565 163 605
+rect 217 949 270 965
+rect 217 673 225 949
+rect 259 673 270 949
+rect 217 565 270 673
+rect 300 949 356 965
+rect 300 673 311 949
+rect 345 673 356 949
+rect 300 565 356 673
+rect 386 949 442 965
+rect 386 741 397 949
+rect 431 741 442 949
+rect 386 565 442 741
+rect 472 949 525 965
+rect 472 673 483 949
+rect 517 673 525 949
+rect 472 565 525 673
+rect 579 949 632 965
+rect 579 673 587 949
+rect 621 673 632 949
+rect 579 565 632 673
+rect 662 565 704 965
+rect 734 949 824 965
+rect 734 605 745 949
+rect 813 605 824 949
+rect 734 565 824 605
+rect 854 565 896 965
+rect 926 949 982 965
+rect 926 673 937 949
+rect 971 673 982 949
+rect 926 565 982 673
+rect 1012 565 1054 965
+rect 1084 949 1174 965
+rect 1084 673 1095 949
+rect 1163 673 1174 949
+rect 1084 565 1174 673
+rect 1204 565 1246 965
+rect 1276 949 1332 965
+rect 1276 605 1287 949
+rect 1321 605 1332 949
+rect 1276 565 1332 605
+rect 1362 949 1415 965
+rect 1362 605 1373 949
+rect 1407 605 1415 949
+rect 1362 565 1415 605
+rect 1469 949 1522 965
+rect 1469 673 1477 949
+rect 1511 673 1522 949
+rect 1469 565 1522 673
+rect 1552 949 1608 965
+rect 1552 741 1563 949
+rect 1597 741 1608 949
+rect 1552 565 1608 741
+rect 1638 949 1694 965
+rect 1638 673 1649 949
+rect 1683 673 1694 949
+rect 1638 565 1694 673
+rect 1724 949 1777 965
+rect 1724 673 1735 949
+rect 1769 673 1777 949
+rect 1831 949 1884 965
+rect 1831 809 1839 949
+rect 1873 809 1884 949
+rect 1831 713 1884 809
+rect 1914 949 1970 965
+rect 1914 809 1925 949
+rect 1959 809 1970 949
+rect 1914 713 1970 809
+rect 2000 949 2053 965
+rect 2000 809 2011 949
+rect 2045 809 2053 949
+rect 2000 713 2053 809
+rect 1724 565 1777 673
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 227 131 261 165
+rect 325 131 359 215
+rect 483 131 517 215
+rect 587 131 621 215
+rect 745 131 813 215
+rect 937 131 971 165
+rect 1095 131 1163 215
+rect 1287 131 1321 215
+rect 1373 131 1407 215
+rect 1477 131 1511 215
+rect 1635 131 1669 215
+rect 1733 131 1767 165
+rect 1839 131 1873 165
+rect 1925 131 1959 165
+rect 2011 131 2045 165
+<< pdiffc >>
+rect 35 741 69 949
+rect 121 605 155 949
+rect 225 673 259 949
+rect 311 673 345 949
+rect 397 741 431 949
+rect 483 673 517 949
+rect 587 673 621 949
+rect 745 605 813 949
+rect 937 673 971 949
+rect 1095 673 1163 949
+rect 1287 605 1321 949
+rect 1373 605 1407 949
+rect 1477 673 1511 949
+rect 1563 741 1597 949
+rect 1649 673 1683 949
+rect 1735 673 1769 949
+rect 1839 809 1873 949
+rect 1925 809 1959 949
+rect 2011 809 2045 949
+<< psubdiff >>
+rect 26 27 50 61
+rect 84 27 108 61
+rect 162 27 186 61
+rect 220 27 244 61
+rect 298 27 322 61
+rect 356 27 380 61
+rect 434 27 458 61
+rect 492 27 516 61
+rect 570 27 594 61
+rect 628 27 652 61
+rect 706 27 730 61
+rect 764 27 788 61
+rect 842 27 866 61
+rect 900 27 924 61
+rect 978 27 1002 61
+rect 1036 27 1060 61
+rect 1114 27 1138 61
+rect 1172 27 1196 61
+rect 1250 27 1274 61
+rect 1308 27 1332 61
+rect 1386 27 1410 61
+rect 1444 27 1468 61
+rect 1522 27 1546 61
+rect 1580 27 1604 61
+rect 1658 27 1682 61
+rect 1716 27 1740 61
+rect 1794 27 1818 61
+rect 1852 27 1876 61
+rect 1930 27 1954 61
+rect 1988 27 2012 61
+<< nsubdiff >>
+rect 26 1049 50 1083
+rect 84 1049 108 1083
+rect 162 1049 186 1083
+rect 220 1049 244 1083
+rect 298 1049 322 1083
+rect 356 1049 380 1083
+rect 434 1049 458 1083
+rect 492 1049 516 1083
+rect 570 1049 594 1083
+rect 628 1049 652 1083
+rect 706 1049 730 1083
+rect 764 1049 788 1083
+rect 842 1049 866 1083
+rect 900 1049 924 1083
+rect 978 1049 1002 1083
+rect 1036 1049 1060 1083
+rect 1114 1049 1138 1083
+rect 1172 1049 1196 1083
+rect 1250 1049 1274 1083
+rect 1308 1049 1332 1083
+rect 1386 1049 1410 1083
+rect 1444 1049 1468 1083
+rect 1522 1049 1546 1083
+rect 1580 1049 1604 1083
+rect 1658 1049 1682 1083
+rect 1716 1049 1740 1083
+rect 1794 1049 1818 1083
+rect 1852 1049 1876 1083
+rect 1930 1049 1954 1083
+rect 1988 1049 2012 1083
+<< psubdiffcont >>
+rect 50 27 84 61
+rect 186 27 220 61
+rect 322 27 356 61
+rect 458 27 492 61
+rect 594 27 628 61
+rect 730 27 764 61
+rect 866 27 900 61
+rect 1002 27 1036 61
+rect 1138 27 1172 61
+rect 1274 27 1308 61
+rect 1410 27 1444 61
+rect 1546 27 1580 61
+rect 1682 27 1716 61
+rect 1818 27 1852 61
+rect 1954 27 1988 61
+<< nsubdiffcont >>
+rect 50 1049 84 1083
+rect 186 1049 220 1083
+rect 322 1049 356 1083
+rect 458 1049 492 1083
+rect 594 1049 628 1083
+rect 730 1049 764 1083
+rect 866 1049 900 1083
+rect 1002 1049 1036 1083
+rect 1138 1049 1172 1083
+rect 1274 1049 1308 1083
+rect 1410 1049 1444 1083
+rect 1546 1049 1580 1083
+rect 1682 1049 1716 1083
+rect 1818 1049 1852 1083
+rect 1954 1049 1988 1083
+<< poly >>
+rect 80 965 110 991
+rect 270 965 300 991
+rect 356 965 386 991
+rect 442 965 472 991
+rect 632 965 662 991
+rect 704 965 734 991
+rect 824 965 854 991
+rect 896 965 926 991
+rect 982 965 1012 991
+rect 1054 965 1084 991
+rect 1174 965 1204 991
+rect 1246 965 1276 991
+rect 1332 965 1362 991
+rect 1522 965 1552 991
+rect 1608 965 1638 991
+rect 1694 965 1724 991
+rect 1884 965 1914 991
+rect 1970 965 2000 991
+rect 80 442 110 565
+rect 270 527 300 565
+rect 243 497 300 527
+rect 79 426 133 442
+rect 79 392 89 426
+rect 123 392 133 426
+rect 79 376 133 392
+rect 79 375 110 376
+rect 80 263 110 375
+rect 243 307 273 497
+rect 356 455 386 565
+rect 442 534 472 565
+rect 432 518 486 534
+rect 432 484 442 518
+rect 476 484 486 518
+rect 432 468 486 484
+rect 315 439 386 455
+rect 315 405 325 439
+rect 359 405 386 439
+rect 315 389 386 405
+rect 219 291 273 307
+rect 356 333 386 389
+rect 356 303 400 333
+rect 219 257 229 291
+rect 263 271 273 291
+rect 263 257 302 271
+rect 370 263 400 303
+rect 442 263 472 468
+rect 632 425 662 565
+rect 704 534 734 565
+rect 704 518 758 534
+rect 704 484 714 518
+rect 748 484 758 518
+rect 704 468 758 484
+rect 632 409 686 425
+rect 824 423 854 565
+rect 896 528 926 565
+rect 982 528 1012 565
+rect 896 518 1012 528
+rect 896 484 928 518
+rect 962 484 1012 518
+rect 896 474 1012 484
+rect 1054 423 1084 565
+rect 1174 534 1204 565
+rect 1150 518 1204 534
+rect 1150 484 1160 518
+rect 1194 484 1204 518
+rect 1150 468 1204 484
+rect 632 375 642 409
+rect 676 375 686 409
+rect 632 359 686 375
+rect 728 393 1180 423
+rect 632 263 662 359
+rect 728 315 758 393
+rect 1150 351 1180 393
+rect 1246 419 1276 565
+rect 1332 534 1362 565
+rect 1332 518 1403 534
+rect 1522 528 1552 565
+rect 1332 504 1359 518
+rect 1343 484 1359 504
+rect 1393 484 1403 518
+rect 1343 468 1403 484
+rect 1486 518 1552 528
+rect 1486 484 1502 518
+rect 1536 484 1552 518
+rect 1486 474 1552 484
+rect 1246 403 1300 419
+rect 1246 369 1256 403
+rect 1290 369 1300 403
+rect 1246 353 1300 369
+rect 704 285 758 315
+rect 800 335 854 351
+rect 800 301 810 335
+rect 844 301 854 335
+rect 800 285 854 301
+rect 704 263 734 285
+rect 824 263 854 285
+rect 896 335 1012 345
+rect 896 301 928 335
+rect 962 301 1012 335
+rect 896 291 1012 301
+rect 896 263 926 291
+rect 982 263 1012 291
+rect 1054 335 1108 351
+rect 1054 301 1064 335
+rect 1098 301 1108 335
+rect 1054 285 1108 301
+rect 1150 335 1204 351
+rect 1150 301 1160 335
+rect 1194 301 1204 335
+rect 1150 285 1204 301
+rect 1054 263 1084 285
+rect 1174 263 1204 285
+rect 1246 263 1276 353
+rect 1343 315 1373 468
+rect 1332 285 1373 315
+rect 1486 318 1516 474
+rect 1608 432 1638 565
+rect 1694 527 1724 565
+rect 1884 549 1914 713
+rect 1694 497 1775 527
+rect 1576 416 1638 432
+rect 1576 382 1588 416
+rect 1622 382 1638 416
+rect 1576 366 1638 382
+rect 1486 286 1552 318
+rect 1332 263 1362 285
+rect 1522 263 1552 286
+rect 1594 263 1624 366
+rect 1745 307 1775 497
+rect 1874 519 1914 549
+rect 1874 419 1904 519
+rect 1970 460 2000 713
+rect 1849 403 1904 419
+rect 1849 369 1859 403
+rect 1893 369 1904 403
+rect 1946 444 2000 460
+rect 1946 410 1956 444
+rect 1990 410 2000 444
+rect 1946 394 2000 410
+rect 1849 353 1904 369
+rect 1874 308 1904 353
+rect 1745 291 1799 307
+rect 1745 271 1755 291
+rect 219 241 302 257
+rect 272 219 302 241
+rect 1692 257 1755 271
+rect 1789 257 1799 291
+rect 1874 278 1914 308
+rect 1692 241 1799 257
+rect 1692 219 1722 241
+rect 1884 219 1914 278
+rect 1970 219 2000 394
+rect 80 89 110 115
+rect 272 89 302 115
+rect 370 89 400 115
+rect 442 89 472 115
+rect 632 89 662 115
+rect 704 89 734 115
+rect 824 89 854 115
+rect 896 89 926 115
+rect 982 89 1012 115
+rect 1054 89 1084 115
+rect 1174 89 1204 115
+rect 1246 89 1276 115
+rect 1332 89 1362 115
+rect 1522 89 1552 115
+rect 1594 89 1624 115
+rect 1692 89 1722 115
+rect 1884 89 1914 115
+rect 1970 89 2000 115
+<< polycont >>
+rect 89 392 123 426
+rect 442 484 476 518
+rect 325 405 359 439
+rect 229 257 263 291
+rect 714 484 748 518
+rect 928 484 962 518
+rect 1160 484 1194 518
+rect 642 375 676 409
+rect 1359 484 1393 518
+rect 1502 484 1536 518
+rect 1256 369 1290 403
+rect 810 301 844 335
+rect 928 301 962 335
+rect 1064 301 1098 335
+rect 1160 301 1194 335
+rect 1588 382 1622 416
+rect 1859 369 1893 403
+rect 1956 410 1990 444
+rect 1755 257 1789 291
+<< locali >>
+rect 0 1093 2090 1110
+rect 0 1049 50 1093
+rect 84 1049 186 1093
+rect 220 1049 322 1093
+rect 356 1049 458 1093
+rect 492 1049 594 1093
+rect 628 1049 730 1093
+rect 764 1049 866 1093
+rect 900 1049 1002 1093
+rect 1036 1049 1138 1093
+rect 1172 1049 1274 1093
+rect 1308 1049 1410 1093
+rect 1444 1049 1546 1093
+rect 1580 1049 1682 1093
+rect 1716 1049 1818 1093
+rect 1852 1049 1954 1093
+rect 1988 1049 2090 1093
+rect 35 949 69 1049
+rect 35 725 69 741
+rect 121 949 155 965
+rect 47 442 81 597
+rect 121 513 155 605
+rect 225 949 259 965
+rect 121 479 191 513
+rect 47 426 123 442
+rect 47 392 89 426
+rect 89 376 123 392
+rect 157 291 191 479
+rect 225 369 259 673
+rect 311 949 345 965
+rect 397 949 431 1049
+rect 397 725 431 741
+rect 483 949 517 965
+rect 345 673 483 691
+rect 311 657 517 673
+rect 587 949 621 1049
+rect 587 657 621 673
+rect 745 949 813 965
+rect 937 949 971 1049
+rect 937 657 971 673
+rect 1095 949 1163 965
+rect 813 605 816 623
+rect 745 602 816 605
+rect 1095 602 1163 673
+rect 442 568 816 602
+rect 996 568 1163 602
+rect 1287 949 1321 1049
+rect 1287 589 1321 605
+rect 1373 949 1407 965
+rect 1477 949 1511 965
+rect 1563 949 1597 1049
+rect 1563 725 1597 741
+rect 1649 949 1683 965
+rect 1511 673 1649 691
+rect 1477 657 1683 673
+rect 1735 949 1769 965
+rect 1373 602 1407 605
+rect 1373 568 1461 602
+rect 325 439 359 523
+rect 442 518 476 568
+rect 309 405 325 439
+rect 359 405 375 439
+rect 225 335 359 369
+rect 121 257 229 291
+rect 263 257 279 291
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 257
+rect 325 215 359 301
+rect 442 318 476 484
+rect 714 518 748 534
+rect 714 483 748 484
+rect 928 518 962 534
+rect 748 449 844 483
+rect 642 409 676 425
+rect 642 359 676 375
+rect 810 335 844 449
+rect 928 335 962 484
+rect 442 284 776 318
+rect 810 285 844 301
+rect 928 285 962 301
+rect 996 335 1030 568
+rect 1160 518 1194 534
+rect 1160 483 1194 484
+rect 742 231 776 284
+rect 996 251 1030 301
+rect 1064 449 1160 483
+rect 1359 518 1393 534
+rect 1359 483 1393 484
+rect 1064 335 1098 449
+rect 1427 403 1461 568
+rect 1240 369 1256 403
+rect 1290 369 1306 403
+rect 1373 369 1461 403
+rect 1502 518 1536 534
+rect 1373 335 1407 369
+rect 1144 301 1160 335
+rect 1194 301 1407 335
+rect 1502 335 1536 484
+rect 1570 432 1604 523
+rect 1570 416 1638 432
+rect 1570 382 1588 416
+rect 1622 382 1638 416
+rect 1735 403 1769 673
+rect 1839 949 1873 965
+rect 1839 557 1873 809
+rect 1925 949 1959 1049
+rect 1925 793 1959 809
+rect 2011 949 2045 965
+rect 2011 631 2045 809
+rect 2044 614 2045 631
+rect 2044 597 2068 614
+rect 2011 580 2068 597
+rect 1839 518 1873 523
+rect 1839 484 1990 518
+rect 1956 444 1990 484
+rect 1672 369 1859 403
+rect 1893 369 1909 403
+rect 1672 347 1706 369
+rect 1635 313 1706 347
+rect 1956 335 1990 410
+rect 1064 285 1098 301
+rect 121 115 155 131
+rect 227 165 261 181
+rect 227 61 261 131
+rect 325 115 359 131
+rect 483 215 517 231
+rect 483 61 517 131
+rect 587 215 621 231
+rect 742 215 813 231
+rect 996 217 1163 251
+rect 742 197 745 215
+rect 587 61 621 131
+rect 1095 215 1163 217
+rect 745 115 813 131
+rect 937 165 971 181
+rect 937 61 971 131
+rect 1095 115 1163 131
+rect 1287 215 1321 231
+rect 1287 61 1321 131
+rect 1373 215 1407 301
+rect 1373 115 1407 131
+rect 1477 215 1511 231
+rect 1477 61 1511 131
+rect 1635 215 1669 313
+rect 1839 301 1990 335
+rect 1739 257 1755 291
+rect 1789 257 1805 291
+rect 1635 115 1669 131
+rect 1733 165 1767 181
+rect 1733 61 1767 131
+rect 1839 165 1873 301
+rect 2034 268 2068 580
+rect 2011 234 2068 268
+rect 1839 115 1873 131
+rect 1925 165 1959 181
+rect 1925 61 1959 131
+rect 2011 165 2045 234
+rect 2011 115 2045 131
+rect 0 17 50 61
+rect 84 17 186 61
+rect 220 17 322 61
+rect 356 17 458 61
+rect 492 17 594 61
+rect 628 17 730 61
+rect 764 17 866 61
+rect 900 17 1002 61
+rect 1036 17 1138 61
+rect 1172 17 1274 61
+rect 1308 17 1410 61
+rect 1444 17 1546 61
+rect 1580 17 1682 61
+rect 1716 17 1818 61
+rect 1852 17 1954 61
+rect 1988 17 2090 61
+rect 0 0 2090 17
+<< viali >>
+rect 50 1083 84 1093
+rect 50 1059 84 1083
+rect 186 1083 220 1093
+rect 186 1059 220 1083
+rect 322 1083 356 1093
+rect 322 1059 356 1083
+rect 458 1083 492 1093
+rect 458 1059 492 1083
+rect 594 1083 628 1093
+rect 594 1059 628 1083
+rect 730 1083 764 1093
+rect 730 1059 764 1083
+rect 866 1083 900 1093
+rect 866 1059 900 1083
+rect 1002 1083 1036 1093
+rect 1002 1059 1036 1083
+rect 1138 1083 1172 1093
+rect 1138 1059 1172 1083
+rect 1274 1083 1308 1093
+rect 1274 1059 1308 1083
+rect 1410 1083 1444 1093
+rect 1410 1059 1444 1083
+rect 1546 1083 1580 1093
+rect 1546 1059 1580 1083
+rect 1682 1083 1716 1093
+rect 1682 1059 1716 1083
+rect 1818 1083 1852 1093
+rect 1818 1059 1852 1083
+rect 1954 1083 1988 1093
+rect 1954 1059 1988 1083
+rect 47 597 81 631
+rect 325 523 359 557
+rect 325 301 359 335
+rect 229 257 263 261
+rect 229 227 263 257
+rect 714 449 748 483
+rect 642 375 676 409
+rect 910 301 928 335
+rect 928 301 944 335
+rect 996 301 1030 335
+rect 1160 449 1194 483
+rect 1359 449 1393 483
+rect 1256 369 1290 403
+rect 1570 523 1604 557
+rect 2010 597 2044 631
+rect 1839 523 1873 557
+rect 1859 369 1893 403
+rect 1502 301 1536 335
+rect 1755 257 1789 261
+rect 1755 227 1789 257
+rect 50 27 84 51
+rect 50 17 84 27
+rect 186 27 220 51
+rect 186 17 220 27
+rect 322 27 356 51
+rect 322 17 356 27
+rect 458 27 492 51
+rect 458 17 492 27
+rect 594 27 628 51
+rect 594 17 628 27
+rect 730 27 764 51
+rect 730 17 764 27
+rect 866 27 900 51
+rect 866 17 900 27
+rect 1002 27 1036 51
+rect 1002 17 1036 27
+rect 1138 27 1172 51
+rect 1138 17 1172 27
+rect 1274 27 1308 51
+rect 1274 17 1308 27
+rect 1410 27 1444 51
+rect 1410 17 1444 27
+rect 1546 27 1580 51
+rect 1546 17 1580 27
+rect 1682 27 1716 51
+rect 1682 17 1716 27
+rect 1818 27 1852 51
+rect 1818 17 1852 27
+rect 1954 27 1988 51
+rect 1954 17 1988 27
+<< metal1 >>
+rect 0 1093 2090 1110
+rect 0 1059 50 1093
+rect 84 1059 186 1093
+rect 220 1059 322 1093
+rect 356 1059 458 1093
+rect 492 1059 594 1093
+rect 628 1059 730 1093
+rect 764 1059 866 1093
+rect 900 1059 1002 1093
+rect 1036 1059 1138 1093
+rect 1172 1059 1274 1093
+rect 1308 1059 1410 1093
+rect 1444 1059 1546 1093
+rect 1580 1059 1682 1093
+rect 1716 1059 1818 1093
+rect 1852 1059 1954 1093
+rect 1988 1059 2090 1093
+rect 0 1049 2090 1059
+rect 35 631 93 637
+rect 1998 631 2056 637
+rect 35 597 47 631
+rect 81 597 127 631
+rect 1976 597 2010 631
+rect 2044 597 2056 631
+rect 35 591 93 597
+rect 1998 591 2056 597
+rect 313 557 371 563
+rect 1558 557 1616 563
+rect 1827 557 1885 563
+rect 313 523 325 557
+rect 359 523 1570 557
+rect 1604 523 1616 557
+rect 1804 523 1839 557
+rect 1873 523 1885 557
+rect 313 517 371 523
+rect 1558 517 1616 523
+rect 1827 517 1885 523
+rect 702 483 760 489
+rect 1148 483 1206 489
+rect 1347 483 1405 489
+rect 702 449 714 483
+rect 748 449 1160 483
+rect 1194 449 1359 483
+rect 1393 449 1405 483
+rect 702 443 760 449
+rect 1148 443 1206 449
+rect 1347 443 1405 449
+rect 630 409 688 415
+rect 630 375 642 409
+rect 676 375 710 409
+rect 1244 403 1302 409
+rect 1847 403 1905 409
+rect 630 369 688 375
+rect 1244 369 1256 403
+rect 1290 369 1859 403
+rect 1893 369 1905 403
+rect 1244 363 1302 369
+rect 1847 363 1905 369
+rect 313 335 371 341
+rect 898 335 956 341
+rect 313 301 325 335
+rect 359 301 910 335
+rect 944 301 956 335
+rect 313 295 371 301
+rect 898 295 956 301
+rect 984 335 1042 341
+rect 1490 335 1548 341
+rect 984 301 996 335
+rect 1030 301 1502 335
+rect 1536 301 1548 335
+rect 984 295 1042 301
+rect 1490 295 1548 301
+rect 217 261 275 267
+rect 1743 261 1801 267
+rect 217 227 229 261
+rect 263 227 1755 261
+rect 1789 227 1801 261
+rect 217 221 275 227
+rect 1743 221 1801 227
+rect 0 51 2090 61
+rect 0 17 50 51
+rect 84 17 186 51
+rect 220 17 322 51
+rect 356 17 458 51
+rect 492 17 594 51
+rect 628 17 730 51
+rect 764 17 866 51
+rect 900 17 1002 51
+rect 1036 17 1138 51
+rect 1172 17 1274 51
+rect 1308 17 1410 51
+rect 1444 17 1546 51
+rect 1580 17 1682 51
+rect 1716 17 1818 51
+rect 1852 17 1954 51
+rect 1988 17 2090 51
+rect 0 0 2090 17
+<< labels >>
+rlabel viali 659 392 659 392 1 D
+port 1 n
+rlabel viali 1376 466 1376 466 1 CK
+port 2 n
+rlabel viali 1857 540 1857 540 1 QN
+port 3 n
+rlabel viali 2027 614 2027 614 1 Q
+port 4 n
+rlabel viali 1587 540 1587 540 1 SN
+port 5 n
+rlabel viali 65 614 65 614 1 RN
+port 6 n
+rlabel viali 67 44 67 44 1 gnd
+rlabel viali 67 1066 67 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__fill_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__fill_1.mag
new file mode 100644
index 0000000..8d445b8
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__fill_1.mag
@@ -0,0 +1,24 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007753
+<< checkpaint >>
+rect -1274 2461 1301 2601
+rect -1760 -1129 6260 2461
+rect -1274 -1260 1301 -1129
+<< error_p >>
+rect 0 1271 34 1332
+rect 41 581 154 1341
+rect 0 0 34 61
+<< nwell >>
+rect -14 529 41 1119
+<< locali >>
+rect 0 1049 22 1110
+rect 0 0 22 61
+<< metal1 >>
+rect 0 1049 22 1110
+rect 0 0 22 61
+<< labels >>
+rlabel metal1 11 28 11 28 1 gnd
+rlabel metal1 11 1077 11 1077 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__fill_16.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__fill_16.mag
new file mode 100644
index 0000000..83c32da
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__fill_16.mag
@@ -0,0 +1,20 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007753
+<< checkpaint >>
+rect -1269 2461 1615 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1615 -1129
+<< nwell >>
+rect -9 529 355 1119
+<< locali >>
+rect 0 1049 352 1110
+rect 0 0 352 61
+<< metal1 >>
+rect 0 1049 352 1110
+rect 0 0 352 61
+<< labels >>
+rlabel metal1 196 30 196 30 1 gnd
+rlabel metal1 199 1078 199 1078 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__fill_2.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__fill_2.mag
new file mode 100644
index 0000000..bde58ab
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__fill_2.mag
@@ -0,0 +1,24 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007754
+<< checkpaint >>
+rect -1267 2461 1310 2601
+rect -1760 -1129 6260 2461
+rect -1267 -1260 1310 -1129
+<< error_p >>
+rect 0 1271 44 1332
+rect 50 581 161 1341
+rect 0 0 44 61
+<< nwell >>
+rect -7 529 50 1119
+<< locali >>
+rect 0 1049 44 1110
+rect 0 0 44 61
+<< metal1 >>
+rect 0 1049 44 1110
+rect 0 0 44 61
+<< labels >>
+rlabel metal1 23 28 23 28 1 gnd
+rlabel metal1 22 1078 22 1078 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__fill_32.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__fill_32.mag
new file mode 100644
index 0000000..4cf67de
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__fill_32.mag
@@ -0,0 +1,20 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007754
+<< checkpaint >>
+rect -1269 2461 1967 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1967 -1129
+<< nwell >>
+rect -9 529 707 1119
+<< locali >>
+rect 0 1049 704 1110
+rect 0 0 704 61
+<< metal1 >>
+rect 0 1049 704 1110
+rect 0 0 704 61
+<< labels >>
+rlabel metal1 363 26 363 26 1 gnd
+rlabel metal1 374 1076 374 1076 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__fill_4.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__fill_4.mag
new file mode 100644
index 0000000..8b2fb75
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__fill_4.mag
@@ -0,0 +1,22 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007754
+<< checkpaint >>
+rect -1269 2461 1356 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1356 -1129
+<< error_p >>
+rect 96 581 159 1341
+<< nwell >>
+rect -9 529 96 1119
+<< locali >>
+rect 0 1049 88 1110
+rect 0 0 88 61
+<< metal1 >>
+rect 0 1049 88 1110
+rect 0 0 88 61
+<< labels >>
+rlabel metal1 71 28 71 28 1 gnd
+rlabel metal1 72 1079 72 1079 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__fill_8.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__fill_8.mag
new file mode 100644
index 0000000..2d49aaa
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__fill_8.mag
@@ -0,0 +1,20 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007754
+<< checkpaint >>
+rect -1269 2461 1439 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1439 -1129
+<< nwell >>
+rect -9 529 179 1119
+<< locali >>
+rect 0 1049 176 1110
+rect 0 0 176 61
+<< metal1 >>
+rect 0 1049 176 1110
+rect 0 0 176 61
+<< labels >>
+rlabel metal1 112 28 112 28 1 gnd
+rlabel metal1 111 1081 111 1081 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_1.mag
new file mode 100644
index 0000000..a6305de
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_1.mag
@@ -0,0 +1,115 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007755
+<< checkpaint >>
+rect -1269 2461 1459 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1459 -1129
+<< nwell >>
+rect -9 529 199 1119
+<< nmoslvt >>
+rect 80 115 110 263
+<< pmos >>
+rect 80 565 110 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 163 263
+rect 110 131 121 215
+rect 155 131 163 215
+rect 110 115 163 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 741 35 949
+rect 69 741 80 949
+rect 27 565 80 741
+rect 110 949 163 965
+rect 110 605 121 949
+rect 155 605 163 949
+rect 110 565 163 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+<< pdiffc >>
+rect 35 741 69 949
+rect 121 605 155 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+<< poly >>
+rect 80 965 110 991
+rect 80 442 110 565
+rect 80 426 134 442
+rect 80 392 90 426
+rect 124 392 134 426
+rect 80 376 134 392
+rect 80 263 110 376
+rect 80 89 110 115
+<< polycont >>
+rect 90 392 124 426
+<< locali >>
+rect 0 1093 198 1110
+rect 0 1049 51 1093
+rect 85 1049 198 1093
+rect 35 949 69 1049
+rect 35 725 69 741
+rect 121 949 155 965
+rect 47 426 81 597
+rect 121 557 155 605
+rect 47 392 90 426
+rect 124 392 140 426
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 227
+rect 121 115 155 131
+rect 0 17 51 61
+rect 85 17 198 61
+rect 0 0 198 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 47 597 81 631
+rect 121 523 155 557
+rect 121 227 155 261
+rect 51 27 85 51
+rect 51 17 85 27
+<< metal1 >>
+rect 0 1093 198 1110
+rect 0 1059 51 1093
+rect 85 1059 198 1093
+rect 0 1049 198 1059
+rect 35 631 93 637
+rect 35 597 47 631
+rect 81 597 127 631
+rect 35 591 93 597
+rect 109 557 167 563
+rect 109 523 121 557
+rect 155 523 167 557
+rect 109 517 167 523
+rect 121 267 155 517
+rect 109 261 167 267
+rect 109 227 121 261
+rect 155 227 167 261
+rect 109 221 167 227
+rect 0 51 198 61
+rect 0 17 51 51
+rect 85 17 198 51
+rect 0 0 198 17
+<< labels >>
+rlabel metal1 151 389 151 389 1 Y
+port 1 n
+rlabel viali 64 614 64 614 1 A
+port 2 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_10.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_10.mag
new file mode 100644
index 0000000..c678cba
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_10.mag
@@ -0,0 +1,420 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007754
+<< checkpaint >>
+rect -1269 2461 2250 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 2250 -1129
+<< nwell >>
+rect -9 529 990 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+rect 596 115 626 263
+rect 682 115 712 263
+rect 768 115 798 263
+rect 854 115 884 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+rect 424 565 454 965
+rect 510 565 540 965
+rect 596 565 626 965
+rect 682 565 712 965
+rect 768 565 798 965
+rect 854 565 884 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 215 252 263
+rect 196 131 207 215
+rect 241 131 252 215
+rect 196 115 252 131
+rect 282 215 338 263
+rect 282 131 293 215
+rect 327 131 338 215
+rect 282 115 338 131
+rect 368 215 424 263
+rect 368 131 379 215
+rect 413 131 424 215
+rect 368 115 424 131
+rect 454 215 510 263
+rect 454 131 465 215
+rect 499 131 510 215
+rect 454 115 510 131
+rect 540 215 596 263
+rect 540 131 551 215
+rect 585 131 596 215
+rect 540 115 596 131
+rect 626 215 682 263
+rect 626 131 637 215
+rect 671 131 682 215
+rect 626 115 682 131
+rect 712 215 768 263
+rect 712 131 723 215
+rect 757 131 768 215
+rect 712 115 768 131
+rect 798 215 854 263
+rect 798 131 809 215
+rect 843 131 854 215
+rect 798 115 854 131
+rect 884 215 937 263
+rect 884 131 895 215
+rect 929 131 937 215
+rect 884 115 937 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 741 35 949
+rect 69 741 80 949
+rect 27 565 80 741
+rect 110 949 166 965
+rect 110 605 121 949
+rect 155 605 166 949
+rect 110 565 166 605
+rect 196 949 252 965
+rect 196 605 207 949
+rect 241 605 252 949
+rect 196 565 252 605
+rect 282 949 338 965
+rect 282 605 293 949
+rect 327 605 338 949
+rect 282 565 338 605
+rect 368 949 424 965
+rect 368 605 379 949
+rect 413 605 424 949
+rect 368 565 424 605
+rect 454 949 510 965
+rect 454 605 465 949
+rect 499 605 510 949
+rect 454 565 510 605
+rect 540 949 596 965
+rect 540 605 551 949
+rect 585 605 596 949
+rect 540 565 596 605
+rect 626 949 682 965
+rect 626 605 637 949
+rect 671 605 682 949
+rect 626 565 682 605
+rect 712 949 768 965
+rect 712 605 723 949
+rect 757 605 768 949
+rect 712 565 768 605
+rect 798 949 854 965
+rect 798 605 809 949
+rect 843 605 854 949
+rect 798 565 854 605
+rect 884 949 937 965
+rect 884 605 895 949
+rect 929 605 937 949
+rect 884 565 937 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 207 131 241 215
+rect 293 131 327 215
+rect 379 131 413 215
+rect 465 131 499 215
+rect 551 131 585 215
+rect 637 131 671 215
+rect 723 131 757 215
+rect 809 131 843 215
+rect 895 131 929 215
+<< pdiffc >>
+rect 35 741 69 949
+rect 121 605 155 949
+rect 207 605 241 949
+rect 293 605 327 949
+rect 379 605 413 949
+rect 465 605 499 949
+rect 551 605 585 949
+rect 637 605 671 949
+rect 723 605 757 949
+rect 809 605 843 949
+rect 895 605 929 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+rect 571 27 595 61
+rect 629 27 653 61
+rect 707 27 731 61
+rect 765 27 789 61
+rect 843 27 867 61
+rect 901 27 925 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+rect 571 1049 595 1083
+rect 629 1049 653 1083
+rect 707 1049 731 1083
+rect 765 1049 789 1083
+rect 843 1049 867 1083
+rect 901 1049 925 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+rect 595 27 629 61
+rect 731 27 765 61
+rect 867 27 901 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+rect 595 1049 629 1083
+rect 731 1049 765 1083
+rect 867 1049 901 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 338 965 368 991
+rect 424 965 454 991
+rect 510 965 540 991
+rect 596 965 626 991
+rect 682 965 712 991
+rect 768 965 798 991
+rect 854 965 884 991
+rect 80 540 110 565
+rect 166 540 196 565
+rect 252 540 282 565
+rect 338 540 368 565
+rect 424 540 454 565
+rect 510 540 540 565
+rect 596 540 626 565
+rect 682 540 712 565
+rect 768 540 798 565
+rect 854 540 884 565
+rect 80 510 884 540
+rect 80 442 110 510
+rect 80 426 134 442
+rect 80 392 90 426
+rect 124 392 134 426
+rect 80 376 134 392
+rect 80 318 110 376
+rect 424 318 454 510
+rect 80 288 884 318
+rect 80 263 110 288
+rect 166 263 196 288
+rect 252 263 282 288
+rect 338 263 368 288
+rect 424 263 454 288
+rect 510 263 540 288
+rect 596 263 626 288
+rect 682 263 712 288
+rect 768 263 798 288
+rect 854 263 884 288
+rect 80 89 110 115
+rect 166 89 196 115
+rect 252 89 282 115
+rect 338 89 368 115
+rect 424 89 454 115
+rect 510 89 540 115
+rect 596 89 626 115
+rect 682 89 712 115
+rect 768 89 798 115
+rect 854 89 884 115
+<< polycont >>
+rect 90 392 124 426
+<< locali >>
+rect 0 1093 990 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 459 1093
+rect 493 1049 595 1093
+rect 629 1049 731 1093
+rect 765 1049 867 1093
+rect 901 1049 990 1093
+rect 35 949 69 1049
+rect 35 725 69 741
+rect 121 949 155 965
+rect 47 426 81 597
+rect 121 557 155 605
+rect 207 949 241 1049
+rect 207 589 241 605
+rect 293 949 327 965
+rect 293 557 327 605
+rect 379 949 413 1049
+rect 379 589 413 605
+rect 465 949 499 965
+rect 465 557 499 605
+rect 551 949 585 1049
+rect 551 589 585 605
+rect 637 949 671 965
+rect 637 557 671 605
+rect 723 949 757 1049
+rect 723 589 757 605
+rect 809 949 843 965
+rect 809 557 843 605
+rect 895 949 929 1049
+rect 895 589 929 605
+rect 47 392 90 426
+rect 124 392 140 426
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 227
+rect 121 115 155 131
+rect 207 215 241 231
+rect 207 61 241 131
+rect 293 215 327 227
+rect 293 115 327 131
+rect 379 215 413 231
+rect 379 61 413 131
+rect 465 215 499 227
+rect 465 115 499 131
+rect 551 215 585 231
+rect 551 61 585 131
+rect 637 215 671 227
+rect 637 115 671 131
+rect 723 215 757 231
+rect 723 61 757 131
+rect 809 215 843 227
+rect 809 115 843 131
+rect 895 215 929 231
+rect 895 61 929 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 459 61
+rect 493 17 595 61
+rect 629 17 731 61
+rect 765 17 867 61
+rect 901 17 990 61
+rect 0 0 990 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 459 1083 493 1093
+rect 459 1059 493 1083
+rect 595 1083 629 1093
+rect 595 1059 629 1083
+rect 731 1083 765 1093
+rect 731 1059 765 1083
+rect 867 1083 901 1093
+rect 867 1059 901 1083
+rect 47 597 81 631
+rect 121 523 155 557
+rect 293 523 327 557
+rect 465 523 499 557
+rect 637 523 671 557
+rect 809 523 843 557
+rect 121 227 155 261
+rect 293 227 327 261
+rect 465 227 499 261
+rect 637 227 671 261
+rect 809 227 843 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+rect 459 27 493 51
+rect 459 17 493 27
+rect 595 27 629 51
+rect 595 17 629 27
+rect 731 27 765 51
+rect 731 17 765 27
+rect 867 27 901 51
+rect 867 17 901 27
+<< metal1 >>
+rect 0 1093 990 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 459 1093
+rect 493 1059 595 1093
+rect 629 1059 731 1093
+rect 765 1059 867 1093
+rect 901 1059 990 1093
+rect 0 1049 990 1059
+rect 35 631 93 637
+rect 35 597 47 631
+rect 81 597 127 631
+rect 35 591 93 597
+rect 109 557 167 563
+rect 281 557 339 563
+rect 453 557 511 563
+rect 625 557 683 563
+rect 797 557 855 563
+rect 109 523 121 557
+rect 155 523 293 557
+rect 327 523 465 557
+rect 499 523 637 557
+rect 671 523 809 557
+rect 843 523 855 557
+rect 109 517 167 523
+rect 281 517 339 523
+rect 453 517 511 523
+rect 625 517 683 523
+rect 797 517 855 523
+rect 121 267 155 517
+rect 293 267 327 517
+rect 465 267 499 517
+rect 637 267 671 517
+rect 809 267 843 517
+rect 109 261 167 267
+rect 281 261 339 267
+rect 453 261 511 267
+rect 625 261 683 267
+rect 797 261 855 267
+rect 109 227 121 261
+rect 155 227 293 261
+rect 327 227 465 261
+rect 499 227 637 261
+rect 671 227 809 261
+rect 843 227 855 261
+rect 109 221 167 227
+rect 281 221 339 227
+rect 453 221 511 227
+rect 625 221 683 227
+rect 797 221 855 227
+rect 0 51 990 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 459 51
+rect 493 17 595 51
+rect 629 17 731 51
+rect 765 17 867 51
+rect 901 17 990 51
+rect 0 0 990 17
+<< labels >>
+rlabel metal1 152 388 152 388 1 Y
+port 1 n
+rlabel viali 64 613 64 613 1 A
+port 2 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_2.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_2.mag
new file mode 100644
index 0000000..8fcbcb3
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_2.mag
@@ -0,0 +1,153 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007755
+<< checkpaint >>
+rect -1269 2461 1547 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1547 -1129
+<< nwell >>
+rect -9 529 287 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 215 249 263
+rect 196 131 207 215
+rect 241 131 249 215
+rect 196 115 249 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 741 35 949
+rect 69 741 80 949
+rect 27 565 80 741
+rect 110 949 166 965
+rect 110 605 121 949
+rect 155 605 166 949
+rect 110 565 166 605
+rect 196 949 249 965
+rect 196 605 207 949
+rect 241 605 249 949
+rect 196 565 249 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 207 131 241 215
+<< pdiffc >>
+rect 35 741 69 949
+rect 121 605 155 949
+rect 207 605 241 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 992
+rect 80 540 110 565
+rect 166 540 196 565
+rect 80 510 196 540
+rect 80 442 110 510
+rect 80 426 134 442
+rect 80 392 90 426
+rect 124 392 134 426
+rect 80 376 134 392
+rect 80 318 110 376
+rect 80 288 196 318
+rect 80 263 110 288
+rect 166 263 196 288
+rect 80 89 110 115
+rect 166 89 196 115
+<< polycont >>
+rect 90 392 124 426
+<< locali >>
+rect 0 1093 286 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 286 1093
+rect 35 949 69 1049
+rect 35 725 69 741
+rect 121 949 155 965
+rect 47 426 81 597
+rect 121 557 155 605
+rect 207 949 241 1049
+rect 207 589 241 605
+rect 47 392 90 426
+rect 124 392 140 426
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 227
+rect 121 115 155 131
+rect 207 215 241 231
+rect 207 61 241 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 286 61
+rect 0 0 286 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 47 597 81 631
+rect 121 523 155 557
+rect 121 227 155 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 286 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 286 1093
+rect 0 1049 286 1059
+rect 35 631 93 637
+rect 35 597 47 631
+rect 81 597 127 631
+rect 35 591 93 597
+rect 109 557 167 563
+rect 109 523 121 557
+rect 155 523 167 557
+rect 109 517 167 523
+rect 121 267 155 517
+rect 109 261 167 267
+rect 109 227 121 261
+rect 155 227 167 261
+rect 109 221 167 227
+rect 0 51 286 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 286 51
+rect 0 0 286 17
+<< labels >>
+rlabel metal1 152 388 152 388 1 Y
+port 1 n
+rlabel viali 64 613 64 613 1 A
+port 2 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_3.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_3.mag
new file mode 100644
index 0000000..98ea9e3
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_3.mag
@@ -0,0 +1,182 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007755
+<< checkpaint >>
+rect -1269 2461 1635 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1635 -1129
+<< nwell >>
+rect -9 529 375 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 215 252 263
+rect 196 131 207 215
+rect 241 131 252 215
+rect 196 115 252 131
+rect 282 215 335 263
+rect 282 131 293 215
+rect 327 131 335 215
+rect 282 115 335 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 741 35 949
+rect 69 741 80 949
+rect 27 565 80 741
+rect 110 949 166 965
+rect 110 605 121 949
+rect 155 605 166 949
+rect 110 565 166 605
+rect 196 949 252 965
+rect 196 605 207 949
+rect 241 605 252 949
+rect 196 565 252 605
+rect 282 949 335 965
+rect 282 605 293 949
+rect 327 605 335 949
+rect 282 565 335 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 207 131 241 215
+rect 293 131 327 215
+<< pdiffc >>
+rect 35 741 69 949
+rect 121 605 155 949
+rect 207 605 241 949
+rect 293 605 327 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 80 540 110 565
+rect 166 540 196 565
+rect 252 540 282 565
+rect 80 510 282 540
+rect 80 442 110 510
+rect 80 426 134 442
+rect 80 392 90 426
+rect 124 392 134 426
+rect 80 376 134 392
+rect 80 318 110 376
+rect 80 288 282 318
+rect 80 263 110 288
+rect 166 263 196 288
+rect 252 263 282 288
+rect 80 89 110 115
+rect 166 89 196 115
+rect 252 89 282 115
+<< polycont >>
+rect 90 392 124 426
+<< locali >>
+rect 0 1093 374 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 374 1093
+rect 35 949 69 1049
+rect 35 725 69 741
+rect 121 949 155 965
+rect 47 426 81 597
+rect 121 557 155 605
+rect 207 949 241 1049
+rect 207 589 241 605
+rect 293 949 327 965
+rect 293 557 327 605
+rect 47 392 90 426
+rect 124 392 140 426
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 227
+rect 121 115 155 131
+rect 207 215 241 231
+rect 207 61 241 131
+rect 293 215 327 227
+rect 293 115 327 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 374 61
+rect 0 0 374 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 47 597 81 631
+rect 121 523 155 557
+rect 293 523 327 557
+rect 121 227 155 261
+rect 293 227 327 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 374 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 374 1093
+rect 0 1049 374 1059
+rect 35 631 93 637
+rect 35 597 47 631
+rect 81 597 127 631
+rect 35 591 93 597
+rect 109 557 167 563
+rect 281 557 339 563
+rect 109 523 121 557
+rect 155 523 293 557
+rect 327 523 339 557
+rect 109 517 167 523
+rect 281 517 339 523
+rect 121 267 155 517
+rect 293 267 327 517
+rect 109 261 167 267
+rect 281 261 339 267
+rect 109 227 121 261
+rect 155 227 293 261
+rect 327 227 339 261
+rect 109 221 167 227
+rect 281 221 339 227
+rect 0 51 374 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 374 51
+rect 0 0 374 17
+<< labels >>
+rlabel metal1 152 388 152 388 1 Y
+port 1 n
+rlabel viali 64 613 64 613 1 A
+port 2 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_4.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_4.mag
new file mode 100644
index 0000000..3445774
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_4.mag
@@ -0,0 +1,216 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007755
+<< checkpaint >>
+rect -1269 2461 1723 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1723 -1129
+<< nwell >>
+rect -9 529 463 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 215 252 263
+rect 196 131 207 215
+rect 241 131 252 215
+rect 196 115 252 131
+rect 282 215 338 263
+rect 282 131 293 215
+rect 327 131 338 215
+rect 282 115 338 131
+rect 368 215 421 263
+rect 368 131 379 215
+rect 413 131 421 215
+rect 368 115 421 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 741 35 949
+rect 69 741 80 949
+rect 27 565 80 741
+rect 110 949 166 965
+rect 110 605 121 949
+rect 155 605 166 949
+rect 110 565 166 605
+rect 196 949 252 965
+rect 196 605 207 949
+rect 241 605 252 949
+rect 196 565 252 605
+rect 282 949 338 965
+rect 282 605 293 949
+rect 327 605 338 949
+rect 282 565 338 605
+rect 368 949 421 965
+rect 368 605 379 949
+rect 413 605 421 949
+rect 368 565 421 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 207 131 241 215
+rect 293 131 327 215
+rect 379 131 413 215
+<< pdiffc >>
+rect 35 741 69 949
+rect 121 605 155 949
+rect 207 605 241 949
+rect 293 605 327 949
+rect 379 605 413 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 338 965 368 991
+rect 80 540 110 565
+rect 166 540 196 565
+rect 252 540 282 565
+rect 338 540 368 565
+rect 80 510 368 540
+rect 80 442 110 510
+rect 80 426 134 442
+rect 80 392 90 426
+rect 124 392 134 426
+rect 80 376 134 392
+rect 80 318 110 376
+rect 80 288 368 318
+rect 80 263 110 288
+rect 166 263 196 288
+rect 252 263 282 288
+rect 338 263 368 288
+rect 80 89 110 115
+rect 166 89 196 115
+rect 252 89 282 115
+rect 338 89 368 115
+<< polycont >>
+rect 90 392 124 426
+<< locali >>
+rect 0 1093 462 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 462 1093
+rect 35 949 69 1049
+rect 35 725 69 741
+rect 121 949 155 965
+rect 47 426 81 597
+rect 121 557 155 605
+rect 207 949 241 1049
+rect 207 589 241 605
+rect 293 949 327 965
+rect 293 557 327 605
+rect 379 949 413 1049
+rect 379 589 413 605
+rect 47 392 90 426
+rect 124 392 140 426
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 227
+rect 121 115 155 131
+rect 207 215 241 231
+rect 207 61 241 131
+rect 293 215 327 227
+rect 293 115 327 131
+rect 379 215 413 231
+rect 379 61 413 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 462 61
+rect 0 0 462 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 47 597 81 631
+rect 121 523 155 557
+rect 293 523 327 557
+rect 121 227 155 261
+rect 293 227 327 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+<< metal1 >>
+rect 0 1093 462 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 462 1093
+rect 0 1049 462 1059
+rect 35 631 93 637
+rect 35 597 47 631
+rect 81 597 127 631
+rect 35 591 93 597
+rect 109 557 167 563
+rect 281 557 339 563
+rect 109 523 121 557
+rect 155 523 293 557
+rect 327 523 339 557
+rect 109 517 167 523
+rect 281 517 339 523
+rect 121 267 155 517
+rect 293 267 327 517
+rect 109 261 167 267
+rect 281 261 339 267
+rect 109 227 121 261
+rect 155 227 293 261
+rect 327 227 339 261
+rect 109 221 167 227
+rect 281 221 339 227
+rect 0 51 462 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 462 51
+rect 0 0 462 17
+<< labels >>
+rlabel viali 64 613 64 613 1 A
+port 1 n
+rlabel metal1 152 388 152 388 1 Y
+port 2 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_6.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_6.mag
new file mode 100644
index 0000000..b7d0ba7
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_6.mag
@@ -0,0 +1,280 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007755
+<< checkpaint >>
+rect -1269 2461 1899 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1899 -1129
+<< nwell >>
+rect -9 529 639 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+rect 424 565 454 965
+rect 510 565 540 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 215 252 263
+rect 196 131 207 215
+rect 241 131 252 215
+rect 196 115 252 131
+rect 282 215 338 263
+rect 282 131 293 215
+rect 327 131 338 215
+rect 282 115 338 131
+rect 368 215 424 263
+rect 368 131 379 215
+rect 413 131 424 215
+rect 368 115 424 131
+rect 454 215 510 263
+rect 454 131 465 215
+rect 499 131 510 215
+rect 454 115 510 131
+rect 540 215 593 263
+rect 540 131 551 215
+rect 585 131 593 215
+rect 540 115 593 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 741 35 949
+rect 69 741 80 949
+rect 27 565 80 741
+rect 110 949 166 965
+rect 110 605 121 949
+rect 155 605 166 949
+rect 110 565 166 605
+rect 196 949 252 965
+rect 196 605 207 949
+rect 241 605 252 949
+rect 196 565 252 605
+rect 282 949 338 965
+rect 282 605 293 949
+rect 327 605 338 949
+rect 282 565 338 605
+rect 368 949 424 965
+rect 368 605 379 949
+rect 413 605 424 949
+rect 368 565 424 605
+rect 454 949 510 965
+rect 454 605 465 949
+rect 499 605 510 949
+rect 454 565 510 605
+rect 540 949 593 965
+rect 540 605 551 949
+rect 585 605 593 949
+rect 540 565 593 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 207 131 241 215
+rect 293 131 327 215
+rect 379 131 413 215
+rect 465 131 499 215
+rect 551 131 585 215
+<< pdiffc >>
+rect 35 741 69 949
+rect 121 605 155 949
+rect 207 605 241 949
+rect 293 605 327 949
+rect 379 605 413 949
+rect 465 605 499 949
+rect 551 605 585 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 338 965 368 991
+rect 424 965 454 991
+rect 510 965 540 991
+rect 80 540 110 565
+rect 166 540 196 565
+rect 252 540 282 565
+rect 338 540 368 565
+rect 424 540 454 565
+rect 510 540 540 565
+rect 80 510 540 540
+rect 80 442 110 510
+rect 80 426 134 442
+rect 80 392 90 426
+rect 124 392 134 426
+rect 80 376 134 392
+rect 80 318 110 376
+rect 424 318 454 510
+rect 80 288 540 318
+rect 80 263 110 288
+rect 166 263 196 288
+rect 252 263 282 288
+rect 338 263 368 288
+rect 424 263 454 288
+rect 510 263 540 288
+rect 80 89 110 115
+rect 166 89 196 115
+rect 252 89 282 115
+rect 338 89 368 115
+rect 424 89 454 115
+rect 510 89 540 115
+<< polycont >>
+rect 90 392 124 426
+<< locali >>
+rect 0 1093 638 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 459 1093
+rect 493 1049 638 1093
+rect 35 949 69 1049
+rect 35 725 69 741
+rect 121 949 155 965
+rect 47 426 81 597
+rect 121 557 155 605
+rect 207 949 241 1049
+rect 207 589 241 605
+rect 293 949 327 965
+rect 293 557 327 605
+rect 379 949 413 1049
+rect 379 589 413 605
+rect 465 949 499 965
+rect 465 557 499 605
+rect 551 949 585 1049
+rect 551 589 585 605
+rect 47 392 90 426
+rect 124 392 140 426
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 227
+rect 121 115 155 131
+rect 207 215 241 231
+rect 207 61 241 131
+rect 293 215 327 227
+rect 293 115 327 131
+rect 379 215 413 231
+rect 379 61 413 131
+rect 465 215 499 227
+rect 465 115 499 131
+rect 551 215 585 231
+rect 551 61 585 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 459 61
+rect 493 17 638 61
+rect 0 0 638 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 459 1083 493 1093
+rect 459 1059 493 1083
+rect 47 597 81 631
+rect 121 523 155 557
+rect 293 523 327 557
+rect 465 523 499 557
+rect 121 227 155 261
+rect 293 227 327 261
+rect 465 227 499 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+rect 459 27 493 51
+rect 459 17 493 27
+<< metal1 >>
+rect 0 1093 638 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 459 1093
+rect 493 1059 638 1093
+rect 0 1049 638 1059
+rect 35 631 93 637
+rect 35 597 47 631
+rect 81 597 127 631
+rect 35 591 93 597
+rect 109 557 167 563
+rect 281 557 339 563
+rect 453 557 511 563
+rect 109 523 121 557
+rect 155 523 293 557
+rect 327 523 465 557
+rect 499 523 511 557
+rect 109 517 167 523
+rect 281 517 339 523
+rect 453 517 511 523
+rect 121 267 155 517
+rect 293 267 327 517
+rect 465 267 499 517
+rect 109 261 167 267
+rect 281 261 339 267
+rect 453 261 511 267
+rect 109 227 121 261
+rect 155 227 293 261
+rect 327 227 465 261
+rect 499 227 511 261
+rect 109 221 167 227
+rect 281 221 339 227
+rect 453 221 511 227
+rect 0 51 638 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 459 51
+rect 493 17 638 51
+rect 0 0 638 17
+<< labels >>
+rlabel viali 64 613 64 613 1 A
+port 1 n
+rlabel metal1 152 388 152 388 1 Y
+port 2 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_8.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_8.mag
new file mode 100644
index 0000000..2f7dc6f
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_8.mag
@@ -0,0 +1,343 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007756
+<< checkpaint >>
+rect -1269 2461 2074 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 2074 -1129
+<< nwell >>
+rect -9 529 814 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+rect 596 115 626 263
+rect 682 115 712 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+rect 424 565 454 965
+rect 510 565 540 965
+rect 596 565 626 965
+rect 682 565 712 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 215 252 263
+rect 196 131 207 215
+rect 241 131 252 215
+rect 196 115 252 131
+rect 282 215 338 263
+rect 282 131 293 215
+rect 327 131 338 215
+rect 282 115 338 131
+rect 368 215 424 263
+rect 368 131 379 215
+rect 413 131 424 215
+rect 368 115 424 131
+rect 454 215 510 263
+rect 454 131 465 215
+rect 499 131 510 215
+rect 454 115 510 131
+rect 540 215 596 263
+rect 540 131 551 215
+rect 585 131 596 215
+rect 540 115 596 131
+rect 626 215 682 263
+rect 626 131 637 215
+rect 671 131 682 215
+rect 626 115 682 131
+rect 712 215 765 263
+rect 712 131 723 215
+rect 757 131 765 215
+rect 712 115 765 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 741 35 949
+rect 69 741 80 949
+rect 27 565 80 741
+rect 110 949 166 965
+rect 110 605 121 949
+rect 155 605 166 949
+rect 110 565 166 605
+rect 196 949 252 965
+rect 196 605 207 949
+rect 241 605 252 949
+rect 196 565 252 605
+rect 282 949 338 965
+rect 282 605 293 949
+rect 327 605 338 949
+rect 282 565 338 605
+rect 368 949 424 965
+rect 368 605 379 949
+rect 413 605 424 949
+rect 368 565 424 605
+rect 454 949 510 965
+rect 454 605 465 949
+rect 499 605 510 949
+rect 454 565 510 605
+rect 540 949 596 965
+rect 540 605 551 949
+rect 585 605 596 949
+rect 540 565 596 605
+rect 626 949 682 965
+rect 626 605 637 949
+rect 671 605 682 949
+rect 626 565 682 605
+rect 712 949 765 965
+rect 712 605 723 949
+rect 757 605 765 949
+rect 712 565 765 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 207 131 241 215
+rect 293 131 327 215
+rect 379 131 413 215
+rect 465 131 499 215
+rect 551 131 585 215
+rect 637 131 671 215
+rect 723 131 757 215
+<< pdiffc >>
+rect 35 741 69 949
+rect 121 605 155 949
+rect 207 605 241 949
+rect 293 605 327 949
+rect 379 605 413 949
+rect 465 605 499 949
+rect 551 605 585 949
+rect 637 605 671 949
+rect 723 605 757 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+rect 571 27 595 61
+rect 629 27 653 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+rect 571 1049 595 1083
+rect 629 1049 653 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+rect 595 27 629 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+rect 595 1049 629 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 338 965 368 991
+rect 424 965 454 991
+rect 510 965 540 991
+rect 596 965 626 991
+rect 682 965 712 991
+rect 80 540 110 565
+rect 166 540 196 565
+rect 252 540 282 565
+rect 338 540 368 565
+rect 424 540 454 565
+rect 510 540 540 565
+rect 596 540 626 565
+rect 682 540 712 565
+rect 80 510 712 540
+rect 80 442 110 510
+rect 80 426 134 442
+rect 80 392 90 426
+rect 124 392 134 426
+rect 80 376 134 392
+rect 80 318 110 376
+rect 424 318 454 510
+rect 80 288 712 318
+rect 80 263 110 288
+rect 166 263 196 288
+rect 252 263 282 288
+rect 338 263 368 288
+rect 424 263 454 288
+rect 510 263 540 288
+rect 596 263 626 288
+rect 682 263 712 288
+rect 80 89 110 115
+rect 166 89 196 115
+rect 252 89 282 115
+rect 338 89 368 115
+rect 424 89 454 115
+rect 510 89 540 115
+rect 596 89 626 115
+rect 682 89 712 115
+<< polycont >>
+rect 90 392 124 426
+<< locali >>
+rect 0 1093 814 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 459 1093
+rect 493 1049 595 1093
+rect 629 1049 814 1093
+rect 35 949 69 1049
+rect 35 725 69 741
+rect 121 949 155 965
+rect 47 426 81 597
+rect 121 557 155 605
+rect 207 949 241 1049
+rect 207 589 241 605
+rect 293 949 327 965
+rect 293 557 327 605
+rect 379 949 413 1049
+rect 379 589 413 605
+rect 465 949 499 965
+rect 465 557 499 605
+rect 551 949 585 1049
+rect 551 589 585 605
+rect 637 949 671 965
+rect 637 557 671 605
+rect 723 949 757 1049
+rect 723 589 757 605
+rect 47 392 90 426
+rect 124 392 140 426
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 227
+rect 121 115 155 131
+rect 207 215 241 231
+rect 207 61 241 131
+rect 293 215 327 227
+rect 293 115 327 131
+rect 379 215 413 231
+rect 379 61 413 131
+rect 465 215 499 227
+rect 465 115 499 131
+rect 551 215 585 231
+rect 551 61 585 131
+rect 637 215 671 227
+rect 637 115 671 131
+rect 723 215 757 231
+rect 723 61 757 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 459 61
+rect 493 17 595 61
+rect 629 17 814 61
+rect 0 0 814 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 459 1083 493 1093
+rect 459 1059 493 1083
+rect 595 1083 629 1093
+rect 595 1059 629 1083
+rect 47 597 81 631
+rect 121 523 155 557
+rect 293 523 327 557
+rect 465 523 499 557
+rect 637 523 671 557
+rect 121 227 155 261
+rect 293 227 327 261
+rect 465 227 499 261
+rect 637 227 671 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+rect 459 27 493 51
+rect 459 17 493 27
+rect 595 27 629 51
+rect 595 17 629 27
+<< metal1 >>
+rect 0 1093 814 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 459 1093
+rect 493 1059 595 1093
+rect 629 1059 814 1093
+rect 0 1049 814 1059
+rect 35 631 93 637
+rect 35 597 47 631
+rect 81 597 127 631
+rect 35 591 93 597
+rect 109 557 167 563
+rect 281 557 339 563
+rect 453 557 511 563
+rect 625 557 683 563
+rect 109 523 121 557
+rect 155 523 293 557
+rect 327 523 465 557
+rect 499 523 637 557
+rect 671 523 683 557
+rect 109 517 167 523
+rect 281 517 339 523
+rect 453 517 511 523
+rect 625 517 683 523
+rect 121 267 155 517
+rect 293 267 327 517
+rect 465 267 499 517
+rect 637 267 671 517
+rect 109 261 167 267
+rect 281 261 339 267
+rect 453 261 511 267
+rect 625 261 683 267
+rect 109 227 121 261
+rect 155 227 293 261
+rect 327 227 465 261
+rect 499 227 637 261
+rect 671 227 683 261
+rect 109 221 167 227
+rect 281 221 339 227
+rect 453 221 511 227
+rect 625 221 683 227
+rect 0 51 814 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 459 51
+rect 493 17 595 51
+rect 629 17 814 51
+rect 0 0 814 17
+<< labels >>
+rlabel metal1 152 388 152 388 1 Y
+port 1 n
+rlabel viali 64 613 64 613 1 A
+port 2 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_l.mag
new file mode 100644
index 0000000..b06fc97
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_l.mag
@@ -0,0 +1,113 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007756
+<< checkpaint >>
+rect -1269 -242 1459 2379
+<< nwell >>
+rect -9 529 199 1119
+<< nmoslvt >>
+rect 80 115 110 219
+<< pmos >>
+rect 80 713 110 965
+<< ndiff >>
+rect 27 165 80 219
+rect 27 131 35 165
+rect 69 131 80 165
+rect 27 115 80 131
+rect 110 165 163 219
+rect 110 131 121 165
+rect 155 131 163 165
+rect 110 115 163 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 877 35 949
+rect 69 877 80 949
+rect 27 713 80 877
+rect 110 949 163 965
+rect 110 877 121 949
+rect 155 877 163 949
+rect 110 713 163 877
+<< ndiffc >>
+rect 35 131 69 165
+rect 121 131 155 165
+<< pdiffc >>
+rect 35 877 69 949
+rect 121 877 155 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+<< poly >>
+rect 80 965 110 991
+rect 80 442 110 713
+rect 80 426 134 442
+rect 80 392 90 426
+rect 124 392 134 426
+rect 80 376 134 392
+rect 80 219 110 376
+rect 80 89 110 115
+<< polycont >>
+rect 90 392 124 426
+<< locali >>
+rect 0 1093 198 1110
+rect 0 1049 51 1093
+rect 85 1049 198 1093
+rect 35 949 69 1049
+rect 35 861 69 877
+rect 121 949 155 965
+rect 47 426 81 597
+rect 121 557 155 877
+rect 47 392 90 426
+rect 124 392 140 426
+rect 35 165 69 181
+rect 35 61 69 131
+rect 121 165 155 227
+rect 121 115 155 131
+rect 0 17 51 61
+rect 85 17 198 61
+rect 0 0 198 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 47 597 81 631
+rect 121 523 155 557
+rect 121 227 155 261
+rect 51 27 85 51
+rect 51 17 85 27
+<< metal1 >>
+rect 0 1093 198 1110
+rect 0 1059 51 1093
+rect 85 1059 198 1093
+rect 0 1049 198 1059
+rect 35 631 93 637
+rect 35 597 47 631
+rect 81 597 127 631
+rect 35 591 93 597
+rect 109 557 167 563
+rect 109 523 121 557
+rect 155 523 167 557
+rect 109 517 167 523
+rect 121 267 155 517
+rect 109 261 167 267
+rect 109 227 121 261
+rect 155 227 167 261
+rect 109 221 167 227
+rect 0 51 198 61
+rect 0 17 51 51
+rect 85 17 198 51
+rect 0 0 198 17
+<< labels >>
+rlabel viali 64 614 64 614 1 A
+port 1 n
+rlabel metal1 151 389 151 389 1 Y
+port 2 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__mux2_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__mux2_1.mag
new file mode 100644
index 0000000..a1aed2c
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__mux2_1.mag
@@ -0,0 +1,227 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007756
+<< checkpaint >>
+rect -1269 2461 1813 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1813 -1129
+<< nwell >>
+rect -9 529 553 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 270 115 300 263
+rect 356 115 386 263
+<< pmos >>
+rect 80 565 110 965
+rect 270 565 300 965
+rect 356 565 386 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 163 263
+rect 110 131 121 215
+rect 155 131 163 215
+rect 110 115 163 131
+rect 217 215 270 263
+rect 217 131 225 215
+rect 259 131 270 215
+rect 217 115 270 131
+rect 300 215 356 263
+rect 300 131 311 215
+rect 345 131 356 215
+rect 300 115 356 131
+rect 386 215 439 263
+rect 386 131 397 215
+rect 431 131 439 215
+rect 386 115 439 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 741 35 949
+rect 69 741 80 949
+rect 27 565 80 741
+rect 110 949 163 965
+rect 110 605 121 949
+rect 155 605 163 949
+rect 110 565 163 605
+rect 217 949 270 965
+rect 217 605 225 949
+rect 259 605 270 949
+rect 217 565 270 605
+rect 300 949 356 965
+rect 300 605 311 949
+rect 345 605 356 949
+rect 300 565 356 605
+rect 386 949 439 965
+rect 386 605 397 949
+rect 431 605 439 949
+rect 386 565 439 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 225 131 259 215
+rect 311 131 345 215
+rect 397 131 431 215
+<< pdiffc >>
+rect 35 741 69 949
+rect 121 605 155 949
+rect 225 605 259 949
+rect 311 605 345 949
+rect 397 605 431 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+<< nsubdiff >>
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+<< nsubdiffcont >>
+rect 459 1049 493 1083
+<< poly >>
+rect 80 980 300 1010
+rect 80 965 110 980
+rect 270 965 300 980
+rect 356 965 386 991
+rect 80 442 110 565
+rect 270 539 300 565
+rect 152 503 218 513
+rect 152 469 168 503
+rect 202 489 218 503
+rect 356 489 386 565
+rect 202 469 386 489
+rect 152 459 386 469
+rect 27 426 110 442
+rect 27 392 37 426
+rect 71 417 110 426
+rect 71 392 386 417
+rect 27 387 386 392
+rect 27 376 110 387
+rect 80 263 110 376
+rect 152 335 218 345
+rect 152 301 168 335
+rect 202 321 218 335
+rect 202 301 300 321
+rect 152 291 300 301
+rect 270 263 300 291
+rect 356 263 386 387
+rect 80 89 110 115
+rect 270 89 300 115
+rect 356 89 386 115
+<< polycont >>
+rect 168 469 202 503
+rect 37 392 71 426
+rect 168 301 202 335
+<< locali >>
+rect 0 1093 550 1110
+rect 0 1049 459 1093
+rect 493 1049 550 1093
+rect 35 949 69 1049
+rect 35 725 69 741
+rect 121 949 155 965
+rect 37 426 71 597
+rect 37 376 71 392
+rect 121 519 155 605
+rect 225 949 259 965
+rect 311 949 345 965
+rect 225 571 270 605
+rect 236 557 270 571
+rect 121 503 202 519
+rect 121 469 168 503
+rect 121 453 202 469
+rect 121 351 155 453
+rect 121 335 202 351
+rect 121 301 168 335
+rect 121 285 202 301
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 285
+rect 236 249 270 523
+rect 311 409 345 605
+rect 397 949 431 965
+rect 397 483 431 605
+rect 121 115 155 131
+rect 225 215 270 249
+rect 311 215 345 227
+rect 225 115 259 131
+rect 311 115 345 131
+rect 397 215 431 449
+rect 397 115 431 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 459 61
+rect 493 17 550 61
+rect 0 0 550 17
+<< viali >>
+rect 459 1083 493 1093
+rect 459 1059 493 1083
+rect 37 597 71 631
+rect 236 523 270 557
+rect 311 375 345 409
+rect 397 449 431 483
+rect 311 227 345 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+rect 459 27 493 51
+rect 459 17 493 27
+<< metal1 >>
+rect 0 1093 550 1110
+rect 0 1059 459 1093
+rect 493 1059 550 1093
+rect 0 1049 550 1059
+rect 25 631 83 637
+rect 25 597 37 631
+rect 71 597 117 631
+rect 25 591 83 597
+rect 224 557 282 563
+rect 190 523 236 557
+rect 270 523 282 557
+rect 224 517 282 523
+rect 385 483 443 489
+rect 351 449 397 483
+rect 431 449 443 483
+rect 385 443 443 449
+rect 299 409 357 415
+rect 299 375 311 409
+rect 345 375 357 409
+rect 299 369 357 375
+rect 311 267 345 369
+rect 299 261 357 267
+rect 299 227 311 261
+rect 345 227 357 261
+rect 299 221 357 227
+rect 0 51 550 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 459 51
+rect 493 17 550 51
+rect 0 0 550 17
+<< labels >>
+rlabel viali 54 614 54 614 1 S0
+port 1 n
+rlabel viali 328 392 328 392 1 Y
+port 2 n
+rlabel viali 253 540 253 540 1 A0
+port 3 n
+rlabel viali 414 466 414 466 1 A1
+port 4 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 476 1066 476 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__nand2_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__nand2_1.mag
new file mode 100644
index 0000000..00743d1
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__nand2_1.mag
@@ -0,0 +1,157 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007756
+<< checkpaint >>
+rect -1269 2461 1546 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1546 -1129
+<< nwell >>
+rect -9 529 286 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 115 152 263
+rect 182 215 235 263
+rect 182 131 193 215
+rect 227 131 235 215
+rect 182 115 235 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 741 35 949
+rect 69 741 80 949
+rect 27 565 80 741
+rect 110 949 166 965
+rect 110 605 121 949
+rect 155 605 166 949
+rect 110 565 166 605
+rect 196 949 249 965
+rect 196 673 207 949
+rect 241 673 249 949
+rect 196 565 249 673
+<< ndiffc >>
+rect 35 131 69 215
+rect 193 131 227 215
+<< pdiffc >>
+rect 35 741 69 949
+rect 121 605 155 949
+rect 207 673 241 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 80 518 110 565
+rect 37 502 110 518
+rect 37 468 47 502
+rect 81 468 110 502
+rect 37 452 110 468
+rect 80 263 110 452
+rect 166 425 196 565
+rect 152 409 210 425
+rect 152 375 166 409
+rect 200 375 210 409
+rect 152 359 210 375
+rect 152 263 182 359
+rect 80 89 110 115
+rect 152 89 182 115
+<< polycont >>
+rect 47 468 81 502
+rect 166 375 200 409
+<< locali >>
+rect 0 1093 286 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 286 1093
+rect 35 949 69 1049
+rect 35 725 69 741
+rect 121 949 155 965
+rect 47 502 81 597
+rect 47 452 81 468
+rect 207 949 241 1049
+rect 207 657 241 673
+rect 121 483 155 605
+rect 195 409 229 523
+rect 150 375 166 409
+rect 200 375 229 409
+rect 35 215 69 227
+rect 35 115 69 131
+rect 193 215 227 231
+rect 193 61 227 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 286 61
+rect 0 0 286 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 47 597 81 631
+rect 121 449 155 483
+rect 195 523 229 557
+rect 35 227 69 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 286 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 286 1093
+rect 0 1049 286 1059
+rect 35 631 93 637
+rect 35 597 47 631
+rect 81 597 115 631
+rect 35 591 93 597
+rect 183 557 241 563
+rect 161 523 195 557
+rect 229 523 241 557
+rect 183 517 241 523
+rect 109 483 167 489
+rect 109 449 121 483
+rect 155 449 167 483
+rect 109 443 167 449
+rect 23 261 81 267
+rect 121 261 155 443
+rect 23 227 35 261
+rect 69 227 155 261
+rect 23 221 81 227
+rect 0 51 286 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 286 51
+rect 0 0 286 17
+<< labels >>
+rlabel metal1 136 418 136 418 1 Y
+port 1 n
+rlabel viali 64 614 64 614 1 A
+port 2 n
+rlabel viali 212 540 212 540 1 B
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__nand2_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__nand2_l.mag
new file mode 100644
index 0000000..a6655e7
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__nand2_l.mag
@@ -0,0 +1,155 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007756
+<< checkpaint >>
+rect -1269 -242 1546 2379
+<< nwell >>
+rect -9 529 286 1119
+<< nmoslvt >>
+rect 80 115 110 219
+rect 152 115 182 219
+<< pmos >>
+rect 80 713 110 965
+rect 166 713 196 965
+<< ndiff >>
+rect 27 165 80 219
+rect 27 131 35 165
+rect 69 131 80 165
+rect 27 115 80 131
+rect 110 115 152 219
+rect 182 165 235 219
+rect 182 131 193 165
+rect 227 131 235 165
+rect 182 115 235 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 877 35 949
+rect 69 877 80 949
+rect 27 713 80 877
+rect 110 949 166 965
+rect 110 877 121 949
+rect 155 877 166 949
+rect 110 713 166 877
+rect 196 949 249 965
+rect 196 877 207 949
+rect 241 877 249 949
+rect 196 713 249 877
+<< ndiffc >>
+rect 35 131 69 165
+rect 193 131 227 165
+<< pdiffc >>
+rect 35 877 69 949
+rect 121 877 155 949
+rect 207 877 241 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 80 518 110 713
+rect 37 502 110 518
+rect 37 468 47 502
+rect 81 468 110 502
+rect 37 452 110 468
+rect 80 219 110 452
+rect 166 368 196 713
+rect 152 352 210 368
+rect 152 318 166 352
+rect 200 318 210 352
+rect 152 302 210 318
+rect 152 219 182 302
+rect 80 89 110 115
+rect 152 89 182 115
+<< polycont >>
+rect 47 468 81 502
+rect 166 318 200 352
+<< locali >>
+rect 0 1093 286 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 286 1093
+rect 35 949 69 1049
+rect 35 861 69 877
+rect 121 949 155 965
+rect 47 502 81 597
+rect 47 452 81 468
+rect 121 483 155 877
+rect 207 949 241 1049
+rect 207 861 241 877
+rect 195 352 229 523
+rect 150 318 166 352
+rect 200 318 229 352
+rect 35 165 69 227
+rect 35 115 69 131
+rect 193 165 227 181
+rect 193 61 227 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 286 61
+rect 0 0 286 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 47 597 81 631
+rect 121 449 155 483
+rect 195 523 229 557
+rect 35 227 69 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 286 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 286 1093
+rect 0 1049 286 1059
+rect 35 631 93 637
+rect 35 597 47 631
+rect 81 597 115 631
+rect 35 591 93 597
+rect 183 557 241 563
+rect 161 523 195 557
+rect 229 523 241 557
+rect 183 517 241 523
+rect 109 483 167 489
+rect 109 449 121 483
+rect 155 449 167 483
+rect 109 443 167 449
+rect 23 261 81 267
+rect 121 261 155 443
+rect 23 227 35 261
+rect 69 227 155 261
+rect 23 221 81 227
+rect 0 51 286 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 286 51
+rect 0 0 286 17
+<< labels >>
+rlabel metal1 136 418 136 418 1 Y
+port 1 n
+rlabel viali 212 540 212 540 1 B
+port 2 n
+rlabel viali 64 614 64 614 1 A
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__nor2_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__nor2_1.mag
new file mode 100644
index 0000000..bc56f7a
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__nor2_1.mag
@@ -0,0 +1,157 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007757
+<< checkpaint >>
+rect -1269 2461 1546 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1546 -1129
+<< nwell >>
+rect -9 529 286 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+<< pmos >>
+rect 80 565 110 965
+rect 152 565 182 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 215 249 263
+rect 196 131 207 215
+rect 241 131 249 215
+rect 196 115 249 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 605 35 949
+rect 69 605 80 949
+rect 27 565 80 605
+rect 110 565 152 965
+rect 182 949 235 965
+rect 182 741 193 949
+rect 227 741 235 949
+rect 182 565 235 741
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 207 131 241 215
+<< pdiffc >>
+rect 35 605 69 949
+rect 193 741 227 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 152 965 182 991
+rect 80 399 110 565
+rect 152 532 182 565
+rect 152 516 225 532
+rect 152 482 181 516
+rect 215 482 225 516
+rect 152 466 225 482
+rect 56 383 110 399
+rect 56 349 66 383
+rect 100 349 110 383
+rect 56 333 110 349
+rect 80 263 110 333
+rect 166 263 196 466
+rect 80 89 110 115
+rect 166 89 196 115
+<< polycont >>
+rect 181 482 215 516
+rect 66 349 100 383
+<< locali >>
+rect 0 1093 286 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 286 1093
+rect 35 949 69 965
+rect 193 949 227 1049
+rect 193 725 227 741
+rect 35 483 69 605
+rect 113 383 147 523
+rect 181 516 215 597
+rect 181 466 215 482
+rect 50 349 66 383
+rect 100 349 147 383
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 227
+rect 121 115 155 131
+rect 207 215 241 231
+rect 207 61 241 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 286 61
+rect 0 0 286 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 181 597 215 631
+rect 35 449 69 483
+rect 113 523 147 557
+rect 121 227 155 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 286 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 286 1093
+rect 0 1049 286 1059
+rect 169 631 227 637
+rect 148 597 181 631
+rect 215 597 227 631
+rect 169 591 227 597
+rect 101 557 159 563
+rect 79 523 113 557
+rect 147 523 159 557
+rect 101 517 159 523
+rect 23 483 81 489
+rect 23 449 35 483
+rect 69 449 155 483
+rect 23 443 81 449
+rect 121 267 155 449
+rect 109 261 167 267
+rect 109 227 121 261
+rect 155 227 167 261
+rect 109 221 167 227
+rect 0 51 286 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 286 51
+rect 0 0 286 17
+<< labels >>
+rlabel metal1 137 341 137 341 1 Y
+port 1 n
+rlabel viali 130 540 130 540 1 B
+port 2 n
+rlabel viali 198 614 198 614 1 A
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__nor2_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__nor2_l.mag
new file mode 100644
index 0000000..3355adf
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__nor2_l.mag
@@ -0,0 +1,155 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007757
+<< checkpaint >>
+rect -1269 -242 1546 2379
+<< nwell >>
+rect -9 529 286 1119
+<< nmoslvt >>
+rect 80 115 110 219
+rect 166 115 196 219
+<< pmos >>
+rect 80 713 110 965
+rect 152 713 182 965
+<< ndiff >>
+rect 27 165 80 219
+rect 27 131 35 165
+rect 69 131 80 165
+rect 27 115 80 131
+rect 110 165 166 219
+rect 110 131 121 165
+rect 155 131 166 165
+rect 110 115 166 131
+rect 196 165 249 219
+rect 196 131 207 165
+rect 241 131 249 165
+rect 196 115 249 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 809 35 949
+rect 69 809 80 949
+rect 27 713 80 809
+rect 110 713 152 965
+rect 182 949 235 965
+rect 182 809 193 949
+rect 227 809 235 949
+rect 182 713 235 809
+<< ndiffc >>
+rect 35 131 69 165
+rect 121 131 155 165
+rect 207 131 241 165
+<< pdiffc >>
+rect 35 809 69 949
+rect 193 809 227 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 152 965 182 991
+rect 80 399 110 713
+rect 152 532 182 713
+rect 152 516 225 532
+rect 152 482 181 516
+rect 215 482 225 516
+rect 152 466 225 482
+rect 56 383 110 399
+rect 56 349 66 383
+rect 100 349 110 383
+rect 56 333 110 349
+rect 80 219 110 333
+rect 166 219 196 466
+rect 80 89 110 115
+rect 166 89 196 115
+<< polycont >>
+rect 181 482 215 516
+rect 66 349 100 383
+<< locali >>
+rect 0 1093 286 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 286 1093
+rect 35 949 69 965
+rect 35 483 69 809
+rect 193 949 227 1049
+rect 193 793 227 809
+rect 113 383 147 523
+rect 181 516 215 597
+rect 181 466 215 482
+rect 50 349 66 383
+rect 100 349 147 383
+rect 35 165 69 181
+rect 35 61 69 131
+rect 121 165 155 227
+rect 121 115 155 131
+rect 207 165 241 181
+rect 207 61 241 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 286 61
+rect 0 0 286 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 181 597 215 631
+rect 35 449 69 483
+rect 113 523 147 557
+rect 121 227 155 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 286 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 286 1093
+rect 0 1049 286 1059
+rect 169 631 227 637
+rect 148 597 181 631
+rect 215 597 227 631
+rect 169 591 227 597
+rect 101 557 159 563
+rect 79 523 113 557
+rect 147 523 159 557
+rect 101 517 159 523
+rect 23 483 81 489
+rect 23 449 35 483
+rect 69 449 155 483
+rect 23 443 81 449
+rect 121 267 155 449
+rect 109 261 167 267
+rect 109 227 121 261
+rect 155 227 167 261
+rect 109 221 167 227
+rect 0 51 286 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 286 51
+rect 0 0 286 17
+<< labels >>
+rlabel metal1 137 341 137 341 1 Y
+port 1 n
+rlabel viali 198 614 198 614 1 A
+port 2 n
+rlabel viali 130 540 130 540 1 B
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__oai21_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__oai21_l.mag
new file mode 100644
index 0000000..c4d2acc
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__oai21_l.mag
@@ -0,0 +1,194 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007757
+<< checkpaint >>
+rect -1269 -242 1634 2379
+<< nwell >>
+rect -9 529 374 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+<< pmos >>
+rect 80 565 110 965
+rect 152 565 182 965
+rect 250 713 280 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 165 166 263
+rect 110 131 121 165
+rect 155 131 166 165
+rect 110 115 166 131
+rect 196 215 252 263
+rect 196 131 207 215
+rect 241 131 252 215
+rect 196 115 252 131
+rect 282 214 335 263
+rect 282 131 293 214
+rect 327 131 335 214
+rect 282 115 335 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 741 35 949
+rect 69 741 80 949
+rect 27 565 80 741
+rect 110 565 152 965
+rect 182 949 250 965
+rect 182 809 193 949
+rect 227 809 250 949
+rect 182 713 250 809
+rect 280 949 333 965
+rect 280 809 291 949
+rect 325 809 333 949
+rect 280 713 333 809
+rect 182 565 235 713
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 165
+rect 207 131 241 215
+rect 293 131 327 214
+<< pdiffc >>
+rect 35 741 69 949
+rect 193 809 227 949
+rect 291 809 325 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 152 965 182 991
+rect 250 965 280 991
+rect 80 533 110 565
+rect 56 517 110 533
+rect 56 483 66 517
+rect 100 483 110 517
+rect 56 467 110 483
+rect 56 318 86 467
+rect 152 419 182 565
+rect 136 409 202 419
+rect 136 375 152 409
+rect 186 375 202 409
+rect 136 365 202 375
+rect 56 288 110 318
+rect 80 263 110 288
+rect 166 263 196 365
+rect 250 357 280 713
+rect 250 341 306 357
+rect 252 307 262 341
+rect 296 307 306 341
+rect 252 291 306 307
+rect 252 263 282 291
+rect 80 89 110 115
+rect 166 89 196 115
+rect 252 89 282 115
+<< polycont >>
+rect 66 483 100 517
+rect 152 375 186 409
+rect 262 307 296 341
+<< locali >>
+rect 0 1093 374 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 374 1093
+rect 35 949 69 965
+rect 193 949 227 1049
+rect 193 793 227 809
+rect 291 949 325 965
+rect 35 699 69 741
+rect 291 699 325 809
+rect 35 665 325 699
+rect 66 517 100 597
+rect 66 467 100 483
+rect 152 523 162 557
+rect 152 409 186 523
+rect 152 359 186 375
+rect 223 341 257 449
+rect 291 409 325 665
+rect 223 307 262 341
+rect 296 307 312 341
+rect 35 215 241 249
+rect 35 115 69 131
+rect 121 165 155 181
+rect 121 61 155 131
+rect 207 115 241 131
+rect 293 214 327 227
+rect 293 115 327 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 374 61
+rect 0 0 374 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 66 597 100 631
+rect 162 523 196 557
+rect 223 449 257 483
+rect 291 375 325 409
+rect 293 227 327 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 374 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 374 1093
+rect 0 1049 374 1059
+rect 54 631 112 637
+rect 54 597 66 631
+rect 100 597 134 631
+rect 54 591 112 597
+rect 150 557 208 563
+rect 150 523 162 557
+rect 196 523 230 557
+rect 150 517 208 523
+rect 211 483 269 489
+rect 189 449 223 483
+rect 257 449 269 483
+rect 211 443 269 449
+rect 279 409 337 415
+rect 279 375 291 409
+rect 325 375 337 409
+rect 279 369 337 375
+rect 293 267 327 369
+rect 281 261 339 267
+rect 281 227 293 261
+rect 327 227 339 261
+rect 281 221 339 227
+rect 0 51 374 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 374 51
+rect 0 0 374 17
+<< labels >>
+rlabel viali 83 614 83 614 1 A0
+port 1 n
+rlabel viali 179 540 179 540 1 A1
+port 2 n
+rlabel viali 308 392 308 392 1 Y
+port 3 n
+rlabel viali 240 466 240 466 1 B0
+port 4 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__oai22_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__oai22_l.mag
new file mode 100644
index 0000000..bcf7e26
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__oai22_l.mag
@@ -0,0 +1,239 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007757
+<< checkpaint >>
+rect -1269 -242 1722 2379
+<< nwell >>
+rect -9 529 462 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+<< pmos >>
+rect 80 565 110 965
+rect 152 565 182 965
+rect 252 565 282 965
+rect 324 565 354 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 165 166 263
+rect 110 131 121 165
+rect 155 131 166 165
+rect 110 115 166 131
+rect 196 215 252 263
+rect 196 131 207 215
+rect 241 131 252 215
+rect 196 115 252 131
+rect 282 215 338 263
+rect 282 181 293 215
+rect 327 181 338 215
+rect 282 115 338 181
+rect 368 165 421 263
+rect 368 131 379 165
+rect 413 131 421 165
+rect 368 115 421 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 741 35 949
+rect 69 741 80 949
+rect 27 565 80 741
+rect 110 565 152 965
+rect 182 949 252 965
+rect 182 673 200 949
+rect 234 673 252 949
+rect 182 565 252 673
+rect 282 565 324 965
+rect 354 949 407 965
+rect 354 741 365 949
+rect 399 741 407 949
+rect 354 565 407 741
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 165
+rect 207 131 241 215
+rect 293 181 327 215
+rect 379 131 413 165
+<< pdiffc >>
+rect 35 741 69 949
+rect 200 673 234 949
+rect 365 741 399 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+<< poly >>
+rect 80 965 110 991
+rect 152 965 182 991
+rect 252 965 282 991
+rect 324 965 354 991
+rect 80 533 110 565
+rect 56 517 110 533
+rect 56 483 66 517
+rect 100 483 110 517
+rect 56 467 110 483
+rect 56 318 86 467
+rect 152 419 182 565
+rect 130 409 196 419
+rect 130 375 146 409
+rect 180 375 196 409
+rect 130 365 196 375
+rect 56 288 110 318
+rect 80 263 110 288
+rect 166 263 196 365
+rect 252 361 282 565
+rect 324 540 354 565
+rect 324 510 368 540
+rect 338 426 368 510
+rect 338 410 430 426
+rect 338 376 384 410
+rect 418 376 430 410
+rect 238 345 292 361
+rect 238 311 248 345
+rect 282 311 292 345
+rect 238 295 292 311
+rect 338 360 430 376
+rect 252 263 282 295
+rect 338 263 368 360
+rect 80 89 110 115
+rect 166 89 196 115
+rect 252 89 282 115
+rect 338 89 368 115
+<< polycont >>
+rect 66 483 100 517
+rect 146 375 180 409
+rect 384 376 418 410
+rect 248 311 282 345
+<< locali >>
+rect 0 1093 462 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 462 1093
+rect 35 949 69 1049
+rect 35 725 69 741
+rect 200 949 234 965
+rect 365 949 399 1049
+rect 365 725 399 741
+rect 200 648 234 673
+rect 200 614 350 648
+rect 66 517 100 597
+rect 66 467 100 483
+rect 146 523 162 557
+rect 146 409 180 523
+rect 146 359 180 375
+rect 223 361 257 449
+rect 223 345 282 361
+rect 223 311 248 345
+rect 223 295 282 311
+rect 316 335 350 614
+rect 384 410 418 426
+rect 384 360 418 376
+rect 35 215 241 249
+rect 35 115 69 131
+rect 121 165 155 181
+rect 121 61 155 131
+rect 293 227 316 261
+rect 293 215 327 227
+rect 293 165 327 181
+rect 379 165 413 181
+rect 207 129 241 131
+rect 379 129 413 131
+rect 207 95 413 129
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 462 61
+rect 0 0 462 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 66 597 100 631
+rect 162 523 196 557
+rect 223 449 257 483
+rect 384 376 418 410
+rect 316 301 350 335
+rect 316 227 350 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+<< metal1 >>
+rect 0 1093 462 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 462 1093
+rect 0 1049 462 1059
+rect 54 631 112 637
+rect 54 597 66 631
+rect 100 597 134 631
+rect 54 591 112 597
+rect 150 557 208 563
+rect 150 523 162 557
+rect 196 523 230 557
+rect 150 517 208 523
+rect 211 483 269 489
+rect 189 449 223 483
+rect 257 449 269 483
+rect 211 443 269 449
+rect 372 410 430 416
+rect 350 376 384 410
+rect 418 376 430 410
+rect 372 370 430 376
+rect 304 335 362 341
+rect 304 301 316 335
+rect 350 301 362 335
+rect 304 295 362 301
+rect 316 267 350 295
+rect 304 261 362 267
+rect 304 227 316 261
+rect 350 227 362 261
+rect 304 221 362 227
+rect 0 51 462 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 462 51
+rect 0 0 462 17
+<< labels >>
+rlabel viali 240 466 240 466 1 B0
+port 4 n
+rlabel viali 179 540 179 540 1 A1
+port 2 n
+rlabel viali 83 614 83 614 1 A0
+port 1 n
+rlabel viali 333 318 333 318 1 Y
+port 3 n
+rlabel viali 401 393 401 393 1 B1
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__or2_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_1.mag
new file mode 100644
index 0000000..e9f2134
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_1.mag
@@ -0,0 +1,188 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007757
+<< checkpaint >>
+rect -1269 2461 1634 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1634 -1129
+<< nwell >>
+rect -9 529 374 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 215 252 263
+rect 196 131 207 215
+rect 241 131 252 215
+rect 196 115 252 131
+rect 282 215 335 263
+rect 282 131 293 215
+rect 327 131 335 215
+rect 282 115 335 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 673 35 949
+rect 69 673 80 949
+rect 27 565 80 673
+rect 110 565 166 965
+rect 196 949 252 965
+rect 196 741 207 949
+rect 241 741 252 949
+rect 196 565 252 741
+rect 282 949 335 965
+rect 282 605 293 949
+rect 327 605 335 949
+rect 282 565 335 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 207 131 241 215
+rect 293 131 327 215
+<< pdiffc >>
+rect 35 673 69 949
+rect 207 741 241 949
+rect 293 605 327 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 80 516 110 565
+rect 27 500 110 516
+rect 27 466 37 500
+rect 71 466 110 500
+rect 27 450 110 466
+rect 166 458 196 565
+rect 252 540 282 565
+rect 252 510 289 540
+rect 80 263 110 450
+rect 163 442 217 458
+rect 163 408 173 442
+rect 207 408 217 442
+rect 163 392 217 408
+rect 166 263 196 392
+rect 259 368 289 510
+rect 259 352 313 368
+rect 259 332 269 352
+rect 252 318 269 332
+rect 303 318 313 352
+rect 252 302 313 318
+rect 252 263 282 302
+rect 80 89 110 115
+rect 166 89 196 115
+rect 252 89 282 115
+<< polycont >>
+rect 37 466 71 500
+rect 173 408 207 442
+rect 269 318 303 352
+<< locali >>
+rect 0 1093 374 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 374 1093
+rect 35 949 69 965
+rect 207 949 241 1049
+rect 207 725 241 741
+rect 293 949 327 965
+rect 69 673 139 691
+rect 35 657 139 673
+rect 37 500 71 523
+rect 37 450 71 466
+rect 105 352 139 657
+rect 173 442 207 597
+rect 293 483 327 605
+rect 173 392 207 408
+rect 105 318 269 352
+rect 303 318 319 352
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 318
+rect 121 115 155 131
+rect 207 215 241 231
+rect 207 61 241 131
+rect 293 215 327 227
+rect 293 115 327 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 374 61
+rect 0 0 374 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 37 523 71 557
+rect 173 597 207 631
+rect 293 449 327 483
+rect 293 227 327 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 374 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 374 1093
+rect 0 1049 374 1059
+rect 161 631 219 637
+rect 140 597 173 631
+rect 207 597 219 631
+rect 161 591 219 597
+rect 25 557 83 563
+rect 25 523 37 557
+rect 71 523 105 557
+rect 25 517 83 523
+rect 281 483 339 489
+rect 281 449 293 483
+rect 327 449 339 483
+rect 281 443 339 449
+rect 293 267 327 443
+rect 281 261 339 267
+rect 281 227 293 261
+rect 327 227 339 261
+rect 281 221 339 227
+rect 0 51 374 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 374 51
+rect 0 0 374 17
+<< labels >>
+rlabel metal1 311 392 311 392 1 Y
+port 1 n
+rlabel viali 190 614 190 614 1 A
+port 2 n
+rlabel viali 54 540 54 540 1 B
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__or2_2.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_2.mag
new file mode 100644
index 0000000..e1e52cc
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_2.mag
@@ -0,0 +1,223 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007758
+<< checkpaint >>
+rect -1269 2461 1722 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1722 -1129
+<< nwell >>
+rect -9 529 462 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 215 252 263
+rect 196 131 207 215
+rect 241 131 252 215
+rect 196 115 252 131
+rect 282 215 338 263
+rect 282 131 293 215
+rect 327 131 338 215
+rect 282 115 338 131
+rect 368 215 421 263
+rect 368 131 379 215
+rect 413 131 421 215
+rect 368 115 421 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 673 35 949
+rect 69 673 80 949
+rect 27 565 80 673
+rect 110 565 166 965
+rect 196 949 252 965
+rect 196 741 207 949
+rect 241 741 252 949
+rect 196 565 252 741
+rect 282 949 338 965
+rect 282 605 293 949
+rect 327 605 338 949
+rect 282 565 338 605
+rect 368 949 421 965
+rect 368 605 379 949
+rect 413 605 421 949
+rect 368 565 421 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 207 131 241 215
+rect 293 131 327 215
+rect 379 131 413 215
+<< pdiffc >>
+rect 35 673 69 949
+rect 207 741 241 949
+rect 293 605 327 949
+rect 379 605 413 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 338 965 368 992
+rect 80 516 110 565
+rect 27 500 110 516
+rect 27 466 37 500
+rect 71 466 110 500
+rect 27 450 110 466
+rect 166 458 196 565
+rect 252 540 282 565
+rect 338 540 368 565
+rect 252 510 368 540
+rect 80 263 110 450
+rect 163 442 217 458
+rect 163 408 173 442
+rect 207 408 217 442
+rect 163 392 217 408
+rect 166 263 196 392
+rect 259 368 289 510
+rect 259 352 313 368
+rect 259 332 269 352
+rect 252 318 269 332
+rect 303 332 313 352
+rect 303 318 368 332
+rect 252 302 368 318
+rect 252 263 282 302
+rect 338 263 368 302
+rect 80 89 110 115
+rect 166 89 196 115
+rect 252 89 282 115
+rect 338 89 368 115
+<< polycont >>
+rect 37 466 71 500
+rect 173 408 207 442
+rect 269 318 303 352
+<< locali >>
+rect 0 1093 462 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 462 1093
+rect 35 949 69 965
+rect 207 949 241 1049
+rect 207 725 241 741
+rect 293 949 327 965
+rect 69 673 139 691
+rect 35 657 139 673
+rect 37 500 71 523
+rect 37 450 71 466
+rect 105 352 139 657
+rect 173 442 207 597
+rect 293 483 327 605
+rect 379 949 413 1049
+rect 379 589 413 605
+rect 173 392 207 408
+rect 105 318 269 352
+rect 303 318 319 352
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 318
+rect 121 115 155 131
+rect 207 215 241 231
+rect 207 61 241 131
+rect 293 215 327 227
+rect 293 115 327 131
+rect 379 215 413 231
+rect 379 61 413 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 462 61
+rect 0 0 462 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 37 523 71 557
+rect 173 597 207 631
+rect 293 449 327 483
+rect 293 227 327 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+<< metal1 >>
+rect 0 1093 462 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 462 1093
+rect 0 1049 462 1059
+rect 161 631 219 637
+rect 140 597 173 631
+rect 207 597 219 631
+rect 161 591 219 597
+rect 25 557 83 563
+rect 25 523 37 557
+rect 71 523 105 557
+rect 25 517 83 523
+rect 281 483 339 489
+rect 281 449 293 483
+rect 327 449 339 483
+rect 281 443 339 449
+rect 293 267 327 443
+rect 281 261 339 267
+rect 281 227 293 261
+rect 327 227 339 261
+rect 281 221 339 227
+rect 0 51 462 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 462 51
+rect 0 0 462 17
+<< labels >>
+rlabel metal1 311 392 311 392 1 Y
+port 1 n
+rlabel viali 190 614 190 614 1 A
+port 2 n
+rlabel viali 54 540 54 540 1 B
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__or2_4.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_4.mag
new file mode 100644
index 0000000..0ef160d
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_4.mag
@@ -0,0 +1,286 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007758
+<< checkpaint >>
+rect -1269 2461 1898 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1898 -1129
+<< nwell >>
+rect -9 529 638 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+rect 424 565 454 965
+rect 510 565 540 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 215 252 263
+rect 196 131 207 215
+rect 241 131 252 215
+rect 196 115 252 131
+rect 282 215 338 263
+rect 282 131 293 215
+rect 327 131 338 215
+rect 282 115 338 131
+rect 368 215 424 263
+rect 368 131 379 215
+rect 413 131 424 215
+rect 368 115 424 131
+rect 454 215 510 263
+rect 454 131 465 215
+rect 499 131 510 215
+rect 454 115 510 131
+rect 540 215 593 263
+rect 540 131 551 215
+rect 585 131 593 215
+rect 540 115 593 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 673 35 949
+rect 69 673 80 949
+rect 27 565 80 673
+rect 110 565 166 965
+rect 196 949 252 965
+rect 196 741 207 949
+rect 241 741 252 949
+rect 196 565 252 741
+rect 282 949 338 965
+rect 282 605 293 949
+rect 327 605 338 949
+rect 282 565 338 605
+rect 368 949 424 965
+rect 368 605 379 949
+rect 413 605 424 949
+rect 368 565 424 605
+rect 454 949 510 965
+rect 454 605 465 949
+rect 499 605 510 949
+rect 454 565 510 605
+rect 540 949 593 965
+rect 540 605 551 949
+rect 585 605 593 949
+rect 540 565 593 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 207 131 241 215
+rect 293 131 327 215
+rect 379 131 413 215
+rect 465 131 499 215
+rect 551 131 585 215
+<< pdiffc >>
+rect 35 673 69 949
+rect 207 741 241 949
+rect 293 605 327 949
+rect 379 605 413 949
+rect 465 605 499 949
+rect 551 605 585 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 338 965 368 992
+rect 424 965 454 991
+rect 510 965 540 991
+rect 80 516 110 565
+rect 27 500 110 516
+rect 27 466 37 500
+rect 71 466 110 500
+rect 27 450 110 466
+rect 166 458 196 565
+rect 252 540 282 565
+rect 338 540 368 565
+rect 424 540 454 565
+rect 510 540 540 565
+rect 252 510 540 540
+rect 80 263 110 450
+rect 163 442 217 458
+rect 163 408 173 442
+rect 207 408 217 442
+rect 163 392 217 408
+rect 166 263 196 392
+rect 259 368 289 510
+rect 259 352 313 368
+rect 259 332 269 352
+rect 252 318 269 332
+rect 303 332 313 352
+rect 303 318 540 332
+rect 252 302 540 318
+rect 252 263 282 302
+rect 338 263 368 302
+rect 424 263 454 302
+rect 510 263 540 302
+rect 80 89 110 115
+rect 166 89 196 115
+rect 252 89 282 115
+rect 338 89 368 115
+rect 424 89 454 115
+rect 510 89 540 115
+<< polycont >>
+rect 37 466 71 500
+rect 173 408 207 442
+rect 269 318 303 352
+<< locali >>
+rect 0 1093 638 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 459 1093
+rect 493 1049 638 1093
+rect 35 949 69 965
+rect 207 949 241 1049
+rect 207 725 241 741
+rect 293 949 327 965
+rect 69 673 139 691
+rect 35 657 139 673
+rect 37 500 71 523
+rect 37 450 71 466
+rect 105 352 139 657
+rect 173 442 207 597
+rect 293 483 327 605
+rect 379 949 413 1049
+rect 379 589 413 605
+rect 465 949 499 965
+rect 465 483 499 605
+rect 551 949 585 1049
+rect 551 589 585 605
+rect 173 392 207 408
+rect 105 318 269 352
+rect 303 318 319 352
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 318
+rect 121 115 155 131
+rect 207 215 241 231
+rect 207 61 241 131
+rect 293 215 327 227
+rect 293 115 327 131
+rect 379 215 413 231
+rect 379 61 413 131
+rect 465 215 499 227
+rect 465 115 499 131
+rect 551 215 585 231
+rect 551 61 585 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 459 61
+rect 493 17 638 61
+rect 0 0 638 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 459 1083 493 1093
+rect 459 1059 493 1083
+rect 37 523 71 557
+rect 173 597 207 631
+rect 293 449 327 483
+rect 465 449 499 483
+rect 293 227 327 261
+rect 465 227 499 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+rect 459 27 493 51
+rect 459 17 493 27
+<< metal1 >>
+rect 0 1093 638 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 459 1093
+rect 493 1059 638 1093
+rect 0 1049 638 1059
+rect 161 631 219 637
+rect 140 597 173 631
+rect 207 597 219 631
+rect 161 591 219 597
+rect 25 557 83 563
+rect 25 523 37 557
+rect 71 523 105 557
+rect 25 517 83 523
+rect 281 483 339 489
+rect 453 483 511 489
+rect 281 449 293 483
+rect 327 449 465 483
+rect 499 449 511 483
+rect 281 443 339 449
+rect 453 443 511 449
+rect 293 267 327 443
+rect 465 267 499 443
+rect 281 261 339 267
+rect 453 261 511 267
+rect 281 227 293 261
+rect 327 227 465 261
+rect 499 227 511 261
+rect 281 221 339 227
+rect 453 221 511 227
+rect 0 51 638 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 459 51
+rect 493 17 638 51
+rect 0 0 638 17
+<< labels >>
+rlabel metal1 311 392 311 392 1 Y
+port 1 n
+rlabel viali 190 614 190 614 1 A
+port 2 n
+rlabel viali 54 540 54 540 1 B
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__or2_8.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_8.mag
new file mode 100644
index 0000000..28604cc
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_8.mag
@@ -0,0 +1,428 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007758
+<< checkpaint >>
+rect -1269 2461 2250 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 2250 -1129
+<< nwell >>
+rect -9 529 990 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+rect 596 115 626 263
+rect 682 115 712 263
+rect 768 115 798 263
+rect 854 115 884 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 252 565 282 965
+rect 338 565 368 965
+rect 424 565 454 965
+rect 510 565 540 965
+rect 596 565 626 965
+rect 682 565 712 965
+rect 768 565 798 965
+rect 854 565 884 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 215 252 263
+rect 196 131 207 215
+rect 241 131 252 215
+rect 196 115 252 131
+rect 282 215 338 263
+rect 282 131 293 215
+rect 327 131 338 215
+rect 282 115 338 131
+rect 368 215 424 263
+rect 368 131 379 215
+rect 413 131 424 215
+rect 368 115 424 131
+rect 454 215 510 263
+rect 454 131 465 215
+rect 499 131 510 215
+rect 454 115 510 131
+rect 540 215 596 263
+rect 540 131 551 215
+rect 585 131 596 215
+rect 540 115 596 131
+rect 626 215 682 263
+rect 626 131 637 215
+rect 671 131 682 215
+rect 626 115 682 131
+rect 712 215 768 263
+rect 712 131 723 215
+rect 757 131 768 215
+rect 712 115 768 131
+rect 798 215 854 263
+rect 798 131 809 215
+rect 843 131 854 215
+rect 798 115 854 131
+rect 884 215 937 263
+rect 884 131 895 215
+rect 929 131 937 215
+rect 884 115 937 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 673 35 949
+rect 69 673 80 949
+rect 27 565 80 673
+rect 110 565 166 965
+rect 196 949 252 965
+rect 196 741 207 949
+rect 241 741 252 949
+rect 196 565 252 741
+rect 282 949 338 965
+rect 282 605 293 949
+rect 327 605 338 949
+rect 282 565 338 605
+rect 368 949 424 965
+rect 368 605 379 949
+rect 413 605 424 949
+rect 368 565 424 605
+rect 454 949 510 965
+rect 454 605 465 949
+rect 499 605 510 949
+rect 454 565 510 605
+rect 540 949 596 965
+rect 540 605 551 949
+rect 585 605 596 949
+rect 540 565 596 605
+rect 626 949 682 965
+rect 626 605 637 949
+rect 671 605 682 949
+rect 626 565 682 605
+rect 712 949 768 965
+rect 712 605 723 949
+rect 757 605 768 949
+rect 712 565 768 605
+rect 798 949 854 965
+rect 798 605 809 949
+rect 843 605 854 949
+rect 798 565 854 605
+rect 884 949 937 965
+rect 884 605 895 949
+rect 929 605 937 949
+rect 884 565 937 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 207 131 241 215
+rect 293 131 327 215
+rect 379 131 413 215
+rect 465 131 499 215
+rect 551 131 585 215
+rect 637 131 671 215
+rect 723 131 757 215
+rect 809 131 843 215
+rect 895 131 929 215
+<< pdiffc >>
+rect 35 673 69 949
+rect 207 741 241 949
+rect 293 605 327 949
+rect 379 605 413 949
+rect 465 605 499 949
+rect 551 605 585 949
+rect 637 605 671 949
+rect 723 605 757 949
+rect 809 605 843 949
+rect 895 605 929 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+rect 571 27 595 61
+rect 629 27 653 61
+rect 707 27 731 61
+rect 765 27 789 61
+rect 843 27 867 61
+rect 901 27 925 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+rect 571 1049 595 1083
+rect 629 1049 653 1083
+rect 707 1049 731 1083
+rect 765 1049 789 1083
+rect 843 1049 867 1083
+rect 901 1049 925 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+rect 595 27 629 61
+rect 731 27 765 61
+rect 867 27 901 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+rect 595 1049 629 1083
+rect 731 1049 765 1083
+rect 867 1049 901 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 338 965 368 992
+rect 424 965 454 991
+rect 510 965 540 991
+rect 596 965 626 991
+rect 682 965 712 991
+rect 768 965 798 991
+rect 854 965 884 991
+rect 80 516 110 565
+rect 27 500 110 516
+rect 27 466 37 500
+rect 71 466 110 500
+rect 27 450 110 466
+rect 166 458 196 565
+rect 252 540 282 565
+rect 338 540 368 565
+rect 424 540 454 565
+rect 510 540 540 565
+rect 596 540 626 565
+rect 682 540 712 565
+rect 768 540 798 565
+rect 854 540 884 565
+rect 252 510 884 540
+rect 80 263 110 450
+rect 163 442 217 458
+rect 163 408 173 442
+rect 207 408 217 442
+rect 163 392 217 408
+rect 166 263 196 392
+rect 259 368 289 510
+rect 259 352 313 368
+rect 259 332 269 352
+rect 252 318 269 332
+rect 303 332 313 352
+rect 596 332 626 510
+rect 303 318 884 332
+rect 252 302 884 318
+rect 252 263 282 302
+rect 338 263 368 302
+rect 424 263 454 302
+rect 510 263 540 302
+rect 596 263 626 302
+rect 682 263 712 302
+rect 768 263 798 302
+rect 854 263 884 302
+rect 80 89 110 115
+rect 166 89 196 115
+rect 252 89 282 115
+rect 338 89 368 115
+rect 424 89 454 115
+rect 510 89 540 115
+rect 596 89 626 115
+rect 682 89 712 115
+rect 768 89 798 115
+rect 854 89 884 115
+<< polycont >>
+rect 37 466 71 500
+rect 173 408 207 442
+rect 269 318 303 352
+<< locali >>
+rect 0 1093 990 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 459 1093
+rect 493 1049 595 1093
+rect 629 1049 731 1093
+rect 765 1049 867 1093
+rect 901 1049 990 1093
+rect 35 949 69 965
+rect 207 949 241 1049
+rect 207 725 241 741
+rect 293 949 327 965
+rect 69 673 139 691
+rect 35 657 139 673
+rect 37 500 71 523
+rect 37 450 71 466
+rect 105 352 139 657
+rect 173 442 207 597
+rect 293 483 327 605
+rect 379 949 413 1049
+rect 379 589 413 605
+rect 465 949 499 965
+rect 465 483 499 605
+rect 551 949 585 1049
+rect 551 589 585 605
+rect 637 949 671 965
+rect 637 483 671 605
+rect 723 949 757 1049
+rect 723 589 757 605
+rect 809 949 843 965
+rect 809 483 843 605
+rect 895 949 929 1049
+rect 895 589 929 605
+rect 173 392 207 408
+rect 105 318 269 352
+rect 303 318 319 352
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 318
+rect 121 115 155 131
+rect 207 215 241 231
+rect 207 61 241 131
+rect 293 215 327 227
+rect 293 115 327 131
+rect 379 215 413 231
+rect 379 61 413 131
+rect 465 215 499 227
+rect 465 115 499 131
+rect 551 215 585 231
+rect 551 61 585 131
+rect 637 215 671 227
+rect 637 115 671 131
+rect 723 215 757 231
+rect 723 61 757 131
+rect 809 215 843 227
+rect 809 115 843 131
+rect 895 215 929 231
+rect 895 61 929 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 459 61
+rect 493 17 595 61
+rect 629 17 731 61
+rect 765 17 867 61
+rect 901 17 990 61
+rect 0 0 990 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 459 1083 493 1093
+rect 459 1059 493 1083
+rect 595 1083 629 1093
+rect 595 1059 629 1083
+rect 731 1083 765 1093
+rect 731 1059 765 1083
+rect 867 1083 901 1093
+rect 867 1059 901 1083
+rect 37 523 71 557
+rect 173 597 207 631
+rect 293 449 327 483
+rect 465 449 499 483
+rect 637 449 671 483
+rect 809 449 843 483
+rect 293 227 327 261
+rect 465 227 499 261
+rect 637 227 671 261
+rect 809 227 843 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+rect 459 27 493 51
+rect 459 17 493 27
+rect 595 27 629 51
+rect 595 17 629 27
+rect 731 27 765 51
+rect 731 17 765 27
+rect 867 27 901 51
+rect 867 17 901 27
+<< metal1 >>
+rect 0 1093 990 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 459 1093
+rect 493 1059 595 1093
+rect 629 1059 731 1093
+rect 765 1059 867 1093
+rect 901 1059 990 1093
+rect 0 1049 990 1059
+rect 161 631 219 637
+rect 140 597 173 631
+rect 207 597 219 631
+rect 161 591 219 597
+rect 25 557 83 563
+rect 25 523 37 557
+rect 71 523 105 557
+rect 25 517 83 523
+rect 281 483 339 489
+rect 453 483 511 489
+rect 625 483 683 489
+rect 797 483 855 489
+rect 281 449 293 483
+rect 327 449 465 483
+rect 499 449 637 483
+rect 671 449 809 483
+rect 843 449 855 483
+rect 281 443 339 449
+rect 453 443 511 449
+rect 625 443 683 449
+rect 797 443 855 449
+rect 293 267 327 443
+rect 465 267 499 443
+rect 637 267 671 443
+rect 809 267 843 443
+rect 281 261 339 267
+rect 453 261 511 267
+rect 625 261 683 267
+rect 797 261 855 267
+rect 281 227 293 261
+rect 327 227 465 261
+rect 499 227 637 261
+rect 671 227 683 261
+rect 712 227 809 261
+rect 843 227 855 261
+rect 281 221 339 227
+rect 453 221 511 227
+rect 625 221 683 227
+rect 797 221 855 227
+rect 0 51 990 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 459 51
+rect 493 17 595 51
+rect 629 17 731 51
+rect 765 17 867 51
+rect 901 17 990 51
+rect 0 0 990 17
+<< labels >>
+rlabel metal1 311 392 311 392 1 Y
+port 1 n
+rlabel viali 190 614 190 614 1 A
+port 2 n
+rlabel viali 54 540 54 540 1 B
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__or2_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_l.mag
new file mode 100644
index 0000000..90e21ba
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_l.mag
@@ -0,0 +1,186 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007758
+<< checkpaint >>
+rect -1269 -242 1634 2379
+<< nwell >>
+rect -9 529 374 1119
+<< nmoslvt >>
+rect 80 115 110 219
+rect 166 115 196 219
+rect 252 115 282 219
+<< pmos >>
+rect 80 713 110 965
+rect 166 713 196 965
+rect 252 713 282 965
+<< ndiff >>
+rect 27 165 80 219
+rect 27 131 35 165
+rect 69 131 80 165
+rect 27 115 80 131
+rect 110 165 166 219
+rect 110 131 121 165
+rect 155 131 166 165
+rect 110 115 166 131
+rect 196 165 252 219
+rect 196 131 207 165
+rect 241 131 252 165
+rect 196 115 252 131
+rect 282 165 335 219
+rect 282 131 293 165
+rect 327 131 335 165
+rect 282 115 335 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 877 35 949
+rect 69 877 80 949
+rect 27 713 80 877
+rect 110 713 166 965
+rect 196 949 252 965
+rect 196 877 207 949
+rect 241 877 252 949
+rect 196 713 252 877
+rect 282 949 335 965
+rect 282 877 293 949
+rect 327 877 335 949
+rect 282 713 335 877
+<< ndiffc >>
+rect 35 131 69 165
+rect 121 131 155 165
+rect 207 131 241 165
+rect 293 131 327 165
+<< pdiffc >>
+rect 35 877 69 949
+rect 207 877 241 949
+rect 293 877 327 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 252 965 282 991
+rect 80 516 110 713
+rect 27 500 110 516
+rect 27 466 37 500
+rect 71 466 110 500
+rect 27 450 110 466
+rect 166 458 196 713
+rect 252 540 282 713
+rect 252 510 289 540
+rect 80 219 110 450
+rect 163 442 217 458
+rect 163 408 173 442
+rect 207 408 217 442
+rect 163 392 217 408
+rect 166 219 196 392
+rect 259 368 289 510
+rect 259 352 313 368
+rect 259 332 269 352
+rect 252 318 269 332
+rect 303 318 313 352
+rect 252 302 313 318
+rect 252 219 282 302
+rect 80 89 110 115
+rect 166 89 196 115
+rect 252 89 282 115
+<< polycont >>
+rect 37 466 71 500
+rect 173 408 207 442
+rect 269 318 303 352
+<< locali >>
+rect 0 1093 374 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 374 1093
+rect 35 949 69 965
+rect 35 691 69 877
+rect 207 949 241 1049
+rect 207 861 241 877
+rect 293 949 327 965
+rect 35 657 139 691
+rect 37 500 71 523
+rect 37 450 71 466
+rect 105 352 139 657
+rect 173 442 207 597
+rect 293 483 327 877
+rect 173 392 207 408
+rect 105 318 269 352
+rect 303 318 319 352
+rect 35 165 69 181
+rect 35 61 69 131
+rect 121 165 155 318
+rect 121 115 155 131
+rect 207 165 241 181
+rect 207 61 241 131
+rect 293 165 327 227
+rect 293 115 327 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 374 61
+rect 0 0 374 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 37 523 71 557
+rect 173 597 207 631
+rect 293 449 327 483
+rect 293 227 327 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 374 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 374 1093
+rect 0 1049 374 1059
+rect 161 631 219 637
+rect 140 597 173 631
+rect 207 597 219 631
+rect 161 591 219 597
+rect 25 557 83 563
+rect 25 523 37 557
+rect 71 523 105 557
+rect 25 517 83 523
+rect 281 483 339 489
+rect 281 449 293 483
+rect 327 449 339 483
+rect 281 443 339 449
+rect 293 267 327 443
+rect 281 261 339 267
+rect 281 227 293 261
+rect 327 227 339 261
+rect 281 221 339 227
+rect 0 51 374 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 374 51
+rect 0 0 374 17
+<< labels >>
+rlabel metal1 311 392 311 392 1 Y
+port 1 n
+rlabel viali 54 540 54 540 1 B
+port 2 n
+rlabel viali 190 614 190 614 1 A
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__tbufi_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__tbufi_1.mag
new file mode 100644
index 0000000..520638c
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__tbufi_1.mag
@@ -0,0 +1,187 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007758
+<< checkpaint >>
+rect -1269 2461 1635 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1635 -1129
+<< nwell >>
+rect -9 529 375 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 238 115 268 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 238 565 268 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 115 238 263
+rect 268 215 321 263
+rect 268 131 279 215
+rect 313 131 321 215
+rect 268 115 321 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 605 35 949
+rect 69 605 80 949
+rect 27 565 80 605
+rect 110 949 166 965
+rect 110 673 121 949
+rect 155 673 166 949
+rect 110 565 166 673
+rect 196 565 238 965
+rect 268 949 321 965
+rect 268 605 279 949
+rect 313 605 321 949
+rect 268 565 321 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 279 131 313 215
+<< pdiffc >>
+rect 35 605 69 949
+rect 121 673 155 949
+rect 279 605 313 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 238 965 268 991
+rect 80 550 110 565
+rect 39 520 110 550
+rect 39 308 69 520
+rect 166 477 196 565
+rect 133 461 196 477
+rect 133 427 143 461
+rect 177 427 196 461
+rect 133 411 196 427
+rect 238 399 268 565
+rect 238 383 292 399
+rect 111 335 165 351
+rect 111 308 121 335
+rect 39 301 121 308
+rect 155 308 165 335
+rect 238 349 248 383
+rect 282 349 292 383
+rect 238 333 292 349
+rect 155 301 196 308
+rect 39 278 196 301
+rect 80 263 110 278
+rect 166 263 196 278
+rect 238 263 268 333
+rect 80 89 110 115
+rect 166 89 196 115
+rect 238 89 268 115
+<< polycont >>
+rect 143 427 177 461
+rect 121 301 155 335
+rect 248 349 282 383
+<< locali >>
+rect 0 1093 374 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 374 1093
+rect 35 949 69 965
+rect 121 949 155 1049
+rect 121 657 155 673
+rect 279 949 313 965
+rect 35 461 69 605
+rect 143 461 177 477
+rect 35 427 143 461
+rect 35 215 69 427
+rect 143 411 177 427
+rect 211 383 245 597
+rect 279 483 313 605
+rect 211 349 248 383
+rect 282 349 298 383
+rect 103 301 121 335
+rect 155 301 171 335
+rect 35 115 69 131
+rect 121 215 155 231
+rect 121 61 155 131
+rect 279 215 313 227
+rect 279 115 313 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 374 61
+rect 0 0 374 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 211 597 245 631
+rect 279 449 313 483
+rect 121 301 155 335
+rect 279 227 313 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 374 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 374 1093
+rect 0 1049 374 1059
+rect 199 631 257 637
+rect 177 597 211 631
+rect 245 597 257 631
+rect 199 591 257 597
+rect 109 557 167 563
+rect 109 523 189 557
+rect 109 517 167 523
+rect 121 341 155 517
+rect 267 483 325 489
+rect 267 449 279 483
+rect 313 449 325 483
+rect 267 443 325 449
+rect 109 335 167 341
+rect 109 301 121 335
+rect 155 301 167 335
+rect 109 295 167 301
+rect 279 267 313 443
+rect 267 261 325 267
+rect 267 227 279 261
+rect 313 227 325 261
+rect 267 221 325 227
+rect 0 51 374 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 374 51
+rect 0 0 374 17
+<< labels >>
+rlabel metal1 305 312 305 312 1 Y
+port 1 n
+rlabel viali 228 614 228 614 1 A
+port 2 n
+rlabel metal1 138 540 138 540 1 OE
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__tbufi_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__tbufi_l.mag
new file mode 100644
index 0000000..2e77b1f
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__tbufi_l.mag
@@ -0,0 +1,185 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007759
+<< checkpaint >>
+rect -1269 -242 1635 2379
+<< nwell >>
+rect -9 529 375 1119
+<< nmoslvt >>
+rect 80 115 110 219
+rect 166 115 196 219
+rect 238 115 268 219
+<< pmos >>
+rect 80 713 110 965
+rect 166 713 196 965
+rect 238 713 268 965
+<< ndiff >>
+rect 27 165 80 219
+rect 27 131 35 165
+rect 69 131 80 165
+rect 27 115 80 131
+rect 110 165 166 219
+rect 110 131 121 165
+rect 155 131 166 165
+rect 110 115 166 131
+rect 196 115 238 219
+rect 268 165 321 219
+rect 268 131 279 165
+rect 313 131 321 165
+rect 268 115 321 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 809 35 949
+rect 69 809 80 949
+rect 27 713 80 809
+rect 110 949 166 965
+rect 110 809 121 949
+rect 155 809 166 949
+rect 110 713 166 809
+rect 196 713 238 965
+rect 268 949 321 965
+rect 268 809 279 949
+rect 313 809 321 949
+rect 268 713 321 809
+<< ndiffc >>
+rect 35 131 69 165
+rect 121 131 155 165
+rect 279 131 313 165
+<< pdiffc >>
+rect 35 809 69 949
+rect 121 809 155 949
+rect 279 809 313 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 238 965 268 991
+rect 80 550 110 713
+rect 39 520 110 550
+rect 39 308 69 520
+rect 166 477 196 713
+rect 133 461 196 477
+rect 133 427 143 461
+rect 177 427 196 461
+rect 133 411 196 427
+rect 238 399 268 713
+rect 238 383 292 399
+rect 111 335 165 351
+rect 111 308 121 335
+rect 39 301 121 308
+rect 155 308 165 335
+rect 238 349 248 383
+rect 282 349 292 383
+rect 238 333 292 349
+rect 155 301 196 308
+rect 39 278 196 301
+rect 80 219 110 278
+rect 166 219 196 278
+rect 238 219 268 333
+rect 80 89 110 115
+rect 166 89 196 115
+rect 238 89 268 115
+<< polycont >>
+rect 143 427 177 461
+rect 121 301 155 335
+rect 248 349 282 383
+<< locali >>
+rect 0 1093 374 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 374 1093
+rect 35 949 69 965
+rect 35 461 69 809
+rect 121 949 155 1049
+rect 121 793 155 809
+rect 279 949 313 965
+rect 143 461 177 477
+rect 35 427 143 461
+rect 35 165 69 427
+rect 143 411 177 427
+rect 211 383 245 597
+rect 279 483 313 809
+rect 211 349 248 383
+rect 282 349 298 383
+rect 103 301 121 335
+rect 155 301 171 335
+rect 35 115 69 131
+rect 121 165 155 181
+rect 121 61 155 131
+rect 279 165 313 227
+rect 279 115 313 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 374 61
+rect 0 0 374 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 211 597 245 631
+rect 279 449 313 483
+rect 121 301 155 335
+rect 279 227 313 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 374 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 374 1093
+rect 0 1049 374 1059
+rect 199 631 257 637
+rect 177 597 211 631
+rect 245 597 257 631
+rect 199 591 257 597
+rect 109 557 167 563
+rect 109 523 189 557
+rect 109 517 167 523
+rect 121 341 155 517
+rect 267 483 325 489
+rect 267 449 279 483
+rect 313 449 325 483
+rect 267 443 325 449
+rect 109 335 167 341
+rect 109 301 121 335
+rect 155 301 167 335
+rect 109 295 167 301
+rect 279 267 313 443
+rect 267 261 325 267
+rect 267 227 279 261
+rect 313 227 325 261
+rect 267 221 325 227
+rect 0 51 374 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 374 51
+rect 0 0 374 17
+<< labels >>
+rlabel metal1 305 312 305 312 1 Y
+port 1 n
+rlabel viali 228 614 228 614 1 A
+port 2 n
+rlabel metal1 138 540 138 540 1 OE
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__tiehi.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__tiehi.mag
new file mode 100644
index 0000000..8c7f803
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__tiehi.mag
@@ -0,0 +1,99 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007759
+<< checkpaint >>
+rect -1269 -242 1459 2379
+<< nwell >>
+rect -9 529 199 1119
+<< nmoslvt >>
+rect 80 115 110 263
+<< pmos >>
+rect 80 565 110 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 163 263
+rect 110 131 121 215
+rect 155 131 163 215
+rect 110 115 163 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 605 35 949
+rect 69 605 80 949
+rect 27 565 80 605
+rect 110 949 163 965
+rect 110 605 121 949
+rect 155 605 163 949
+rect 110 565 163 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+<< pdiffc >>
+rect 35 605 69 949
+rect 121 605 155 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+<< poly >>
+rect 80 965 110 991
+rect 80 381 110 565
+rect 80 365 134 381
+rect 80 331 90 365
+rect 124 331 134 365
+rect 80 315 134 331
+rect 80 263 110 315
+rect 80 89 110 115
+<< polycont >>
+rect 90 331 124 365
+<< locali >>
+rect 0 1093 198 1110
+rect 0 1049 51 1093
+rect 85 1049 198 1093
+rect 35 949 69 1049
+rect 35 589 69 605
+rect 121 949 155 965
+rect 121 557 155 605
+rect 74 331 90 365
+rect 124 331 155 365
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 331
+rect 121 115 155 131
+rect 0 17 51 61
+rect 85 17 198 61
+rect 0 0 198 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 121 523 155 557
+rect 51 27 85 51
+rect 51 17 85 27
+<< metal1 >>
+rect 0 1093 198 1110
+rect 0 1059 51 1093
+rect 85 1059 198 1093
+rect 0 1049 198 1059
+rect 94 557 167 563
+rect 94 523 121 557
+rect 155 523 167 557
+rect 94 517 167 523
+rect 0 51 198 61
+rect 0 17 51 51
+rect 85 17 198 51
+rect 0 0 198 17
+<< labels >>
+rlabel viali 138 540 138 540 1 Y
+port 1 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__tielo.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__tielo.mag
new file mode 100644
index 0000000..8efa078
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__tielo.mag
@@ -0,0 +1,101 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007759
+<< checkpaint >>
+rect -1269 2461 1459 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1459 -1129
+<< nwell >>
+rect -9 529 199 1119
+<< nmoslvt >>
+rect 80 115 110 263
+<< pmos >>
+rect 80 565 110 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 163 263
+rect 110 131 121 215
+rect 155 131 163 215
+rect 110 115 163 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 605 35 949
+rect 69 605 80 949
+rect 27 565 80 605
+rect 110 949 163 965
+rect 110 605 121 949
+rect 155 605 163 949
+rect 110 565 163 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+<< pdiffc >>
+rect 35 605 69 949
+rect 121 605 155 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+<< poly >>
+rect 80 965 110 991
+rect 80 513 110 565
+rect 80 497 134 513
+rect 80 463 90 497
+rect 124 463 134 497
+rect 80 447 134 463
+rect 80 263 110 447
+rect 80 89 110 115
+<< polycont >>
+rect 90 463 124 497
+<< locali >>
+rect 0 1093 198 1110
+rect 0 1049 51 1093
+rect 85 1049 198 1093
+rect 35 949 69 1049
+rect 35 589 69 605
+rect 121 949 155 965
+rect 121 497 155 605
+rect 74 463 90 497
+rect 124 463 155 497
+rect 35 215 69 231
+rect 35 61 69 131
+rect 121 215 155 301
+rect 121 115 155 131
+rect 0 17 51 61
+rect 85 17 198 61
+rect 0 0 198 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 121 301 155 335
+rect 51 27 85 51
+rect 51 17 85 27
+<< metal1 >>
+rect 0 1093 198 1110
+rect 0 1059 51 1093
+rect 85 1059 198 1093
+rect 0 1049 198 1059
+rect 94 335 167 341
+rect 94 301 121 335
+rect 155 301 167 335
+rect 94 295 167 301
+rect 0 51 198 61
+rect 0 17 51 51
+rect 85 17 198 51
+rect 0 0 198 17
+<< labels >>
+rlabel viali 138 318 138 318 1 Y
+port 1 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__tnbufi_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__tnbufi_1.mag
new file mode 100644
index 0000000..1facdb3
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__tnbufi_1.mag
@@ -0,0 +1,182 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007759
+<< checkpaint >>
+rect -1269 2461 1635 2601
+rect -1760 -1129 6260 2461
+rect -1269 -1260 1635 -1129
+<< nwell >>
+rect -9 529 375 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 238 115 268 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 238 565 268 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 215 166 263
+rect 110 131 121 215
+rect 155 131 166 215
+rect 110 115 166 131
+rect 196 115 238 263
+rect 268 215 321 263
+rect 268 131 279 215
+rect 313 131 321 215
+rect 268 115 321 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 605 35 949
+rect 69 605 80 949
+rect 27 565 80 605
+rect 110 949 166 965
+rect 110 673 121 949
+rect 155 673 166 949
+rect 110 565 166 673
+rect 196 565 238 965
+rect 268 949 321 965
+rect 268 605 279 949
+rect 313 605 321 949
+rect 268 565 321 605
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 215
+rect 279 131 313 215
+<< pdiffc >>
+rect 35 605 69 949
+rect 121 673 155 949
+rect 279 605 313 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 238 965 268 991
+rect 80 550 110 565
+rect 166 550 196 565
+rect 39 520 196 550
+rect 39 308 69 520
+rect 111 518 165 520
+rect 111 484 121 518
+rect 155 484 165 518
+rect 111 468 165 484
+rect 111 400 196 416
+rect 111 366 121 400
+rect 155 366 196 400
+rect 111 350 196 366
+rect 39 278 110 308
+rect 80 263 110 278
+rect 166 263 196 350
+rect 238 399 268 565
+rect 238 383 292 399
+rect 238 349 248 383
+rect 282 349 292 383
+rect 238 333 292 349
+rect 238 263 268 333
+rect 80 89 110 115
+rect 166 89 196 115
+rect 238 89 268 115
+<< polycont >>
+rect 121 484 155 518
+rect 121 366 155 400
+rect 248 349 282 383
+<< locali >>
+rect 0 1093 374 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 374 1093
+rect 35 949 69 965
+rect 121 949 155 1049
+rect 121 657 155 673
+rect 279 949 313 965
+rect 35 400 69 605
+rect 121 518 155 523
+rect 121 468 155 484
+rect 121 400 155 416
+rect 35 366 121 400
+rect 35 215 69 366
+rect 121 350 155 366
+rect 211 383 245 597
+rect 279 483 313 605
+rect 211 349 248 383
+rect 282 349 298 383
+rect 35 115 69 131
+rect 121 215 155 231
+rect 121 61 155 131
+rect 279 215 313 227
+rect 279 115 313 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 374 61
+rect 0 0 374 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 211 597 245 631
+rect 121 523 155 557
+rect 279 449 313 483
+rect 279 227 313 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 374 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 374 1093
+rect 0 1049 374 1059
+rect 199 631 257 637
+rect 177 597 211 631
+rect 245 597 257 631
+rect 199 591 257 597
+rect 109 557 167 563
+rect 109 523 121 557
+rect 155 523 189 557
+rect 109 517 167 523
+rect 267 483 325 489
+rect 267 449 279 483
+rect 313 449 325 483
+rect 267 443 325 449
+rect 279 267 313 443
+rect 267 261 325 267
+rect 267 227 279 261
+rect 313 227 325 261
+rect 267 221 325 227
+rect 0 51 374 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 374 51
+rect 0 0 374 17
+<< labels >>
+rlabel metal1 305 312 305 312 1 Y
+port 1 n
+rlabel viali 228 614 228 614 1 A
+port 2 n
+rlabel viali 138 540 138 540 1 OE
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__tnbufi_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__tnbufi_l.mag
new file mode 100644
index 0000000..670de55
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__tnbufi_l.mag
@@ -0,0 +1,180 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007759
+<< checkpaint >>
+rect -1269 -242 1635 2379
+<< nwell >>
+rect -9 529 375 1119
+<< nmoslvt >>
+rect 80 115 110 219
+rect 166 115 196 219
+rect 238 115 268 219
+<< pmos >>
+rect 80 713 110 965
+rect 166 713 196 965
+rect 238 713 268 965
+<< ndiff >>
+rect 27 165 80 219
+rect 27 131 35 165
+rect 69 131 80 165
+rect 27 115 80 131
+rect 110 165 166 219
+rect 110 131 121 165
+rect 155 131 166 165
+rect 110 115 166 131
+rect 196 115 238 219
+rect 268 165 321 219
+rect 268 131 279 165
+rect 313 131 321 165
+rect 268 115 321 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 809 35 949
+rect 69 809 80 949
+rect 27 713 80 809
+rect 110 949 166 965
+rect 110 809 121 949
+rect 155 809 166 949
+rect 110 713 166 809
+rect 196 713 238 965
+rect 268 949 321 965
+rect 268 809 279 949
+rect 313 809 321 949
+rect 268 713 321 809
+<< ndiffc >>
+rect 35 131 69 165
+rect 121 131 155 165
+rect 279 131 313 165
+<< pdiffc >>
+rect 35 809 69 949
+rect 121 809 155 949
+rect 279 809 313 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 238 965 268 991
+rect 80 550 110 713
+rect 166 550 196 713
+rect 39 520 196 550
+rect 39 308 69 520
+rect 111 518 165 520
+rect 111 484 121 518
+rect 155 484 165 518
+rect 111 468 165 484
+rect 111 400 196 416
+rect 111 366 121 400
+rect 155 366 196 400
+rect 111 350 196 366
+rect 39 278 110 308
+rect 80 219 110 278
+rect 166 219 196 350
+rect 238 399 268 713
+rect 238 383 292 399
+rect 238 349 248 383
+rect 282 349 292 383
+rect 238 333 292 349
+rect 238 219 268 333
+rect 80 89 110 115
+rect 166 89 196 115
+rect 238 89 268 115
+<< polycont >>
+rect 121 484 155 518
+rect 121 366 155 400
+rect 248 349 282 383
+<< locali >>
+rect 0 1093 374 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 374 1093
+rect 35 949 69 965
+rect 35 400 69 809
+rect 121 949 155 1049
+rect 121 793 155 809
+rect 279 949 313 965
+rect 121 518 155 523
+rect 121 468 155 484
+rect 121 400 155 416
+rect 35 366 121 400
+rect 35 165 69 366
+rect 121 350 155 366
+rect 211 383 245 597
+rect 279 483 313 809
+rect 211 349 248 383
+rect 282 349 298 383
+rect 35 115 69 131
+rect 121 165 155 181
+rect 121 61 155 131
+rect 279 165 313 227
+rect 279 115 313 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 374 61
+rect 0 0 374 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 211 597 245 631
+rect 121 523 155 557
+rect 279 449 313 483
+rect 279 227 313 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+<< metal1 >>
+rect 0 1093 374 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 374 1093
+rect 0 1049 374 1059
+rect 199 631 257 637
+rect 177 597 211 631
+rect 245 597 257 631
+rect 199 591 257 597
+rect 109 557 167 563
+rect 109 523 121 557
+rect 155 523 189 557
+rect 109 517 167 523
+rect 267 483 325 489
+rect 267 449 279 483
+rect 313 449 325 483
+rect 267 443 325 449
+rect 279 267 313 443
+rect 267 261 325 267
+rect 267 227 279 261
+rect 313 227 325 261
+rect 267 221 325 227
+rect 0 51 374 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 374 51
+rect 0 0 374 17
+<< labels >>
+rlabel metal1 305 312 305 312 1 Y
+port 1 n
+rlabel viali 228 614 228 614 1 A
+port 2 n
+rlabel viali 138 540 138 540 1 OE
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__xnor2_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__xnor2_l.mag
new file mode 100644
index 0000000..a2cab30
--- /dev/null
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__xnor2_l.mag
@@ -0,0 +1,291 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1604007759
+<< checkpaint >>
+rect -1269 -242 1898 2379
+<< nwell >>
+rect -9 529 638 1119
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 238 115 268 263
+rect 358 115 388 263
+rect 430 115 460 263
+rect 516 115 546 263
+<< pmos >>
+rect 80 565 110 965
+rect 166 565 196 965
+rect 238 565 268 965
+rect 358 565 388 965
+rect 430 565 460 965
+rect 516 565 546 965
+<< ndiff >>
+rect 27 215 80 263
+rect 27 131 35 215
+rect 69 131 80 215
+rect 27 115 80 131
+rect 110 165 166 263
+rect 110 131 121 165
+rect 155 131 166 165
+rect 110 115 166 131
+rect 196 115 238 263
+rect 268 215 358 263
+rect 268 131 279 215
+rect 347 131 358 215
+rect 268 115 358 131
+rect 388 115 430 263
+rect 460 165 516 263
+rect 460 131 471 165
+rect 505 131 516 165
+rect 460 115 516 131
+rect 546 215 599 263
+rect 546 131 557 215
+rect 591 131 599 215
+rect 546 115 599 131
+<< pdiff >>
+rect 27 949 80 965
+rect 27 605 35 949
+rect 69 605 80 949
+rect 27 565 80 605
+rect 110 949 166 965
+rect 110 605 121 949
+rect 155 605 166 949
+rect 110 565 166 605
+rect 196 565 238 965
+rect 268 949 358 965
+rect 268 605 279 949
+rect 347 605 358 949
+rect 268 565 358 605
+rect 388 565 430 965
+rect 460 949 516 965
+rect 460 605 471 949
+rect 505 605 516 949
+rect 460 565 516 605
+rect 546 949 599 965
+rect 546 606 557 949
+rect 591 606 599 949
+rect 546 565 599 606
+<< ndiffc >>
+rect 35 131 69 215
+rect 121 131 155 165
+rect 279 131 347 215
+rect 471 131 505 165
+rect 557 131 591 215
+<< pdiffc >>
+rect 35 605 69 949
+rect 121 605 155 949
+rect 279 605 347 949
+rect 471 605 505 949
+rect 557 606 591 949
+<< psubdiff >>
+rect 27 27 51 61
+rect 85 27 109 61
+rect 163 27 187 61
+rect 221 27 245 61
+rect 299 27 323 61
+rect 357 27 381 61
+rect 435 27 459 61
+rect 493 27 517 61
+<< nsubdiff >>
+rect 27 1049 51 1083
+rect 85 1049 109 1083
+rect 163 1049 187 1083
+rect 221 1049 245 1083
+rect 299 1049 323 1083
+rect 357 1049 381 1083
+rect 435 1049 459 1083
+rect 493 1049 517 1083
+<< psubdiffcont >>
+rect 51 27 85 61
+rect 187 27 221 61
+rect 323 27 357 61
+rect 459 27 493 61
+<< nsubdiffcont >>
+rect 51 1049 85 1083
+rect 187 1049 221 1083
+rect 323 1049 357 1083
+rect 459 1049 493 1083
+<< poly >>
+rect 80 965 110 991
+rect 166 965 196 991
+rect 238 965 268 991
+rect 358 965 388 991
+rect 430 965 460 991
+rect 516 965 546 991
+rect 80 550 110 565
+rect 70 520 110 550
+rect 70 308 100 520
+rect 166 459 196 565
+rect 142 443 196 459
+rect 142 409 152 443
+rect 186 409 196 443
+rect 142 393 196 409
+rect 238 534 268 565
+rect 238 518 292 534
+rect 238 484 248 518
+rect 282 484 292 518
+rect 238 468 292 484
+rect 142 335 196 351
+rect 142 308 152 335
+rect 70 301 152 308
+rect 186 301 196 335
+rect 70 278 196 301
+rect 80 263 110 278
+rect 166 263 196 278
+rect 238 263 268 468
+rect 358 459 388 565
+rect 430 550 460 565
+rect 516 550 546 565
+rect 430 520 546 550
+rect 358 443 472 459
+rect 358 429 428 443
+rect 418 409 428 429
+rect 462 409 472 443
+rect 418 393 472 409
+rect 516 351 546 520
+rect 326 335 380 351
+rect 326 301 336 335
+rect 370 308 380 335
+rect 479 335 546 351
+rect 479 308 489 335
+rect 370 301 388 308
+rect 326 285 388 301
+rect 358 263 388 285
+rect 430 301 489 308
+rect 523 301 546 335
+rect 430 278 546 301
+rect 430 263 460 278
+rect 516 263 546 278
+rect 80 89 110 115
+rect 166 89 196 115
+rect 238 89 268 115
+rect 358 89 388 115
+rect 430 89 460 115
+rect 516 89 546 115
+<< polycont >>
+rect 152 409 186 443
+rect 248 484 282 518
+rect 152 301 186 335
+rect 428 409 462 443
+rect 336 301 370 335
+rect 489 301 523 335
+<< locali >>
+rect 0 1093 638 1110
+rect 0 1049 51 1093
+rect 85 1049 187 1093
+rect 221 1049 323 1093
+rect 357 1049 459 1093
+rect 493 1049 638 1093
+rect 35 949 69 965
+rect 35 443 69 605
+rect 121 949 155 1049
+rect 279 949 347 965
+rect 121 589 155 605
+rect 268 631 279 637
+rect 302 597 347 605
+rect 279 589 347 597
+rect 471 949 505 1049
+rect 471 589 505 605
+rect 557 949 591 965
+rect 557 518 591 606
+rect 232 484 248 518
+rect 282 484 591 518
+rect 35 409 152 443
+rect 186 409 370 443
+rect 35 215 69 409
+rect 152 335 186 351
+rect 336 335 370 409
+rect 152 261 186 301
+rect 268 231 302 301
+rect 336 285 370 301
+rect 412 409 428 443
+rect 462 409 478 443
+rect 412 261 446 409
+rect 489 335 523 351
+rect 489 285 523 301
+rect 268 215 347 231
+rect 268 197 279 215
+rect 35 115 69 131
+rect 121 165 155 181
+rect 121 61 155 131
+rect 557 215 591 484
+rect 279 115 347 131
+rect 471 165 505 181
+rect 471 61 505 131
+rect 557 115 591 131
+rect 0 17 51 61
+rect 85 17 187 61
+rect 221 17 323 61
+rect 357 17 459 61
+rect 493 17 638 61
+rect 0 0 638 17
+<< viali >>
+rect 51 1083 85 1093
+rect 51 1059 85 1083
+rect 187 1083 221 1093
+rect 187 1059 221 1083
+rect 323 1083 357 1093
+rect 323 1059 357 1083
+rect 459 1083 493 1093
+rect 459 1059 493 1083
+rect 268 605 279 631
+rect 279 605 302 631
+rect 268 597 302 605
+rect 152 227 186 261
+rect 268 301 302 335
+rect 489 301 523 335
+rect 412 227 446 261
+rect 51 27 85 51
+rect 51 17 85 27
+rect 187 27 221 51
+rect 187 17 221 27
+rect 323 27 357 51
+rect 323 17 357 27
+rect 459 27 493 51
+rect 459 17 493 27
+<< metal1 >>
+rect 0 1093 638 1110
+rect 0 1059 51 1093
+rect 85 1059 187 1093
+rect 221 1059 323 1093
+rect 357 1059 459 1093
+rect 493 1059 638 1093
+rect 0 1049 638 1059
+rect 256 631 314 637
+rect 256 597 268 631
+rect 302 597 314 631
+rect 256 591 314 597
+rect 268 341 302 591
+rect 256 335 314 341
+rect 477 335 535 341
+rect 256 301 268 335
+rect 302 301 314 335
+rect 455 301 489 335
+rect 523 301 535 335
+rect 256 295 314 301
+rect 477 295 535 301
+rect 140 261 198 267
+rect 400 261 458 267
+rect 140 227 152 261
+rect 186 227 412 261
+rect 446 227 458 261
+rect 140 221 198 227
+rect 400 221 458 227
+rect 0 51 638 61
+rect 0 17 51 51
+rect 85 17 187 51
+rect 221 17 323 51
+rect 357 17 459 51
+rect 493 17 638 51
+rect 0 0 638 17
+<< labels >>
+rlabel viali 170 244 170 244 1 A
+port 1 n
+rlabel viali 506 318 506 318 1 B
+port 2 n
+rlabel metal1 284 375 284 375 1 Y
+port 3 n
+rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 1066 68 1066 1 vdd
+<< end >>
diff --git a/15