Fixing merge issues caused by branch re-basing
diff --git a/12T_hs/.magicrc b/12T_hs/.magicrc
deleted file mode 100755
index 79cac60..0000000
--- a/12T_hs/.magicrc
+++ /dev/null
@@ -1,105 +0,0 @@
-puts stdout "Sourcing design .magicrc for technology EFS8A ..."
-
-# Put grid on 0.005 pitch. This is important, as some commands don't
-# rescale the grid automatically (such as lef read?).
-
-set scalefac [tech lambda]
-if {[lindex $scalefac 1] < 2} {
- scalegrid 1 2
-}
-
-# drc off
-drc euclidean on
-
-#set PDKPATH "~/projects/efabless/tech/SkyWater/EFS8A"
-
-# loading technology
-#tech load $PDKPATH/libs.tech/magic/EFS8A.tech
-tech load ../../char/techfiles/sky130A.tech
-
-# load device generator
-#source $PDKPATH/libs.tech/magic/EFS8A.tcl
-
-# load bind keys (optional)
-# source $PDKPATH/libs.tech/magic/EFS8A-BindKeys
-
-# set units to lambda grid
-snap internal
-
-# add path to reference cells
-#set MAGPATH "${PDKPATH}/libs.ref/mag"
-#addpath ${MAGPATH}/primdev
-#addpath ${MAGPATH}/s8fmlt
-#addpath ${MAGPATH}/s8iom0
-#addpath ${MAGPATH}/scs8hd
-#addpath ${MAGPATH}/scs8hdll
-#addpath ${MAGPATH}/scs8hvl
-#addpath ${MAGPATH}/scs8hs
-#addpath ${MAGPATH}/scs8ms
-#addpath ${MAGPATH}/scs8ls
-#addpath ${MAGPATH}/scs8lp
-
-# add path to GDS cells
-
-# add path to IP from catalog. This procedure defined in the PDK script.
-catch {magic::query_mylib_ip}
-# add path to local IP from user design space. Defined in the PDK script.
-catch {magic::query_my_projects}
-
-macro Shift_G "grid 74"
-macro XK_Left "scroll l .1 w"
-macro Shift_XK_Left "scroll l 1 w"
-macro Control_XK_Left "box grow w 1"
-macro Control_Shift_XK_Left "box shrink e 1"
-macro XK_Right "scroll r .1 w"
-macro Shift_XK_Right "scroll r 1 w"
-macro Control_XK_Right "box grow e 1"
-macro Control_Shift_XK_Right "box shrink w 1"
-macro XK_Up "scroll u .1 w"
-macro Shift_XK_Up "scroll u 1 w"
-macro Control_XK_Up "box grow n 1"
-macro Control_Shift_XK_Up "box shrink s 1"
-macro XK_Down "scroll d .1 w"
-macro Shift_XK_Down "scroll d 1 w"
-macro Control_XK_Down "box grow s 1"
-macro Control_Shift_XK_Down "box shrink n 1"
-
-macro XK_Pointer_Button4 "scroll u .05 w"
-macro XK_Pointer_Button5 "scroll d .05 w"
-macro . "history redo -1"
-
-macro XK_L "select less area {ndif pdif nwell poly}"
-macro XK_K "select less area nwell"
-macro XK_J "select less area {m1 lic}"
-macro XK_H "select less area li1"
-macro Control_Shift_XK_X "rotate"
-macro Shift_XK_Pointer_Button4 "stretch N 74"
-macro Shift_XK_Pointer_Button5 "stretch S 74"
-macro Control_XK_Pointer_Button4 "stretch N 34"
-macro Control_XK_Pointer_Button5 "stretch S 34"
-macro Control_Shift_XK_Q "stretch W 88"
-macro Control_Shift_XK_R "stretch E 88"
-macro Control_Shift_XK_W "stretch N 28"
-macro Control_Shift_XK_E "stretch N 4"
-macro XK_Y "stretch N 6"
-#macro Control_Shift_XK_W "stretch S 6"
-#macro Control_Shift_XK_E "stretch S 8"
-
-macro Control_Shift_XK_Pointer_Button4 "stretch N 17"
-macro Control_Shift_XK_Pointer_Button5 "stretch S 17"
-macro Control_Shift_XK_G "select area {m1 lic}"
-macro Control_Shift_XK_F "select area {poly polycont}"
-macro Control_Shift_XK_D "select area {ndc li1}"
-macro Control_Shift_XK_S "select area ntrans"
-
-macro Shift_D "select clear; move S 10; paint m1c"
-macro Shift_F "select clear; move N 10; paint m1c"
-
-
-macro Shift_B "box height 1.0um; move S 1.655um; select area; erase; select clear; move N 1um; select area; move S 1um; select clear; box height 0.26um; move S 4.35um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.26um; select clear; box height 20um; select area; move S 0.26um"
-
-
-macro Shift_N "box height 1.74um; move S 2.395um; select area; erase; select clear; move N 1.74um; select area; move S 1.74um; select clear; box height 0.48um; move S 3.61um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.48um; select clear; box height 20um; select area; move S 0.48um"
-
-
-macro Shift_M "box height 1.02um; move S 2.015um; select area; erase; select clear; move N 1.02um; box height 1.20um; select area; move S 1.02um; select clear; box height 0.12um; move S 0.56um; select area; erase; select clear; box height 5.00um; select area; move S 0.12um; select clear; move N 0.12um; box height 0.21um; move S 2.98um; select area;erase; select clear; box height 1.105um; move S 1.105um; select area; move N 0.21um; select clear; box height 0.17um; move N 0.825um; select area; erase; move S 0.825um; box height 0.825um; select area; move N 0.17um"
diff --git a/12T_hs/sky130_osu_sc_12T_hs__addf_1.mag b/12T_hs/sky130_osu_sc_12T_hs__addf_1.mag
deleted file mode 100644
index 4d38949..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__addf_1.mag
+++ /dev/null
@@ -1,651 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864445
-<< checkpaint >>
-rect -1209 -1243 2569 2131
-<< nwell >>
-rect -9 485 1435 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 410 521 440 773
-rect 496 521 526 773
-rect 582 521 612 773
-rect 668 521 698 773
-rect 754 521 784 773
-rect 840 521 870 773
-rect 922 521 952 773
-rect 1004 521 1034 773
-rect 1102 521 1132 773
-rect 1292 521 1322 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 410 115 440 225
-rect 496 115 526 225
-rect 582 115 612 225
-rect 668 115 698 225
-rect 754 115 784 225
-rect 840 115 870 225
-rect 922 115 952 225
-rect 1004 115 1034 225
-rect 1102 115 1132 225
-rect 1292 115 1322 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 165 166 225
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 171 252 225
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 225
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 115 410 225
-rect 440 171 496 225
-rect 440 131 451 171
-rect 485 131 496 171
-rect 440 115 496 131
-rect 526 171 582 225
-rect 526 131 537 171
-rect 571 131 582 171
-rect 526 115 582 131
-rect 612 157 668 225
-rect 612 123 623 157
-rect 657 123 668 157
-rect 612 115 668 123
-rect 698 171 754 225
-rect 698 131 709 171
-rect 743 131 754 171
-rect 698 115 754 131
-rect 784 165 840 225
-rect 784 131 795 165
-rect 829 131 840 165
-rect 784 115 840 131
-rect 870 115 922 225
-rect 952 115 1004 225
-rect 1034 171 1102 225
-rect 1034 131 1045 171
-rect 1079 131 1102 171
-rect 1034 115 1102 131
-rect 1132 171 1185 225
-rect 1132 131 1143 171
-rect 1177 131 1185 171
-rect 1132 115 1185 131
-rect 1239 165 1292 225
-rect 1239 131 1247 165
-rect 1281 131 1292 165
-rect 1239 115 1292 131
-rect 1322 171 1375 225
-rect 1322 131 1333 171
-rect 1367 131 1375 171
-rect 1322 115 1375 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 629 293 757
-rect 327 629 338 757
-rect 282 521 338 629
-rect 368 521 410 773
-rect 440 757 496 773
-rect 440 629 451 757
-rect 485 629 496 757
-rect 440 521 496 629
-rect 526 757 582 773
-rect 526 629 537 757
-rect 571 629 582 757
-rect 526 521 582 629
-rect 612 757 668 773
-rect 612 723 623 757
-rect 657 723 668 757
-rect 612 521 668 723
-rect 698 757 754 773
-rect 698 663 709 757
-rect 743 663 754 757
-rect 698 521 754 663
-rect 784 757 840 773
-rect 784 629 795 757
-rect 829 629 840 757
-rect 784 521 840 629
-rect 870 521 922 773
-rect 952 521 1004 773
-rect 1034 757 1102 773
-rect 1034 697 1045 757
-rect 1079 697 1102 757
-rect 1034 521 1102 697
-rect 1132 757 1185 773
-rect 1132 629 1143 757
-rect 1177 629 1185 757
-rect 1132 521 1185 629
-rect 1239 757 1292 773
-rect 1239 561 1247 757
-rect 1281 561 1292 757
-rect 1239 521 1292 561
-rect 1322 757 1375 773
-rect 1322 561 1333 757
-rect 1367 561 1375 757
-rect 1322 521 1375 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 165
-rect 207 131 241 171
-rect 293 131 327 171
-rect 451 131 485 171
-rect 537 131 571 171
-rect 623 123 657 157
-rect 709 131 743 171
-rect 795 131 829 165
-rect 1045 131 1079 171
-rect 1143 131 1177 171
-rect 1247 131 1281 165
-rect 1333 131 1367 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 121 697 155 757
-rect 207 629 241 757
-rect 293 629 327 757
-rect 451 629 485 757
-rect 537 629 571 757
-rect 623 723 657 757
-rect 709 663 743 757
-rect 795 629 829 757
-rect 1045 697 1079 757
-rect 1143 629 1177 757
-rect 1247 561 1281 757
-rect 1333 561 1367 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-rect 979 827 1003 861
-rect 1037 827 1061 861
-rect 1115 827 1139 861
-rect 1173 827 1197 861
-rect 1251 827 1275 861
-rect 1309 827 1333 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-rect 1003 827 1037 861
-rect 1139 827 1173 861
-rect 1275 827 1309 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 801
-rect 338 773 368 801
-rect 410 773 440 799
-rect 496 773 526 799
-rect 582 773 612 801
-rect 668 773 698 801
-rect 754 773 784 801
-rect 840 773 870 801
-rect 922 773 952 801
-rect 1004 773 1034 801
-rect 1102 773 1132 801
-rect 1292 773 1322 801
-rect 80 381 110 521
-rect 166 489 196 521
-rect 152 473 206 489
-rect 152 439 162 473
-rect 196 439 206 473
-rect 152 423 206 439
-rect 70 365 124 381
-rect 70 331 80 365
-rect 114 331 124 365
-rect 70 315 124 331
-rect 80 225 110 315
-rect 166 225 196 423
-rect 252 381 282 521
-rect 338 423 368 521
-rect 410 496 440 521
-rect 496 496 526 521
-rect 410 466 526 496
-rect 338 407 430 423
-rect 238 365 292 381
-rect 238 331 248 365
-rect 282 331 292 365
-rect 238 315 292 331
-rect 338 373 386 407
-rect 420 373 430 407
-rect 338 357 430 373
-rect 472 363 502 466
-rect 582 364 612 521
-rect 668 455 698 521
-rect 656 439 710 455
-rect 656 405 666 439
-rect 700 405 710 439
-rect 656 389 710 405
-rect 252 225 282 315
-rect 338 225 368 357
-rect 472 347 526 363
-rect 472 313 482 347
-rect 516 313 526 347
-rect 472 271 526 313
-rect 568 348 622 364
-rect 568 314 578 348
-rect 612 314 622 348
-rect 568 298 622 314
-rect 410 241 526 271
-rect 410 225 440 241
-rect 496 225 526 241
-rect 582 225 612 298
-rect 668 225 698 389
-rect 754 324 784 521
-rect 840 460 870 521
-rect 826 444 880 460
-rect 826 410 836 444
-rect 870 410 880 444
-rect 826 394 880 410
-rect 922 417 952 521
-rect 1004 489 1034 521
-rect 1004 459 1048 489
-rect 1102 488 1132 521
-rect 922 401 976 417
-rect 742 308 796 324
-rect 742 274 752 308
-rect 786 274 796 308
-rect 742 258 796 274
-rect 754 225 784 258
-rect 840 225 870 394
-rect 922 367 932 401
-rect 966 367 976 401
-rect 922 351 976 367
-rect 922 225 952 351
-rect 1018 313 1048 459
-rect 1090 472 1144 488
-rect 1292 485 1322 521
-rect 1090 438 1100 472
-rect 1134 438 1144 472
-rect 1090 422 1144 438
-rect 1255 469 1322 485
-rect 1255 435 1265 469
-rect 1299 435 1322 469
-rect 1004 297 1058 313
-rect 1004 263 1014 297
-rect 1048 263 1058 297
-rect 1004 247 1058 263
-rect 1004 225 1034 247
-rect 1102 225 1132 422
-rect 1255 419 1322 435
-rect 1292 225 1322 419
-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 439 196 473
-rect 80 331 114 365
-rect 248 331 282 365
-rect 386 373 420 407
-rect 666 405 700 439
-rect 482 313 516 347
-rect 578 314 612 348
-rect 836 410 870 444
-rect 752 274 786 308
-rect 932 367 966 401
-rect 1100 438 1134 472
-rect 1265 435 1299 469
-rect 1014 263 1048 297
-<< locali >>
-rect 0 867 1408 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 1003 867
-rect 1037 827 1139 867
-rect 1173 827 1275 867
-rect 1309 827 1408 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 613 69 629
-rect 207 613 241 629
-rect 35 579 241 613
-rect 293 757 327 773
-rect 293 546 327 629
-rect 451 757 485 827
-rect 451 613 485 629
-rect 537 757 571 773
-rect 623 757 657 827
-rect 623 707 657 723
-rect 709 757 743 773
-rect 571 629 743 663
-rect 795 757 829 773
-rect 1045 757 1079 827
-rect 1045 681 1079 697
-rect 1143 757 1177 773
-rect 537 613 571 629
-rect 795 588 829 629
-rect 1143 588 1177 629
-rect 752 554 1100 588
-rect 752 553 812 554
-rect 293 509 350 546
-rect 80 473 114 479
-rect 80 439 162 473
-rect 196 439 212 473
-rect 248 365 282 405
-rect 64 331 80 365
-rect 114 331 130 365
-rect 248 315 282 331
-rect 316 291 350 509
-rect 386 479 444 513
-rect 386 407 420 479
-rect 386 357 420 373
-rect 578 348 612 479
-rect 752 510 787 553
-rect 650 405 666 439
-rect 700 405 716 439
-rect 466 313 482 347
-rect 516 313 532 347
-rect 752 376 786 510
-rect 836 444 870 479
-rect 1066 488 1100 554
-rect 1247 757 1281 827
-rect 1177 554 1202 571
-rect 1143 537 1202 554
-rect 1247 545 1281 561
-rect 1333 757 1367 773
-rect 1066 472 1134 488
-rect 820 410 836 444
-rect 870 410 886 444
-rect 1066 441 1100 472
-rect 1089 438 1100 441
-rect 1100 422 1134 438
-rect 932 401 966 405
-rect 752 342 879 376
-rect 932 351 966 367
-rect 1168 365 1202 537
-rect 1333 513 1367 561
-rect 578 298 612 314
-rect 736 274 752 308
-rect 786 291 810 308
-rect 35 215 241 249
-rect 35 189 70 215
-rect 35 171 69 189
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 207 171 241 215
-rect 207 114 241 131
-rect 293 223 350 257
-rect 293 171 327 223
-rect 537 206 743 240
-rect 293 114 327 131
-rect 451 171 485 187
-rect 451 61 485 131
-rect 537 171 571 206
-rect 709 171 743 206
-rect 845 190 879 342
-rect 1014 297 1048 331
-rect 1143 331 1202 365
-rect 1265 469 1299 485
-rect 998 263 1014 297
-rect 1048 263 1064 297
-rect 1014 262 1048 263
-rect 537 114 571 131
-rect 607 123 623 157
-rect 657 123 673 157
-rect 623 61 657 123
-rect 709 114 743 131
-rect 795 165 879 190
-rect 829 156 879 165
-rect 1045 171 1079 187
-rect 795 114 829 131
-rect 1045 61 1079 131
-rect 1143 171 1177 331
-rect 1265 291 1299 435
-rect 1245 257 1299 291
-rect 1143 115 1177 131
-rect 1247 165 1281 181
-rect 1247 61 1281 131
-rect 1333 171 1367 479
-rect 1333 115 1367 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 1003 861 1037 867
-rect 1003 833 1037 861
-rect 1139 861 1173 867
-rect 1139 833 1173 861
-rect 1275 861 1309 867
-rect 1275 833 1309 861
-rect 80 479 114 513
-rect 248 405 282 439
-rect 80 331 114 365
-rect 444 479 478 513
-rect 578 479 612 513
-rect 482 347 516 365
-rect 666 405 700 439
-rect 482 331 516 347
-rect 836 479 870 513
-rect 1143 554 1177 588
-rect 932 405 966 439
-rect 316 257 350 291
-rect 777 274 786 291
-rect 786 274 811 291
-rect 777 257 811 274
-rect 1014 331 1048 365
-rect 1211 257 1245 291
-rect 1333 479 1367 513
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 867 1408 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 1003 867
-rect 1037 833 1139 867
-rect 1173 833 1275 867
-rect 1309 833 1408 867
-rect 0 827 1408 833
-rect 1131 588 1189 594
-rect 1109 554 1143 588
-rect 1177 554 1189 588
-rect 1131 548 1189 554
-rect 68 513 126 519
-rect 432 513 490 519
-rect 566 513 624 519
-rect 824 513 882 520
-rect 1321 513 1379 519
-rect 68 479 80 513
-rect 114 479 444 513
-rect 478 479 578 513
-rect 612 479 836 513
-rect 870 479 882 513
-rect 1299 479 1333 513
-rect 1367 479 1379 513
-rect 68 473 126 479
-rect 432 473 490 479
-rect 566 473 624 479
-rect 824 472 882 479
-rect 1321 473 1379 479
-rect 236 439 296 445
-rect 650 439 717 445
-rect 920 439 978 445
-rect 236 405 248 439
-rect 282 405 666 439
-rect 700 405 932 439
-rect 966 405 978 439
-rect 236 399 296 405
-rect 650 399 717 405
-rect 920 399 978 405
-rect 68 365 126 371
-rect 470 365 528 371
-rect 1002 365 1060 371
-rect 68 331 80 365
-rect 114 331 482 365
-rect 516 331 1014 365
-rect 1048 331 1060 365
-rect 68 325 126 331
-rect 470 325 528 331
-rect 1002 325 1060 331
-rect 304 291 362 297
-rect 771 291 820 297
-rect 1199 291 1257 297
-rect 304 257 316 291
-rect 350 257 777 291
-rect 811 257 1211 291
-rect 1245 257 1257 291
-rect 304 251 362 257
-rect 771 251 820 257
-rect 1199 251 1257 257
-rect 0 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel viali 1160 571 1160 571 1 S
-port 5 n
-rlabel viali 1350 496 1350 496 1 CO
-port 6 n
-rlabel metal1 129 496 129 496 1 B
-rlabel viali 265 422 265 422 1 CI
-rlabel viali 97 348 97 348 1 A
-port 1 n
-rlabel viali 1228 274 1228 274 1 CON
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__addf_l.mag b/12T_hs/sky130_osu_sc_12T_hs__addf_l.mag
deleted file mode 100644
index deb7c3e..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__addf_l.mag
+++ /dev/null
@@ -1,651 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864445
-<< checkpaint >>
-rect -1209 -1243 2569 2131
-<< nwell >>
-rect -9 485 1435 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 410 521 440 773
-rect 496 521 526 773
-rect 582 521 612 773
-rect 668 521 698 773
-rect 754 521 784 773
-rect 840 521 870 773
-rect 922 521 952 773
-rect 1004 521 1034 773
-rect 1102 521 1132 773
-rect 1292 605 1322 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 410 115 440 225
-rect 496 115 526 225
-rect 582 115 612 225
-rect 668 115 698 225
-rect 754 115 784 225
-rect 840 115 870 225
-rect 922 115 952 225
-rect 1004 115 1034 225
-rect 1102 115 1132 225
-rect 1292 115 1322 199
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 165 166 225
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 171 252 225
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 225
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 115 410 225
-rect 440 171 496 225
-rect 440 131 451 171
-rect 485 131 496 171
-rect 440 115 496 131
-rect 526 171 582 225
-rect 526 131 537 171
-rect 571 131 582 171
-rect 526 115 582 131
-rect 612 157 668 225
-rect 612 123 623 157
-rect 657 123 668 157
-rect 612 115 668 123
-rect 698 171 754 225
-rect 698 131 709 171
-rect 743 131 754 171
-rect 698 115 754 131
-rect 784 165 840 225
-rect 784 131 795 165
-rect 829 131 840 165
-rect 784 115 840 131
-rect 870 115 922 225
-rect 952 115 1004 225
-rect 1034 171 1102 225
-rect 1034 131 1045 171
-rect 1079 131 1102 171
-rect 1034 115 1102 131
-rect 1132 171 1185 225
-rect 1132 131 1143 171
-rect 1177 131 1185 171
-rect 1132 115 1185 131
-rect 1239 165 1292 199
-rect 1239 131 1247 165
-rect 1281 131 1292 165
-rect 1239 115 1292 131
-rect 1322 171 1375 199
-rect 1322 131 1333 171
-rect 1367 131 1375 171
-rect 1322 115 1375 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 629 293 757
-rect 327 629 338 757
-rect 282 521 338 629
-rect 368 521 410 773
-rect 440 757 496 773
-rect 440 629 451 757
-rect 485 629 496 757
-rect 440 521 496 629
-rect 526 757 582 773
-rect 526 629 537 757
-rect 571 629 582 757
-rect 526 521 582 629
-rect 612 757 668 773
-rect 612 723 623 757
-rect 657 723 668 757
-rect 612 521 668 723
-rect 698 757 754 773
-rect 698 663 709 757
-rect 743 663 754 757
-rect 698 521 754 663
-rect 784 757 840 773
-rect 784 629 795 757
-rect 829 629 840 757
-rect 784 521 840 629
-rect 870 521 922 773
-rect 952 521 1004 773
-rect 1034 757 1102 773
-rect 1034 697 1045 757
-rect 1079 697 1102 757
-rect 1034 521 1102 697
-rect 1132 757 1185 773
-rect 1132 629 1143 757
-rect 1177 629 1185 757
-rect 1132 521 1185 629
-rect 1239 757 1292 773
-rect 1239 617 1247 757
-rect 1281 617 1292 757
-rect 1239 605 1292 617
-rect 1322 757 1375 773
-rect 1322 617 1333 757
-rect 1367 617 1375 757
-rect 1322 605 1375 617
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 165
-rect 207 131 241 171
-rect 293 131 327 171
-rect 451 131 485 171
-rect 537 131 571 171
-rect 623 123 657 157
-rect 709 131 743 171
-rect 795 131 829 165
-rect 1045 131 1079 171
-rect 1143 131 1177 171
-rect 1247 131 1281 165
-rect 1333 131 1367 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 121 697 155 757
-rect 207 629 241 757
-rect 293 629 327 757
-rect 451 629 485 757
-rect 537 629 571 757
-rect 623 723 657 757
-rect 709 663 743 757
-rect 795 629 829 757
-rect 1045 697 1079 757
-rect 1143 629 1177 757
-rect 1247 617 1281 757
-rect 1333 617 1367 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-rect 979 827 1003 861
-rect 1037 827 1061 861
-rect 1115 827 1139 861
-rect 1173 827 1197 861
-rect 1251 827 1275 861
-rect 1309 827 1333 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-rect 1003 827 1037 861
-rect 1139 827 1173 861
-rect 1275 827 1309 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 801
-rect 338 773 368 801
-rect 410 773 440 799
-rect 496 773 526 799
-rect 582 773 612 801
-rect 668 773 698 801
-rect 754 773 784 801
-rect 840 773 870 801
-rect 922 773 952 801
-rect 1004 773 1034 801
-rect 1102 773 1132 801
-rect 1292 773 1322 801
-rect 80 381 110 521
-rect 166 489 196 521
-rect 152 473 206 489
-rect 152 439 162 473
-rect 196 439 206 473
-rect 152 423 206 439
-rect 70 365 124 381
-rect 70 331 80 365
-rect 114 331 124 365
-rect 70 315 124 331
-rect 80 225 110 315
-rect 166 225 196 423
-rect 252 381 282 521
-rect 338 423 368 521
-rect 410 496 440 521
-rect 496 496 526 521
-rect 410 466 526 496
-rect 338 407 430 423
-rect 238 365 292 381
-rect 238 331 248 365
-rect 282 331 292 365
-rect 238 315 292 331
-rect 338 373 386 407
-rect 420 373 430 407
-rect 338 357 430 373
-rect 472 363 502 466
-rect 582 364 612 521
-rect 668 455 698 521
-rect 656 439 710 455
-rect 656 405 666 439
-rect 700 405 710 439
-rect 656 389 710 405
-rect 252 225 282 315
-rect 338 225 368 357
-rect 472 347 526 363
-rect 472 313 482 347
-rect 516 313 526 347
-rect 472 271 526 313
-rect 568 348 622 364
-rect 568 314 578 348
-rect 612 314 622 348
-rect 568 298 622 314
-rect 410 241 526 271
-rect 410 225 440 241
-rect 496 225 526 241
-rect 582 225 612 298
-rect 668 225 698 389
-rect 754 324 784 521
-rect 840 460 870 521
-rect 826 444 880 460
-rect 826 410 836 444
-rect 870 410 880 444
-rect 826 394 880 410
-rect 922 417 952 521
-rect 1004 489 1034 521
-rect 1004 459 1048 489
-rect 1102 488 1132 521
-rect 922 401 976 417
-rect 742 308 796 324
-rect 742 274 752 308
-rect 786 274 796 308
-rect 742 258 796 274
-rect 754 225 784 258
-rect 840 225 870 394
-rect 922 367 932 401
-rect 966 367 976 401
-rect 922 351 976 367
-rect 922 225 952 351
-rect 1018 313 1048 459
-rect 1090 472 1144 488
-rect 1292 485 1322 605
-rect 1090 438 1100 472
-rect 1134 438 1144 472
-rect 1090 422 1144 438
-rect 1255 469 1322 485
-rect 1255 435 1265 469
-rect 1299 435 1322 469
-rect 1004 297 1058 313
-rect 1004 263 1014 297
-rect 1048 263 1058 297
-rect 1004 247 1058 263
-rect 1004 225 1034 247
-rect 1102 225 1132 422
-rect 1255 419 1322 435
-rect 1292 199 1322 419
-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 439 196 473
-rect 80 331 114 365
-rect 248 331 282 365
-rect 386 373 420 407
-rect 666 405 700 439
-rect 482 313 516 347
-rect 578 314 612 348
-rect 836 410 870 444
-rect 752 274 786 308
-rect 932 367 966 401
-rect 1100 438 1134 472
-rect 1265 435 1299 469
-rect 1014 263 1048 297
-<< locali >>
-rect 0 867 1408 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 1003 867
-rect 1037 827 1139 867
-rect 1173 827 1275 867
-rect 1309 827 1408 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 613 69 629
-rect 207 613 241 629
-rect 35 579 241 613
-rect 293 757 327 773
-rect 293 546 327 629
-rect 451 757 485 827
-rect 451 613 485 629
-rect 537 757 571 773
-rect 623 757 657 827
-rect 623 707 657 723
-rect 709 757 743 773
-rect 571 629 743 663
-rect 795 757 829 773
-rect 1045 757 1079 827
-rect 1045 681 1079 697
-rect 1143 757 1177 773
-rect 537 613 571 629
-rect 795 588 829 629
-rect 1143 588 1177 629
-rect 752 554 1100 588
-rect 752 553 812 554
-rect 293 509 350 546
-rect 80 473 114 479
-rect 80 439 162 473
-rect 196 439 212 473
-rect 248 365 282 405
-rect 64 331 80 365
-rect 114 331 130 365
-rect 248 315 282 331
-rect 316 291 350 509
-rect 386 479 444 513
-rect 386 407 420 479
-rect 386 357 420 373
-rect 578 348 612 479
-rect 752 510 787 553
-rect 650 405 666 439
-rect 700 405 716 439
-rect 466 313 482 347
-rect 516 313 532 347
-rect 752 376 786 510
-rect 836 444 870 479
-rect 1066 488 1100 554
-rect 1247 757 1281 827
-rect 1177 554 1202 571
-rect 1143 537 1202 554
-rect 1247 545 1281 617
-rect 1333 757 1367 773
-rect 1066 472 1134 488
-rect 820 410 836 444
-rect 870 410 886 444
-rect 1066 441 1100 472
-rect 1089 438 1100 441
-rect 1100 422 1134 438
-rect 932 401 966 405
-rect 752 342 879 376
-rect 932 351 966 367
-rect 1168 365 1202 537
-rect 1333 513 1367 617
-rect 578 298 612 314
-rect 736 274 752 308
-rect 786 291 810 308
-rect 35 215 241 249
-rect 35 189 70 215
-rect 35 171 69 189
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 207 171 241 215
-rect 207 114 241 131
-rect 293 223 350 257
-rect 293 171 327 223
-rect 537 206 743 240
-rect 293 114 327 131
-rect 451 171 485 187
-rect 451 61 485 131
-rect 537 171 571 206
-rect 709 171 743 206
-rect 845 190 879 342
-rect 1014 297 1048 331
-rect 1143 331 1202 365
-rect 1265 469 1299 485
-rect 998 263 1014 297
-rect 1048 263 1064 297
-rect 1014 262 1048 263
-rect 537 114 571 131
-rect 607 123 623 157
-rect 657 123 673 157
-rect 623 61 657 123
-rect 709 114 743 131
-rect 795 165 879 190
-rect 829 156 879 165
-rect 1045 171 1079 187
-rect 795 114 829 131
-rect 1045 61 1079 131
-rect 1143 171 1177 331
-rect 1265 291 1299 435
-rect 1245 257 1299 291
-rect 1143 115 1177 131
-rect 1247 165 1281 181
-rect 1247 61 1281 131
-rect 1333 171 1367 479
-rect 1333 115 1367 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 1003 861 1037 867
-rect 1003 833 1037 861
-rect 1139 861 1173 867
-rect 1139 833 1173 861
-rect 1275 861 1309 867
-rect 1275 833 1309 861
-rect 80 479 114 513
-rect 248 405 282 439
-rect 80 331 114 365
-rect 444 479 478 513
-rect 578 479 612 513
-rect 482 347 516 365
-rect 666 405 700 439
-rect 482 331 516 347
-rect 836 479 870 513
-rect 1143 554 1177 588
-rect 932 405 966 439
-rect 316 257 350 291
-rect 777 274 786 291
-rect 786 274 811 291
-rect 777 257 811 274
-rect 1014 331 1048 365
-rect 1211 257 1245 291
-rect 1333 479 1367 513
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 867 1408 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 1003 867
-rect 1037 833 1139 867
-rect 1173 833 1275 867
-rect 1309 833 1408 867
-rect 0 827 1408 833
-rect 1131 588 1189 594
-rect 1109 554 1143 588
-rect 1177 554 1189 588
-rect 1131 548 1189 554
-rect 68 513 126 519
-rect 432 513 490 519
-rect 566 513 624 519
-rect 824 513 882 520
-rect 1321 513 1379 519
-rect 68 479 80 513
-rect 114 479 444 513
-rect 478 479 578 513
-rect 612 479 836 513
-rect 870 479 882 513
-rect 1299 479 1333 513
-rect 1367 479 1379 513
-rect 68 473 126 479
-rect 432 473 490 479
-rect 566 473 624 479
-rect 824 472 882 479
-rect 1321 473 1379 479
-rect 236 439 296 445
-rect 650 439 717 445
-rect 920 439 978 445
-rect 236 405 248 439
-rect 282 405 666 439
-rect 700 405 932 439
-rect 966 405 978 439
-rect 236 399 296 405
-rect 650 399 717 405
-rect 920 399 978 405
-rect 68 365 126 371
-rect 470 365 528 371
-rect 1002 365 1060 371
-rect 68 331 80 365
-rect 114 331 482 365
-rect 516 331 1014 365
-rect 1048 331 1060 365
-rect 68 325 126 331
-rect 470 325 528 331
-rect 1002 325 1060 331
-rect 304 291 362 297
-rect 771 291 820 297
-rect 1199 291 1257 297
-rect 304 257 316 291
-rect 350 257 777 291
-rect 811 257 1211 291
-rect 1245 257 1257 291
-rect 304 251 362 257
-rect 771 251 820 257
-rect 1199 251 1257 257
-rect 0 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel viali 1160 571 1160 571 1 S
-port 5 n
-rlabel viali 1350 496 1350 496 1 CO
-port 6 n
-rlabel metal1 129 496 129 496 1 B
-rlabel viali 265 422 265 422 1 CI
-rlabel viali 97 348 97 348 1 A
-port 1 n
-rlabel viali 1228 274 1228 274 1 CON
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__addh_1.mag b/12T_hs/sky130_osu_sc_12T_hs__addh_1.mag
deleted file mode 100644
index 0269f52..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__addh_1.mag
+++ /dev/null
@@ -1,394 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864445
-<< checkpaint >>
-rect -1209 -1243 2025 2131
-<< nwell >>
-rect -9 485 837 897
-<< nmos >>
-rect 80 115 110 225
-rect 178 115 208 225
-rect 250 115 280 225
-rect 442 115 472 225
-rect 540 115 570 225
-rect 626 115 656 225
-rect 712 115 742 225
-<< pmos >>
-rect 80 521 110 773
-rect 178 521 208 773
-rect 264 521 294 773
-rect 362 521 392 773
-rect 552 521 582 773
-rect 638 521 668 773
-rect 710 521 740 773
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 178 225
-rect 110 131 133 171
-rect 167 131 178 171
-rect 110 115 178 131
-rect 208 115 250 225
-rect 280 171 333 225
-rect 280 131 291 171
-rect 325 131 333 171
-rect 280 115 333 131
-rect 389 171 442 225
-rect 389 131 397 171
-rect 431 131 442 171
-rect 389 115 442 131
-rect 472 171 540 225
-rect 472 131 495 171
-rect 529 131 540 171
-rect 472 115 540 131
-rect 570 171 626 225
-rect 570 131 581 171
-rect 615 131 626 171
-rect 570 115 626 131
-rect 656 171 712 225
-rect 656 131 667 171
-rect 701 131 712 171
-rect 656 115 712 131
-rect 742 171 795 225
-rect 742 131 753 171
-rect 787 131 795 171
-rect 742 115 795 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 178 773
-rect 110 561 133 757
-rect 167 561 178 757
-rect 110 521 178 561
-rect 208 757 264 773
-rect 208 629 219 757
-rect 253 629 264 757
-rect 208 521 264 629
-rect 294 757 362 773
-rect 294 629 305 757
-rect 339 629 362 757
-rect 294 521 362 629
-rect 392 757 445 773
-rect 392 561 403 757
-rect 437 561 445 757
-rect 392 521 445 561
-rect 499 757 552 773
-rect 499 561 507 757
-rect 541 561 552 757
-rect 499 521 552 561
-rect 582 757 638 773
-rect 582 561 593 757
-rect 627 561 638 757
-rect 582 521 638 561
-rect 668 521 710 773
-rect 740 757 796 773
-rect 740 561 751 757
-rect 785 561 796 757
-rect 740 521 796 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 133 131 167 171
-rect 291 131 325 171
-rect 397 131 431 171
-rect 495 131 529 171
-rect 581 131 615 171
-rect 667 131 701 171
-rect 753 131 787 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 133 561 167 757
-rect 219 629 253 757
-rect 305 629 339 757
-rect 403 561 437 757
-rect 507 561 541 757
-rect 593 561 627 757
-rect 751 561 785 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-<< poly >>
-rect 80 773 110 799
-rect 178 773 208 799
-rect 264 773 294 799
-rect 362 773 392 799
-rect 552 773 582 799
-rect 638 773 668 799
-rect 710 773 740 799
-rect 80 313 110 521
-rect 178 381 208 521
-rect 264 455 294 521
-rect 154 365 208 381
-rect 154 331 164 365
-rect 198 331 208 365
-rect 154 315 208 331
-rect 43 297 110 313
-rect 43 263 53 297
-rect 87 263 110 297
-rect 43 247 110 263
-rect 80 225 110 247
-rect 178 225 208 315
-rect 250 439 304 455
-rect 250 405 260 439
-rect 294 405 304 439
-rect 250 389 304 405
-rect 362 453 392 521
-rect 552 453 582 521
-rect 362 423 582 453
-rect 250 225 280 389
-rect 362 328 392 423
-rect 638 381 668 521
-rect 710 455 740 521
-rect 710 439 764 455
-rect 710 405 720 439
-rect 754 405 764 439
-rect 710 389 764 405
-rect 338 312 392 328
-rect 614 365 668 381
-rect 614 331 624 365
-rect 658 331 668 365
-rect 614 315 668 331
-rect 338 278 348 312
-rect 382 279 392 312
-rect 382 278 570 279
-rect 338 249 570 278
-rect 442 225 472 249
-rect 540 225 570 249
-rect 626 225 656 315
-rect 712 225 742 389
-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 331 198 365
-rect 53 263 87 297
-rect 260 405 294 439
-rect 720 405 754 439
-rect 624 331 658 365
-rect 348 278 382 312
-<< locali >>
-rect 0 867 836 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 836 867
-rect 35 757 69 773
-rect 35 527 69 553
-rect 133 757 167 827
-rect 133 545 167 561
-rect 219 757 253 773
-rect 219 523 253 629
-rect 305 757 339 827
-rect 305 613 339 629
-rect 403 757 437 773
-rect 219 489 362 523
-rect 260 439 294 455
-rect 260 389 294 405
-rect 148 331 164 365
-rect 198 331 214 365
-rect 328 328 362 489
-rect 403 513 437 561
-rect 507 757 541 773
-rect 403 479 418 513
-rect 328 312 382 328
-rect 37 263 53 297
-rect 87 291 144 297
-rect 328 296 348 312
-rect 87 263 110 291
-rect 291 278 348 296
-rect 291 262 382 278
-rect 35 171 69 182
-rect 35 115 69 131
-rect 133 171 167 187
-rect 133 61 167 131
-rect 291 171 325 262
-rect 418 216 452 479
-rect 507 511 541 561
-rect 593 757 627 827
-rect 593 545 627 561
-rect 751 757 785 773
-rect 751 511 785 561
-rect 507 477 785 511
-rect 507 291 541 477
-rect 704 405 720 439
-rect 754 405 770 439
-rect 608 331 624 365
-rect 658 331 674 365
-rect 541 257 667 291
-rect 291 115 325 131
-rect 397 181 452 216
-rect 397 171 431 181
-rect 397 115 431 131
-rect 495 171 529 187
-rect 495 61 529 131
-rect 581 171 615 187
-rect 667 171 701 257
-rect 615 131 667 144
-rect 753 171 787 187
-rect 701 131 753 144
-rect 581 110 787 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 35 561 69 587
-rect 35 553 69 561
-rect 260 405 294 439
-rect 164 331 198 365
-rect 418 479 452 513
-rect 110 257 144 291
-rect 35 182 69 216
-rect 720 405 754 439
-rect 624 331 658 365
-rect 507 257 541 291
-rect 667 257 701 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 867 836 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 836 867
-rect 0 827 836 833
-rect 23 587 81 593
-rect 23 553 35 587
-rect 69 553 81 587
-rect 23 547 81 553
-rect 35 222 69 547
-rect 406 513 464 519
-rect 406 479 418 513
-rect 452 479 486 513
-rect 406 473 464 479
-rect 248 439 306 445
-rect 708 439 766 445
-rect 248 405 260 439
-rect 294 405 720 439
-rect 754 405 766 439
-rect 248 404 766 405
-rect 248 399 306 404
-rect 708 399 766 404
-rect 152 366 210 371
-rect 612 366 670 371
-rect 152 365 670 366
-rect 152 331 164 365
-rect 198 331 624 365
-rect 658 331 670 365
-rect 152 325 210 331
-rect 612 325 670 331
-rect 98 291 156 297
-rect 495 291 553 297
-rect 655 291 713 297
-rect 98 257 110 291
-rect 144 257 507 291
-rect 541 257 553 291
-rect 633 257 667 291
-rect 701 257 713 291
-rect 98 251 156 257
-rect 495 251 553 257
-rect 655 251 713 257
-rect 23 216 81 222
-rect 23 182 35 216
-rect 69 182 81 216
-rect 23 176 81 182
-rect 0 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 381 50 381 1 S
-port 1 n
-rlabel viali 737 422 737 422 1 A
-port 2 n
-rlabel viali 642 348 642 348 1 B
-port 3 n
-rlabel viali 435 496 435 496 1 CO
-port 4 n
-rlabel viali 684 274 684 274 1 CON
-port 5 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__addh_l.mag b/12T_hs/sky130_osu_sc_12T_hs__addh_l.mag
deleted file mode 100644
index 8facaeb..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__addh_l.mag
+++ /dev/null
@@ -1,396 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864445
-<< checkpaint >>
-rect -1209 -1243 2025 2131
-<< nwell >>
-rect -9 485 837 897
-<< pmos >>
-rect 80 606 110 773
-rect 178 521 208 773
-rect 264 521 294 773
-rect 362 605 392 773
-rect 552 521 582 773
-rect 638 521 668 773
-rect 710 521 740 773
-<< nmoslvt >>
-rect 80 115 110 199
-rect 178 115 208 225
-rect 250 115 280 225
-rect 442 115 472 199
-rect 540 115 570 225
-rect 626 115 656 225
-rect 712 115 742 225
-<< ndiff >>
-rect 125 199 178 225
-rect 27 165 80 199
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 171 178 199
-rect 110 131 133 171
-rect 167 131 178 171
-rect 110 115 178 131
-rect 208 115 250 225
-rect 280 171 333 225
-rect 487 199 540 225
-rect 280 131 291 171
-rect 325 131 333 171
-rect 280 115 333 131
-rect 389 165 442 199
-rect 389 131 397 165
-rect 431 131 442 165
-rect 389 115 442 131
-rect 472 171 540 199
-rect 472 131 495 171
-rect 529 131 540 171
-rect 472 115 540 131
-rect 570 171 626 225
-rect 570 131 581 171
-rect 615 131 626 171
-rect 570 115 626 131
-rect 656 171 712 225
-rect 656 131 667 171
-rect 701 131 712 171
-rect 656 115 712 131
-rect 742 171 795 225
-rect 742 131 753 171
-rect 787 131 795 171
-rect 742 115 795 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 606 80 621
-rect 110 757 178 773
-rect 110 606 133 757
-rect 125 561 133 606
-rect 167 561 178 757
-rect 125 521 178 561
-rect 208 757 264 773
-rect 208 629 219 757
-rect 253 629 264 757
-rect 208 521 264 629
-rect 294 757 362 773
-rect 294 629 305 757
-rect 339 629 362 757
-rect 294 605 362 629
-rect 392 757 445 773
-rect 392 621 403 757
-rect 437 621 445 757
-rect 392 605 445 621
-rect 499 757 552 773
-rect 294 521 347 605
-rect 499 561 507 757
-rect 541 561 552 757
-rect 499 521 552 561
-rect 582 757 638 773
-rect 582 561 593 757
-rect 627 561 638 757
-rect 582 521 638 561
-rect 668 521 710 773
-rect 740 757 796 773
-rect 740 561 751 757
-rect 785 561 796 757
-rect 740 521 796 561
-<< ndiffc >>
-rect 35 131 69 165
-rect 133 131 167 171
-rect 291 131 325 171
-rect 397 131 431 165
-rect 495 131 529 171
-rect 581 131 615 171
-rect 667 131 701 171
-rect 753 131 787 171
-<< pdiffc >>
-rect 35 621 69 757
-rect 133 561 167 757
-rect 219 629 253 757
-rect 305 629 339 757
-rect 403 621 437 757
-rect 507 561 541 757
-rect 593 561 627 757
-rect 751 561 785 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-<< poly >>
-rect 80 773 110 799
-rect 178 773 208 799
-rect 264 773 294 799
-rect 362 773 392 799
-rect 552 773 582 799
-rect 638 773 668 799
-rect 710 773 740 799
-rect 80 307 110 606
-rect 178 381 208 521
-rect 264 455 294 521
-rect 154 365 208 381
-rect 154 331 164 365
-rect 198 331 208 365
-rect 154 315 208 331
-rect 43 291 110 307
-rect 43 257 53 291
-rect 87 257 110 291
-rect 43 241 110 257
-rect 80 199 110 241
-rect 178 225 208 315
-rect 250 439 304 455
-rect 250 405 260 439
-rect 294 405 304 439
-rect 250 389 304 405
-rect 362 453 392 605
-rect 552 453 582 521
-rect 362 423 582 453
-rect 250 225 280 389
-rect 362 328 392 423
-rect 638 381 668 521
-rect 710 455 740 521
-rect 710 439 764 455
-rect 710 405 720 439
-rect 754 405 764 439
-rect 710 389 764 405
-rect 338 312 392 328
-rect 614 365 668 381
-rect 614 331 624 365
-rect 658 331 668 365
-rect 614 315 668 331
-rect 338 278 348 312
-rect 382 279 392 312
-rect 382 278 570 279
-rect 338 249 570 278
-rect 442 199 472 249
-rect 540 225 570 249
-rect 626 225 656 315
-rect 712 225 742 389
-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 331 198 365
-rect 53 257 87 291
-rect 260 405 294 439
-rect 720 405 754 439
-rect 624 331 658 365
-rect 348 278 382 312
-<< locali >>
-rect 0 867 836 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 836 867
-rect 35 757 69 773
-rect 35 587 69 621
-rect 133 757 167 827
-rect 133 545 167 561
-rect 219 757 253 773
-rect 219 523 253 629
-rect 305 757 339 827
-rect 305 613 339 629
-rect 403 757 437 773
-rect 219 489 362 523
-rect 260 439 294 455
-rect 260 389 294 405
-rect 148 331 164 365
-rect 198 331 214 365
-rect 328 328 362 489
-rect 403 513 437 621
-rect 507 757 541 773
-rect 403 479 418 513
-rect 328 312 382 328
-rect 328 296 348 312
-rect 37 257 53 291
-rect 87 257 110 291
-rect 291 278 348 296
-rect 291 262 382 278
-rect 35 165 69 182
-rect 35 115 69 131
-rect 133 171 167 187
-rect 133 61 167 131
-rect 291 171 325 262
-rect 418 216 452 479
-rect 507 511 541 561
-rect 593 757 627 827
-rect 593 545 627 561
-rect 751 757 785 773
-rect 751 511 785 561
-rect 507 477 785 511
-rect 507 291 541 477
-rect 704 405 720 439
-rect 754 405 770 439
-rect 608 331 624 365
-rect 658 331 674 365
-rect 541 257 667 291
-rect 291 115 325 131
-rect 397 181 452 216
-rect 397 165 431 181
-rect 397 115 431 131
-rect 495 171 529 187
-rect 495 61 529 131
-rect 581 171 615 187
-rect 667 171 701 257
-rect 615 131 667 144
-rect 753 171 787 187
-rect 701 131 753 144
-rect 581 110 787 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 35 553 69 587
-rect 260 405 294 439
-rect 164 331 198 365
-rect 418 479 452 513
-rect 110 257 144 291
-rect 35 182 69 216
-rect 720 405 754 439
-rect 624 331 658 365
-rect 507 257 541 291
-rect 667 257 701 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 867 836 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 836 867
-rect 0 827 836 833
-rect 23 587 81 593
-rect 23 553 35 587
-rect 69 553 81 587
-rect 23 547 81 553
-rect 35 222 69 547
-rect 406 513 464 519
-rect 406 479 418 513
-rect 452 479 486 513
-rect 406 473 464 479
-rect 248 439 306 445
-rect 708 439 766 445
-rect 248 405 260 439
-rect 294 405 720 439
-rect 754 405 766 439
-rect 248 404 766 405
-rect 248 399 306 404
-rect 708 399 766 404
-rect 152 366 210 371
-rect 612 366 670 371
-rect 152 365 670 366
-rect 152 331 164 365
-rect 198 331 624 365
-rect 658 331 670 365
-rect 152 325 210 331
-rect 612 325 670 331
-rect 98 291 156 297
-rect 495 291 553 297
-rect 655 291 713 297
-rect 98 257 110 291
-rect 144 257 507 291
-rect 541 257 553 291
-rect 633 257 667 291
-rect 701 257 713 291
-rect 98 251 156 257
-rect 495 251 553 257
-rect 655 251 713 257
-rect 23 216 81 222
-rect 23 182 35 216
-rect 69 182 81 216
-rect 23 176 81 182
-rect 0 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 381 50 381 1 S
-port 1 n
-rlabel viali 737 422 737 422 1 A
-port 2 n
-rlabel viali 642 348 642 348 1 B
-port 3 n
-rlabel viali 435 496 435 496 1 CO
-port 4 n
-rlabel viali 684 274 684 274 1 CON
-port 5 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__and2_1.mag b/12T_hs/sky130_osu_sc_12T_hs__and2_1.mag
deleted file mode 100644
index f1b9464..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__and2_1.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864446
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 485 374 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 152 115 182 225
-rect 252 115 282 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 225
-rect 182 171 252 225
-rect 182 131 193 171
-rect 227 131 252 171
-rect 182 115 252 131
-rect 282 171 335 225
-rect 282 131 293 171
-rect 327 131 335 171
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 335 773
-rect 282 561 293 757
-rect 327 561 335 757
-rect 282 521 335 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-rect 293 131 327 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 629 155 757
-rect 207 629 241 757
-rect 293 561 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 490 110 521
-rect 27 474 110 490
-rect 27 440 37 474
-rect 71 440 110 474
-rect 27 424 110 440
-rect 80 225 110 424
-rect 166 422 196 521
-rect 252 496 282 521
-rect 252 466 289 496
-rect 152 406 217 422
-rect 152 372 173 406
-rect 207 372 217 406
-rect 152 356 217 372
-rect 152 225 182 356
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 274 313 308
-rect 252 258 313 274
-rect 252 225 282 258
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 440 71 474
-rect 173 372 207 406
-rect 269 274 303 308
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 105 629 121 647
-rect 105 613 155 629
-rect 207 757 241 827
-rect 207 613 241 629
-rect 293 757 327 773
-rect 37 474 71 553
-rect 37 424 71 440
-rect 105 308 139 613
-rect 173 406 207 479
-rect 293 439 327 561
-rect 173 356 207 372
-rect 35 274 269 308
-rect 303 274 319 308
-rect 35 171 69 274
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 37 553 71 587
-rect 173 479 207 513
-rect 293 405 327 439
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 25 587 83 593
-rect 25 553 37 587
-rect 71 553 105 587
-rect 25 547 83 553
-rect 161 513 219 519
-rect 140 479 173 513
-rect 207 479 219 513
-rect 161 473 219 479
-rect 281 439 339 445
-rect 281 405 293 439
-rect 327 405 339 439
-rect 281 399 339 405
-rect 293 223 327 399
-rect 281 217 339 223
-rect 281 183 293 217
-rect 327 183 339 217
-rect 281 177 339 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 55 570 55 570 1 A
-port 2 n
-rlabel viali 191 496 191 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__and2_2.mag b/12T_hs/sky130_osu_sc_12T_hs__and2_2.mag
deleted file mode 100644
index dbefbe7..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__and2_2.mag
+++ /dev/null
@@ -1,221 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864446
-<< checkpaint >>
-rect -1209 -1243 1617 2131
-<< nwell >>
-rect -9 485 462 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 152 115 182 225
-rect 252 115 282 225
-rect 338 115 368 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 225
-rect 182 171 252 225
-rect 182 131 193 171
-rect 227 131 252 171
-rect 182 115 252 131
-rect 282 171 338 225
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 421 225
-rect 368 131 379 171
-rect 413 131 421 171
-rect 368 115 421 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 421 773
-rect 368 561 379 757
-rect 413 561 421 757
-rect 368 521 421 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-rect 293 131 327 171
-rect 379 131 413 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 629 155 757
-rect 207 629 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 80 490 110 521
-rect 27 474 110 490
-rect 27 440 37 474
-rect 71 440 110 474
-rect 27 424 110 440
-rect 80 225 110 424
-rect 166 422 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 252 466 368 496
-rect 152 406 217 422
-rect 152 372 173 406
-rect 207 372 217 406
-rect 152 356 217 372
-rect 152 225 182 356
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 303 274 368 288
-rect 252 258 368 274
-rect 252 225 282 258
-rect 338 225 368 258
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 37 440 71 474
-rect 173 372 207 406
-rect 269 274 303 308
-<< locali >>
-rect 0 867 462 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 462 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 105 629 121 647
-rect 105 613 155 629
-rect 207 757 241 827
-rect 207 613 241 629
-rect 293 757 327 773
-rect 37 474 71 553
-rect 37 424 71 440
-rect 105 308 139 613
-rect 173 406 207 479
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 173 356 207 372
-rect 35 274 269 308
-rect 303 274 319 308
-rect 35 171 69 274
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 37 553 71 587
-rect 173 479 207 513
-rect 293 405 327 439
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 462 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 462 867
-rect 0 827 462 833
-rect 25 587 83 593
-rect 25 553 37 587
-rect 71 553 105 587
-rect 25 547 83 553
-rect 161 513 219 519
-rect 140 479 173 513
-rect 207 479 219 513
-rect 161 473 219 479
-rect 281 439 339 445
-rect 281 405 293 439
-rect 327 405 339 439
-rect 281 399 339 405
-rect 293 223 327 399
-rect 281 217 339 223
-rect 281 183 293 217
-rect 327 183 339 217
-rect 281 177 339 183
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 191 496 191 496 1 B
-port 1 n
-rlabel viali 55 570 55 570 1 A
-port 2 n
-rlabel metal1 311 348 311 348 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__and2_4.mag b/12T_hs/sky130_osu_sc_12T_hs__and2_4.mag
deleted file mode 100644
index 1aea9bc..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__and2_4.mag
+++ /dev/null
@@ -1,284 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864446
-<< checkpaint >>
-rect -1209 -1243 1753 2131
-<< nwell >>
-rect -9 485 638 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 152 115 182 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 225
-rect 182 171 252 225
-rect 182 131 193 171
-rect 227 131 252 171
-rect 182 115 252 131
-rect 282 171 338 225
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 225
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 225
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 593 225
-rect 540 131 551 171
-rect 585 131 593 171
-rect 540 115 593 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 593 773
-rect 540 561 551 757
-rect 585 561 593 757
-rect 540 521 593 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 629 155 757
-rect 207 629 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 424 773 454 799
-rect 510 773 540 799
-rect 80 490 110 521
-rect 27 474 110 490
-rect 27 440 37 474
-rect 71 440 110 474
-rect 27 424 110 440
-rect 80 225 110 424
-rect 166 422 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 252 466 540 496
-rect 152 406 217 422
-rect 152 372 173 406
-rect 207 372 217 406
-rect 152 356 217 372
-rect 152 225 182 356
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 303 274 540 288
-rect 252 258 540 274
-rect 252 225 282 258
-rect 338 225 368 258
-rect 424 225 454 258
-rect 510 225 540 258
-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 440 71 474
-rect 173 372 207 406
-rect 269 274 303 308
-<< locali >>
-rect 0 867 638 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 638 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 105 629 121 647
-rect 105 613 155 629
-rect 207 757 241 827
-rect 207 613 241 629
-rect 293 757 327 773
-rect 37 474 71 553
-rect 37 424 71 440
-rect 105 308 139 613
-rect 173 406 207 479
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 439 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 173 356 207 372
-rect 35 274 269 308
-rect 303 274 319 308
-rect 35 171 69 274
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 37 553 71 587
-rect 173 479 207 513
-rect 293 405 327 439
-rect 465 405 499 439
-rect 293 183 327 217
-rect 465 183 499 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 638 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 638 867
-rect 0 827 638 833
-rect 25 587 83 593
-rect 25 553 37 587
-rect 71 553 105 587
-rect 25 547 83 553
-rect 161 513 219 519
-rect 140 479 173 513
-rect 207 479 219 513
-rect 161 473 219 479
-rect 281 439 339 445
-rect 453 439 511 445
-rect 281 405 293 439
-rect 327 405 465 439
-rect 499 405 511 439
-rect 281 399 339 405
-rect 453 399 511 405
-rect 293 223 327 399
-rect 465 223 499 399
-rect 281 217 339 223
-rect 453 217 511 223
-rect 281 183 293 217
-rect 327 183 465 217
-rect 499 183 511 217
-rect 281 177 339 183
-rect 453 177 511 183
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 55 570 55 570 1 A
-port 2 n
-rlabel viali 191 496 191 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__and2_6.mag b/12T_hs/sky130_osu_sc_12T_hs__and2_6.mag
deleted file mode 100644
index 78df3a3..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__and2_6.mag
+++ /dev/null
@@ -1,313 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1605556786
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 485 814 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 152 115 182 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-rect 596 115 626 225
-rect 682 115 712 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 225
-rect 182 171 252 225
-rect 182 131 193 171
-rect 227 131 252 171
-rect 182 115 252 131
-rect 282 171 338 225
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 225
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 225
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 225
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 225
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 765 225
-rect 712 131 723 171
-rect 757 131 765 171
-rect 712 115 765 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 765 773
-rect 712 561 723 757
-rect 757 561 765 757
-rect 712 521 765 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 629 155 757
-rect 207 629 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 80 490 110 521
-rect 20 474 110 490
-rect 20 440 30 474
-rect 64 440 110 474
-rect 20 424 110 440
-rect 80 225 110 424
-rect 166 423 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 596 496 626 521
-rect 682 496 712 521
-rect 252 466 712 496
-rect 152 406 210 423
-rect 152 372 166 406
-rect 200 372 210 406
-rect 152 356 210 372
-rect 152 225 182 356
-rect 252 324 282 466
-rect 252 308 306 324
-rect 252 274 262 308
-rect 296 288 306 308
-rect 596 288 626 466
-rect 296 274 712 288
-rect 252 258 712 274
-rect 252 225 282 258
-rect 338 225 368 258
-rect 424 225 454 258
-rect 510 225 540 258
-rect 596 225 626 258
-rect 682 225 712 258
-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 440 64 474
-rect 166 372 200 406
-rect 262 274 296 308
-<< locali >>
-rect 0 861 814 888
-rect 0 827 51 861
-rect 85 827 187 861
-rect 221 827 323 861
-rect 357 827 459 861
-rect 493 827 595 861
-rect 629 827 814 861
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 98 629 121 647
-rect 98 613 155 629
-rect 207 757 241 827
-rect 207 613 241 629
-rect 293 757 327 773
-rect 30 474 64 553
-rect 30 424 64 440
-rect 98 308 132 613
-rect 166 406 200 479
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 439 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 637 757 671 773
-rect 637 439 671 561
-rect 723 757 757 827
-rect 723 545 757 561
-rect 166 356 200 372
-rect 35 274 262 308
-rect 296 274 312 308
-rect 35 171 69 274
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 637 171 671 183
-rect 637 115 671 131
-rect 723 171 757 187
-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 553 64 587
-rect 166 479 200 513
-rect 293 405 327 439
-rect 465 405 499 439
-rect 637 405 671 439
-rect 293 183 327 217
-rect 465 183 499 217
-rect 637 183 671 217
-<< metal1 >>
-rect 0 827 814 888
-rect 18 587 76 593
-rect 18 553 30 587
-rect 64 553 98 587
-rect 18 547 76 553
-rect 154 513 212 519
-rect 132 479 166 513
-rect 200 479 212 513
-rect 154 473 212 479
-rect 281 439 339 445
-rect 453 439 511 445
-rect 625 439 683 445
-rect 281 405 293 439
-rect 327 405 465 439
-rect 499 405 637 439
-rect 671 405 683 439
-rect 281 399 339 405
-rect 453 399 511 405
-rect 625 399 683 405
-rect 293 223 327 399
-rect 465 223 499 399
-rect 637 223 671 399
-rect 281 217 339 223
-rect 453 217 511 223
-rect 625 217 683 223
-rect 281 183 293 217
-rect 327 183 465 217
-rect 499 183 637 217
-rect 671 183 683 217
-rect 281 177 339 183
-rect 453 177 511 183
-rect 625 177 683 183
-rect 0 0 814 61
-<< labels >>
-rlabel viali 184 496 184 496 1 B
-port 1 n
-rlabel viali 48 570 48 570 1 A
-port 2 n
-rlabel metal1 311 348 311 348 1 Y
-port 3 n
-rlabel metal1 68 844 68 844 1 vdd
-rlabel metal1 68 44 68 44 1 gnd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__and2_8.mag b/12T_hs/sky130_osu_sc_12T_hs__and2_8.mag
deleted file mode 100644
index b44c598..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__and2_8.mag
+++ /dev/null
@@ -1,426 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864446
-<< checkpaint >>
-rect -1209 -1243 2161 2131
-<< nwell >>
-rect -9 485 990 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-rect 768 521 798 773
-rect 854 521 884 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 152 115 182 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-rect 596 115 626 225
-rect 682 115 712 225
-rect 768 115 798 225
-rect 854 115 884 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 225
-rect 182 171 252 225
-rect 182 131 193 171
-rect 227 131 252 171
-rect 182 115 252 131
-rect 282 171 338 225
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 225
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 225
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 225
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 225
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 768 225
-rect 712 131 723 171
-rect 757 131 768 171
-rect 712 115 768 131
-rect 798 171 854 225
-rect 798 131 809 171
-rect 843 131 854 171
-rect 798 115 854 131
-rect 884 171 937 225
-rect 884 131 895 171
-rect 929 131 937 171
-rect 884 115 937 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 768 773
-rect 712 561 723 757
-rect 757 561 768 757
-rect 712 521 768 561
-rect 798 757 854 773
-rect 798 561 809 757
-rect 843 561 854 757
-rect 798 521 854 561
-rect 884 757 937 773
-rect 884 561 895 757
-rect 929 561 937 757
-rect 884 521 937 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-rect 809 131 843 171
-rect 895 131 929 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 629 155 757
-rect 207 629 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-rect 809 561 843 757
-rect 895 561 929 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 768 773 798 799
-rect 854 773 884 799
-rect 80 490 110 521
-rect 27 474 110 490
-rect 27 440 37 474
-rect 71 440 110 474
-rect 27 424 110 440
-rect 80 225 110 424
-rect 166 422 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 596 496 626 521
-rect 682 496 712 521
-rect 768 496 798 521
-rect 854 496 884 521
-rect 252 466 884 496
-rect 152 406 217 422
-rect 152 372 173 406
-rect 207 372 217 406
-rect 152 356 217 372
-rect 152 225 182 356
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 596 288 626 466
-rect 303 274 884 288
-rect 252 258 884 274
-rect 252 225 282 258
-rect 338 225 368 258
-rect 424 225 454 258
-rect 510 225 540 258
-rect 596 225 626 258
-rect 682 225 712 258
-rect 768 225 798 258
-rect 854 225 884 258
-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 440 71 474
-rect 173 372 207 406
-rect 269 274 303 308
-<< locali >>
-rect 0 867 990 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 990 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 105 629 121 647
-rect 105 613 155 629
-rect 207 757 241 827
-rect 207 613 241 629
-rect 293 757 327 773
-rect 37 474 71 553
-rect 37 424 71 440
-rect 105 308 139 613
-rect 173 406 207 479
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 439 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 637 757 671 773
-rect 637 439 671 561
-rect 723 757 757 827
-rect 723 545 757 561
-rect 809 757 843 773
-rect 809 439 843 561
-rect 895 757 929 827
-rect 895 545 929 561
-rect 173 356 207 372
-rect 35 274 269 308
-rect 303 274 319 308
-rect 35 171 69 274
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 637 171 671 183
-rect 637 115 671 131
-rect 723 171 757 187
-rect 723 61 757 131
-rect 809 171 843 183
-rect 809 115 843 131
-rect 895 171 929 187
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 37 553 71 587
-rect 173 479 207 513
-rect 293 405 327 439
-rect 465 405 499 439
-rect 637 405 671 439
-rect 809 405 843 439
-rect 293 183 327 217
-rect 465 183 499 217
-rect 637 183 671 217
-rect 809 183 843 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 867 990 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 990 867
-rect 0 827 990 833
-rect 25 587 83 593
-rect 25 553 37 587
-rect 71 553 105 587
-rect 25 547 83 553
-rect 161 513 219 519
-rect 140 479 173 513
-rect 207 479 219 513
-rect 161 473 219 479
-rect 281 439 339 445
-rect 453 439 511 445
-rect 625 439 683 445
-rect 797 439 855 445
-rect 281 405 293 439
-rect 327 405 465 439
-rect 499 405 637 439
-rect 671 405 809 439
-rect 843 405 855 439
-rect 281 399 339 405
-rect 453 399 511 405
-rect 625 399 683 405
-rect 797 399 855 405
-rect 293 223 327 399
-rect 465 223 499 399
-rect 637 223 671 399
-rect 809 223 843 399
-rect 281 217 339 223
-rect 453 217 511 223
-rect 625 217 683 223
-rect 797 217 855 223
-rect 281 183 293 217
-rect 327 183 465 217
-rect 499 183 637 217
-rect 671 183 683 217
-rect 712 183 809 217
-rect 843 183 855 217
-rect 281 177 339 183
-rect 453 177 511 183
-rect 625 177 683 183
-rect 797 177 855 183
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel viali 191 496 191 496 1 B
-port 1 n
-rlabel viali 55 570 55 570 1 A
-port 2 n
-rlabel metal1 311 348 311 348 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__and2_l.mag b/12T_hs/sky130_osu_sc_12T_hs__and2_l.mag
deleted file mode 100644
index 0e3c9e2..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__and2_l.mag
+++ /dev/null
@@ -1,183 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864447
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 374 897
-<< pmos >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 252 605 282 773
-<< nmoslvt >>
-rect 80 115 110 199
-rect 152 115 182 199
-rect 252 115 282 199
-<< ndiff >>
-rect 27 165 80 199
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 115 152 199
-rect 182 165 252 199
-rect 182 131 193 165
-rect 227 131 252 165
-rect 182 115 252 131
-rect 282 165 335 199
-rect 282 131 293 165
-rect 327 131 335 165
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 605 80 621
-rect 110 757 166 773
-rect 110 621 121 757
-rect 155 621 166 757
-rect 110 605 166 621
-rect 196 757 252 773
-rect 196 621 207 757
-rect 241 621 252 757
-rect 196 605 252 621
-rect 282 757 335 773
-rect 282 621 293 757
-rect 327 621 335 757
-rect 282 605 335 621
-<< ndiffc >>
-rect 35 131 69 165
-rect 193 131 227 165
-rect 293 131 327 165
-<< pdiffc >>
-rect 35 621 69 757
-rect 121 621 155 757
-rect 207 621 241 757
-rect 293 621 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 565 110 605
-rect 27 549 110 565
-rect 27 515 37 549
-rect 71 515 110 549
-rect 27 499 110 515
-rect 80 199 110 499
-rect 166 496 196 605
-rect 252 570 282 605
-rect 252 540 289 570
-rect 152 479 217 496
-rect 152 445 173 479
-rect 207 445 217 479
-rect 152 429 217 445
-rect 152 199 182 429
-rect 259 398 289 540
-rect 259 368 313 398
-rect 259 348 269 368
-rect 252 334 269 348
-rect 303 334 313 368
-rect 252 318 313 334
-rect 252 199 282 318
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 515 71 549
-rect 173 445 207 479
-rect 269 334 303 368
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 827
-rect 121 757 155 773
-rect 35 605 69 621
-rect 105 621 121 639
-rect 105 605 155 621
-rect 207 757 241 827
-rect 207 605 241 621
-rect 293 757 327 773
-rect 37 549 71 565
-rect 37 513 71 515
-rect 105 368 139 605
-rect 293 513 327 621
-rect 173 429 207 445
-rect 35 334 269 368
-rect 303 334 319 368
-rect 35 165 69 334
-rect 35 115 69 131
-rect 193 165 227 181
-rect 193 61 227 131
-rect 293 165 327 257
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 37 479 71 513
-rect 173 479 207 513
-rect 293 479 327 513
-rect 293 257 327 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 25 513 83 519
-rect 161 513 219 519
-rect 281 513 339 519
-rect 25 479 37 513
-rect 71 479 104 513
-rect 161 479 173 513
-rect 207 479 241 513
-rect 281 479 293 513
-rect 327 479 339 513
-rect 25 473 83 479
-rect 161 473 219 479
-rect 281 473 339 479
-rect 293 297 327 473
-rect 281 291 339 297
-rect 281 257 293 291
-rect 327 257 339 291
-rect 281 251 339 257
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel viali 54 497 54 497 1 A
-rlabel metal1 311 422 311 422 1 Y
-port 1 n
-rlabel viali 190 496 190 496 1 B
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__ant.mag b/12T_hs/sky130_osu_sc_12T_hs__ant.mag
deleted file mode 100644
index 445f58c..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__ant.mag
+++ /dev/null
@@ -1,101 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864447
-<< checkpaint >>
-rect -1209 -1243 1345 2131
-<< nwell >>
-rect -9 485 199 897
-<< pmos >>
-rect 80 521 110 773
-<< nmoslvt >>
-rect 80 115 110 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 225
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 561 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 455 110 521
-rect 35 439 110 455
-rect 35 405 47 439
-rect 81 405 110 439
-rect 35 389 110 405
-rect 80 225 110 389
-rect 80 89 110 115
-<< polycont >>
-rect 47 405 81 439
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 773
-rect 35 439 69 561
-rect 121 757 155 827
-rect 121 545 155 561
-rect 31 405 47 439
-rect 81 405 97 439
-rect 35 321 69 405
-rect 35 287 155 321
-rect 35 171 69 287
-rect 35 115 69 131
-rect 121 171 155 287
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 47 405 81 439
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 35 439 108 445
-rect 35 405 47 439
-rect 81 405 108 439
-rect 35 399 108 405
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 422 64 422 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__antfill.mag b/12T_hs/sky130_osu_sc_12T_hs__antfill.mag
deleted file mode 100644
index 095dd68..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__antfill.mag
+++ /dev/null
@@ -1,60 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864447
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 485 199 897
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 439 69 773
-rect 121 545 155 827
-rect 31 405 47 439
-rect 81 405 97 439
-rect 35 321 69 405
-rect 35 287 155 321
-rect 35 115 69 287
-rect 121 115 155 287
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 47 405 81 439
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 35 439 108 445
-rect 35 405 47 439
-rect 81 405 108 439
-rect 35 399 108 405
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 422 64 422 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__aoi21_l.mag b/12T_hs/sky130_osu_sc_12T_hs__aoi21_l.mag
deleted file mode 100644
index 59a9f40..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__aoi21_l.mag
+++ /dev/null
@@ -1,199 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864447
-<< checkpaint >>
-rect -1209 -1244 1481 2131
-<< nwell >>
-rect -10 485 374 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-<< nmoslvt >>
-rect 80 114 110 224
-rect 152 114 182 224
-rect 250 114 280 198
-<< ndiff >>
-rect 27 164 80 224
-rect 27 130 35 164
-rect 69 130 80 164
-rect 27 114 80 130
-rect 110 114 152 224
-rect 182 198 233 224
-rect 182 164 250 198
-rect 182 130 193 164
-rect 227 130 250 164
-rect 182 114 250 130
-rect 280 164 333 198
-rect 280 130 291 164
-rect 325 130 333 164
-rect 280 114 333 130
-<< pdiff >>
-rect 27 757 80 773
-rect 27 696 35 757
-rect 69 696 80 757
-rect 27 521 80 696
-rect 110 757 166 773
-rect 110 696 121 757
-rect 155 696 166 757
-rect 110 521 166 696
-rect 196 757 252 773
-rect 196 697 207 757
-rect 241 697 252 757
-rect 196 521 252 697
-rect 282 757 335 773
-rect 282 643 293 757
-rect 327 643 335 757
-rect 282 521 335 643
-<< ndiffc >>
-rect 35 130 69 164
-rect 193 130 227 164
-rect 291 130 325 164
-<< pdiffc >>
-rect 35 696 69 757
-rect 121 696 155 757
-rect 207 697 241 757
-rect 293 643 327 757
-<< psubdiff >>
-rect 27 26 51 60
-rect 85 26 109 60
-rect 163 26 187 60
-rect 221 26 245 60
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 26 85 60
-rect 187 26 221 60
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 484 110 521
-rect 44 474 110 484
-rect 44 440 60 474
-rect 94 440 110 474
-rect 44 430 110 440
-rect 44 274 74 430
-rect 166 388 196 521
-rect 252 504 282 521
-rect 252 474 309 504
-rect 134 372 196 388
-rect 134 338 146 372
-rect 180 338 196 372
-rect 134 322 196 338
-rect 44 242 110 274
-rect 80 224 110 242
-rect 152 224 182 322
-rect 279 309 309 474
-rect 279 293 333 309
-rect 279 275 289 293
-rect 250 259 289 275
-rect 323 259 333 293
-rect 250 243 333 259
-rect 250 198 280 243
-rect 80 88 110 114
-rect 152 88 182 114
-rect 250 88 280 114
-<< polycont >>
-rect 60 440 94 474
-rect 146 338 180 372
-rect 289 259 323 293
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 35 646 69 696
-rect 121 757 155 827
-rect 121 680 155 696
-rect 207 757 241 773
-rect 207 646 241 697
-rect 35 612 241 646
-rect 293 757 327 773
-rect 60 474 94 490
-rect 60 439 94 440
-rect 128 388 162 479
-rect 128 372 180 388
-rect 128 338 146 372
-rect 128 322 180 338
-rect 216 293 250 405
-rect 293 365 327 643
-rect 216 259 289 293
-rect 323 259 339 293
-rect 193 217 227 218
-rect 35 164 69 186
-rect 35 60 69 130
-rect 193 164 227 183
-rect 193 114 227 130
-rect 291 164 325 180
-rect 291 60 325 130
-rect 0 20 51 60
-rect 85 20 187 60
-rect 221 20 374 60
-rect 0 0 374 20
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 60 405 94 439
-rect 128 479 162 513
-rect 216 405 250 439
-rect 293 331 327 365
-rect 193 183 227 217
-rect 51 26 85 54
-rect 51 20 85 26
-rect 187 26 221 54
-rect 187 20 221 26
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 116 513 174 519
-rect 116 479 128 513
-rect 162 479 196 513
-rect 116 473 174 479
-rect 48 439 106 445
-rect 204 439 262 445
-rect 48 405 60 439
-rect 94 405 128 439
-rect 182 405 216 439
-rect 250 405 262 439
-rect 48 399 106 405
-rect 204 399 262 405
-rect 281 365 339 371
-rect 281 331 293 365
-rect 327 331 339 365
-rect 281 325 339 331
-rect 181 218 233 223
-rect 293 218 327 325
-rect 181 217 327 218
-rect 181 183 193 217
-rect 227 183 327 217
-rect 181 177 233 183
-rect 291 60 325 61
-rect 0 54 374 60
-rect 0 20 51 54
-rect 85 20 187 54
-rect 221 20 374 54
-rect 0 0 374 20
-<< labels >>
-rlabel viali 145 496 145 496 1 A1
-port 4 n
-rlabel metal1 310 318 310 318 1 Y
-port 3 n
-rlabel viali 77 422 77 422 1 A0
-rlabel viali 233 422 233 422 1 B0
-rlabel viali 68 47 68 47 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__aoi22_l.mag b/12T_hs/sky130_osu_sc_12T_hs__aoi22_l.mag
deleted file mode 100644
index c0541b5..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__aoi22_l.mag
+++ /dev/null
@@ -1,239 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864447
-<< checkpaint >>
-rect -1209 -1243 1617 2131
-<< nwell >>
-rect -9 485 462 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 152 115 182 225
-rect 252 115 282 225
-rect 324 115 354 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 225
-rect 182 171 252 225
-rect 182 131 200 171
-rect 234 131 252 171
-rect 182 115 252 131
-rect 282 115 324 225
-rect 354 171 407 225
-rect 354 131 365 171
-rect 399 131 407 171
-rect 354 115 407 131
-<< pdiff >>
-rect 27 732 80 773
-rect 27 663 35 732
-rect 69 663 80 732
-rect 27 521 80 663
-rect 110 765 166 773
-rect 110 697 121 765
-rect 155 697 166 765
-rect 110 521 166 697
-rect 196 732 252 773
-rect 196 663 207 732
-rect 241 663 252 732
-rect 196 521 252 663
-rect 282 698 338 773
-rect 282 629 293 698
-rect 327 629 338 698
-rect 282 521 338 629
-rect 368 732 421 773
-rect 368 664 379 732
-rect 413 664 421 732
-rect 368 521 421 664
-<< ndiffc >>
-rect 35 131 69 171
-rect 200 131 234 171
-rect 365 131 399 171
-<< pdiffc >>
-rect 35 663 69 732
-rect 121 697 155 765
-rect 207 663 241 732
-rect 293 629 327 698
-rect 379 664 413 732
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 799
-rect 80 484 110 521
-rect 44 474 110 484
-rect 44 440 60 474
-rect 94 440 110 474
-rect 44 430 110 440
-rect 44 274 74 430
-rect 166 418 196 521
-rect 152 388 196 418
-rect 116 372 182 388
-rect 116 338 128 372
-rect 162 338 182 372
-rect 116 322 182 338
-rect 44 242 110 274
-rect 80 225 110 242
-rect 152 225 182 322
-rect 252 317 282 521
-rect 338 381 368 521
-rect 338 365 416 381
-rect 338 338 370 365
-rect 224 301 282 317
-rect 224 267 234 301
-rect 268 267 282 301
-rect 224 251 282 267
-rect 252 225 282 251
-rect 324 331 370 338
-rect 404 331 416 365
-rect 324 315 416 331
-rect 324 308 368 315
-rect 324 225 354 308
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-rect 324 89 354 115
-<< polycont >>
-rect 60 440 94 474
-rect 128 338 162 372
-rect 234 267 268 301
-rect 370 331 404 365
-<< locali >>
-rect 0 867 462 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 462 867
-rect 121 765 155 827
-rect 35 732 69 748
-rect 121 680 155 697
-rect 207 748 413 782
-rect 207 732 241 748
-rect 35 646 69 663
-rect 379 732 413 748
-rect 207 646 241 663
-rect 35 612 241 646
-rect 293 698 327 714
-rect 379 648 413 664
-rect 293 570 327 629
-rect 293 536 336 570
-rect 60 474 94 490
-rect 60 439 94 440
-rect 128 372 162 479
-rect 128 322 162 338
-rect 216 317 250 405
-rect 216 301 268 317
-rect 216 267 234 301
-rect 234 251 268 267
-rect 302 291 336 536
-rect 370 365 404 381
-rect 370 315 404 331
-rect 35 171 69 187
-rect 35 61 69 131
-rect 200 171 234 183
-rect 200 115 234 131
-rect 365 171 399 187
-rect 365 61 399 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 60 405 94 439
-rect 128 479 162 513
-rect 216 405 250 439
-rect 370 331 404 365
-rect 302 257 336 291
-rect 200 183 234 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 462 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 462 867
-rect 0 827 462 833
-rect 116 513 174 519
-rect 116 479 128 513
-rect 162 479 196 513
-rect 116 473 174 479
-rect 48 439 106 445
-rect 204 439 262 445
-rect 48 405 60 439
-rect 94 405 127 439
-rect 204 405 216 439
-rect 250 405 284 439
-rect 48 399 106 405
-rect 204 399 262 405
-rect 358 365 416 371
-rect 336 331 370 365
-rect 404 331 416 365
-rect 358 325 416 331
-rect 290 291 348 297
-rect 290 257 302 291
-rect 336 257 348 291
-rect 290 251 348 257
-rect 188 217 246 223
-rect 304 217 338 251
-rect 188 183 200 217
-rect 234 183 338 217
-rect 188 177 246 183
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 233 422 233 422 1 B0
-port 2 n
-rlabel viali 145 496 145 496 1 A1
-port 4 n
-rlabel metal1 321 244 321 244 1 Y
-port 3 n
-rlabel viali 77 422 77 422 1 A0
-rlabel viali 387 348 387 348 1 B1
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__buf_1.mag b/12T_hs/sky130_osu_sc_12T_hs__buf_1.mag
deleted file mode 100644
index d95be4a..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__buf_1.mag
+++ /dev/null
@@ -1,156 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864448
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 485 288 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 249 225
-rect 196 131 207 171
-rect 241 131 249 171
-rect 196 115 249 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 249 773
-rect 196 561 207 757
-rect 241 561 249 757
-rect 196 521 249 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 207 561 241 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 80 433 110 521
-rect 166 506 196 521
-rect 166 476 251 506
-rect 80 417 154 433
-rect 80 383 110 417
-rect 144 383 154 417
-rect 80 367 154 383
-rect 80 225 110 367
-rect 221 324 251 476
-rect 166 308 251 324
-rect 166 274 176 308
-rect 210 274 251 308
-rect 166 258 251 274
-rect 166 225 196 258
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 110 383 144 417
-rect 176 274 210 308
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 308 69 561
-rect 110 417 144 553
-rect 207 513 241 561
-rect 110 367 144 383
-rect 176 308 210 324
-rect 35 274 176 308
-rect 35 171 69 274
-rect 176 258 210 274
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 207 171 241 183
-rect 207 115 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 110 553 144 587
-rect 207 479 241 513
-rect 207 183 241 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 98 587 156 593
-rect 64 553 110 587
-rect 144 553 156 587
-rect 98 547 156 553
-rect 195 513 253 519
-rect 195 479 207 513
-rect 241 479 253 513
-rect 195 473 253 479
-rect 207 223 241 473
-rect 195 217 253 223
-rect 195 183 207 217
-rect 241 183 253 217
-rect 195 177 253 183
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel viali 127 570 127 570 1 A
-port 1 n
-rlabel metal1 213 359 213 359 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__buf_2.mag b/12T_hs/sky130_osu_sc_12T_hs__buf_2.mag
deleted file mode 100644
index 4631239..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__buf_2.mag
+++ /dev/null
@@ -1,177 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864448
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 485 376 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 225
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 335 225
-rect 282 131 293 171
-rect 327 131 335 171
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 335 773
-rect 282 561 293 757
-rect 327 561 335 757
-rect 282 521 335 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 800
-rect 80 433 110 521
-rect 166 506 196 521
-rect 252 506 282 521
-rect 166 476 282 506
-rect 80 417 154 433
-rect 80 383 110 417
-rect 144 383 154 417
-rect 80 367 154 383
-rect 80 225 110 367
-rect 221 324 251 476
-rect 166 308 251 324
-rect 166 274 176 308
-rect 210 288 251 308
-rect 210 274 282 288
-rect 166 258 282 274
-rect 166 225 196 258
-rect 252 225 282 258
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 110 383 144 417
-rect 176 274 210 308
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 308 69 561
-rect 110 417 144 553
-rect 207 513 241 561
-rect 293 757 327 827
-rect 293 545 327 561
-rect 110 367 144 383
-rect 176 308 210 324
-rect 35 274 176 308
-rect 35 171 69 274
-rect 176 258 210 274
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 207 171 241 183
-rect 207 115 241 131
-rect 293 171 327 187
-rect 293 61 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 110 553 144 587
-rect 207 479 241 513
-rect 207 183 241 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 98 587 156 593
-rect 64 553 110 587
-rect 144 553 156 587
-rect 98 547 156 553
-rect 195 513 253 519
-rect 195 479 207 513
-rect 241 479 253 513
-rect 195 473 253 479
-rect 207 223 241 473
-rect 195 217 253 223
-rect 195 183 207 217
-rect 241 183 253 217
-rect 195 177 253 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel viali 127 570 127 570 1 A
-port 1 n
-rlabel metal1 211 358 211 358 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__buf_4.mag b/12T_hs/sky130_osu_sc_12T_hs__buf_4.mag
deleted file mode 100644
index a1a220a..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__buf_4.mag
+++ /dev/null
@@ -1,242 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864448
-<< checkpaint >>
-rect -1209 -1243 1617 2131
-<< nwell >>
-rect -9 485 552 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 225
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 225
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 225
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 507 225
-rect 454 131 465 171
-rect 499 131 507 171
-rect 454 115 507 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 507 773
-rect 454 561 465 757
-rect 499 561 507 757
-rect 454 521 507 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 800
-rect 338 773 368 799
-rect 424 773 454 799
-rect 80 433 110 521
-rect 166 506 196 521
-rect 252 506 282 521
-rect 338 506 368 521
-rect 424 506 454 521
-rect 166 476 454 506
-rect 80 417 154 433
-rect 80 383 110 417
-rect 144 383 154 417
-rect 80 367 154 383
-rect 80 225 110 367
-rect 221 324 251 476
-rect 166 308 251 324
-rect 166 274 176 308
-rect 210 288 251 308
-rect 210 274 454 288
-rect 166 258 454 274
-rect 166 225 196 258
-rect 252 225 282 258
-rect 338 225 368 258
-rect 424 225 454 258
-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 383 144 417
-rect 176 274 210 308
-<< locali >>
-rect 0 867 550 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 550 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 308 69 561
-rect 110 417 144 553
-rect 207 513 241 561
-rect 293 757 327 827
-rect 293 545 327 561
-rect 379 757 413 773
-rect 379 513 413 561
-rect 465 757 499 827
-rect 465 545 499 561
-rect 110 367 144 383
-rect 176 308 210 324
-rect 35 274 176 308
-rect 35 171 69 274
-rect 176 258 210 274
-rect 35 115 69 131
-rect 121 171 155 187
-rect 35 61 69 62
-rect 121 61 155 131
-rect 207 171 241 183
-rect 207 115 241 131
-rect 293 171 327 187
-rect 207 61 241 62
-rect 293 61 327 131
-rect 379 171 413 183
-rect 379 115 413 131
-rect 465 171 499 187
-rect 465 61 499 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 110 553 144 587
-rect 207 479 241 513
-rect 379 479 413 513
-rect 207 183 241 217
-rect 379 183 413 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 550 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 550 867
-rect 0 827 550 833
-rect 98 587 156 593
-rect 64 553 110 587
-rect 144 553 156 587
-rect 98 547 156 553
-rect 195 513 253 519
-rect 367 513 425 519
-rect 195 479 207 513
-rect 241 479 379 513
-rect 413 479 425 513
-rect 195 473 253 479
-rect 367 473 425 479
-rect 207 223 241 473
-rect 379 223 413 473
-rect 195 217 253 223
-rect 367 217 425 223
-rect 195 183 207 217
-rect 241 183 379 217
-rect 413 183 425 217
-rect 195 177 253 183
-rect 367 177 425 183
-rect 0 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel viali 127 570 127 570 1 A
-port 1 n
-rlabel metal1 211 358 211 358 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__buf_6.mag b/12T_hs/sky130_osu_sc_12T_hs__buf_6.mag
deleted file mode 100644
index ade3f28..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__buf_6.mag
+++ /dev/null
@@ -1,284 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1605556927
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 485 728 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-rect 596 115 626 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 225
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 225
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 225
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 225
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 225
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 679 225
-rect 626 131 637 171
-rect 671 131 679 171
-rect 626 115 679 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 679 773
-rect 626 561 637 757
-rect 671 561 679 757
-rect 626 521 679 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 800
-rect 338 773 368 799
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 80 433 110 521
-rect 166 506 196 521
-rect 252 506 282 521
-rect 338 506 368 521
-rect 424 506 454 521
-rect 510 506 540 521
-rect 596 506 626 521
-rect 166 476 626 506
-rect 80 417 154 433
-rect 80 383 110 417
-rect 144 383 154 417
-rect 80 367 154 383
-rect 80 225 110 367
-rect 221 324 251 476
-rect 166 308 251 324
-rect 166 274 176 308
-rect 210 288 251 308
-rect 510 288 540 476
-rect 210 274 626 288
-rect 166 258 626 274
-rect 166 225 196 258
-rect 252 225 282 258
-rect 338 225 368 258
-rect 424 225 454 258
-rect 510 225 540 258
-rect 596 225 626 258
-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 383 144 417
-rect 176 274 210 308
-<< locali >>
-rect 0 861 726 888
-rect 0 827 51 861
-rect 85 827 187 861
-rect 221 827 323 861
-rect 357 827 459 861
-rect 493 827 595 861
-rect 629 827 726 861
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 308 69 561
-rect 110 417 144 553
-rect 207 513 241 561
-rect 293 757 327 827
-rect 293 545 327 561
-rect 379 757 413 773
-rect 379 513 413 561
-rect 465 757 499 827
-rect 465 545 499 561
-rect 551 757 585 773
-rect 551 513 585 561
-rect 637 757 671 827
-rect 637 545 671 561
-rect 110 367 144 383
-rect 176 308 210 324
-rect 35 274 176 308
-rect 35 171 69 274
-rect 176 258 210 274
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 207 171 241 183
-rect 207 115 241 131
-rect 293 171 327 187
-rect 293 61 327 131
-rect 379 171 413 183
-rect 379 115 413 131
-rect 465 171 499 187
-rect 465 61 499 131
-rect 551 171 585 183
-rect 551 115 585 131
-rect 637 171 671 187
-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 553 144 587
-rect 207 479 241 513
-rect 379 479 413 513
-rect 551 479 585 513
-rect 207 183 241 217
-rect 379 183 413 217
-rect 551 183 585 217
-<< metal1 >>
-rect 0 827 726 888
-rect 98 587 156 593
-rect 64 553 110 587
-rect 144 553 156 587
-rect 98 547 156 553
-rect 195 513 253 519
-rect 367 513 425 519
-rect 539 513 597 519
-rect 195 479 207 513
-rect 241 479 379 513
-rect 413 479 551 513
-rect 585 479 597 513
-rect 195 473 253 479
-rect 367 473 425 479
-rect 539 473 597 479
-rect 207 223 241 473
-rect 379 223 413 473
-rect 551 223 585 473
-rect 195 217 253 223
-rect 367 217 425 223
-rect 539 217 597 223
-rect 195 183 207 217
-rect 241 183 379 217
-rect 413 183 551 217
-rect 585 183 597 217
-rect 195 177 253 183
-rect 367 177 425 183
-rect 539 177 597 183
-rect 0 0 726 61
-<< labels >>
-rlabel viali 127 570 127 570 1 A
-port 1 n
-rlabel metal1 211 358 211 358 1 Y
-port 2 n
-rlabel metal1 68 844 68 844 1 vdd
-rlabel metal1 68 44 68 44 1 gnd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__buf_8.mag b/12T_hs/sky130_osu_sc_12T_hs__buf_8.mag
deleted file mode 100644
index 7efabdb..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__buf_8.mag
+++ /dev/null
@@ -1,381 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864448
-<< checkpaint >>
-rect -1209 -1243 2025 2131
-<< nwell >>
-rect -9 485 904 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-rect 768 521 798 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-rect 596 115 626 225
-rect 682 115 712 225
-rect 768 115 798 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 225
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 225
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 225
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 225
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 225
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 225
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 768 225
-rect 712 131 723 171
-rect 757 131 768 171
-rect 712 115 768 131
-rect 798 171 851 225
-rect 798 131 809 171
-rect 843 131 851 171
-rect 798 115 851 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 768 773
-rect 712 561 723 757
-rect 757 561 768 757
-rect 712 521 768 561
-rect 798 757 851 773
-rect 798 561 809 757
-rect 843 561 851 757
-rect 798 521 851 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-rect 809 131 843 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-rect 809 561 843 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 800
-rect 338 773 368 799
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 768 773 798 799
-rect 80 433 110 521
-rect 166 506 196 521
-rect 252 506 282 521
-rect 338 506 368 521
-rect 424 506 454 521
-rect 510 506 540 521
-rect 596 506 626 521
-rect 682 506 712 521
-rect 768 506 798 521
-rect 166 476 798 506
-rect 80 417 154 433
-rect 80 383 110 417
-rect 144 383 154 417
-rect 80 367 154 383
-rect 80 225 110 367
-rect 221 324 251 476
-rect 166 308 251 324
-rect 166 274 176 308
-rect 210 288 251 308
-rect 510 288 540 476
-rect 210 274 798 288
-rect 166 258 798 274
-rect 166 225 196 258
-rect 252 225 282 258
-rect 338 225 368 258
-rect 424 225 454 258
-rect 510 225 540 258
-rect 596 225 626 258
-rect 682 225 712 258
-rect 768 225 798 258
-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 383 144 417
-rect 176 274 210 308
-<< locali >>
-rect 0 867 902 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 902 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 308 69 561
-rect 110 417 144 553
-rect 207 513 241 561
-rect 293 757 327 827
-rect 293 545 327 561
-rect 379 757 413 773
-rect 379 513 413 561
-rect 465 757 499 827
-rect 465 545 499 561
-rect 551 757 585 773
-rect 551 513 585 561
-rect 637 757 671 827
-rect 637 545 671 561
-rect 723 757 757 773
-rect 723 513 757 561
-rect 809 757 843 827
-rect 809 545 843 561
-rect 110 367 144 383
-rect 176 308 210 324
-rect 35 274 176 308
-rect 35 171 69 274
-rect 176 258 210 274
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 207 171 241 183
-rect 207 115 241 131
-rect 293 171 327 187
-rect 293 61 327 131
-rect 379 171 413 183
-rect 379 115 413 131
-rect 465 171 499 187
-rect 465 61 499 131
-rect 551 171 585 183
-rect 551 115 585 131
-rect 637 171 671 187
-rect 637 61 671 131
-rect 723 171 757 183
-rect 723 115 757 131
-rect 809 171 843 187
-rect 809 61 843 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 902 61
-rect 0 0 902 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 110 553 144 587
-rect 207 479 241 513
-rect 379 479 413 513
-rect 551 479 585 513
-rect 723 479 757 513
-rect 207 183 241 217
-rect 379 183 413 217
-rect 551 183 585 217
-rect 723 183 757 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 867 902 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 902 867
-rect 0 827 902 833
-rect 98 587 156 593
-rect 64 553 110 587
-rect 144 553 156 587
-rect 98 547 156 553
-rect 195 513 253 519
-rect 367 513 425 519
-rect 539 513 597 519
-rect 711 513 769 519
-rect 195 479 207 513
-rect 241 479 379 513
-rect 413 479 551 513
-rect 585 479 723 513
-rect 757 479 769 513
-rect 195 473 253 479
-rect 367 473 425 479
-rect 539 473 597 479
-rect 711 473 769 479
-rect 207 223 241 473
-rect 379 223 413 473
-rect 551 223 585 473
-rect 723 223 757 473
-rect 195 217 253 223
-rect 367 217 425 223
-rect 539 217 597 223
-rect 711 217 769 223
-rect 195 183 207 217
-rect 241 183 379 217
-rect 413 183 551 217
-rect 585 183 723 217
-rect 757 183 769 217
-rect 195 177 253 183
-rect 367 177 425 183
-rect 539 177 597 183
-rect 711 177 769 183
-rect 0 55 902 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 902 55
-rect 0 0 902 21
-<< labels >>
-rlabel viali 127 570 127 570 1 A
-port 1 n
-rlabel metal1 211 358 211 358 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__buf_l.mag b/12T_hs/sky130_osu_sc_12T_hs__buf_l.mag
deleted file mode 100644
index 9dbc45f..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__buf_l.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864448
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 288 897
-<< pmos >>
-rect 80 605 110 773
-rect 166 605 196 773
-<< nmoslvt >>
-rect 80 115 110 199
-rect 166 115 196 199
-<< ndiff >>
-rect 27 165 80 199
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 166 199
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 165 249 199
-rect 196 131 207 165
-rect 241 131 249 165
-rect 196 115 249 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 605 80 621
-rect 110 757 166 773
-rect 110 621 121 757
-rect 155 621 166 757
-rect 110 605 166 621
-rect 196 757 249 773
-rect 196 621 207 757
-rect 241 621 249 757
-rect 196 605 249 621
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-rect 207 131 241 165
-<< pdiffc >>
-rect 35 621 69 757
-rect 121 621 155 757
-rect 207 621 241 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 80 507 110 605
-rect 166 580 196 605
-rect 166 550 251 580
-rect 80 491 154 507
-rect 80 457 110 491
-rect 144 457 154 491
-rect 80 441 154 457
-rect 80 199 110 441
-rect 221 398 251 550
-rect 166 382 251 398
-rect 166 348 176 382
-rect 210 348 251 382
-rect 166 332 251 348
-rect 166 199 196 332
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 110 457 144 491
-rect 176 348 210 382
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 773
-rect 35 382 69 621
-rect 121 757 155 827
-rect 121 605 155 621
-rect 207 757 241 773
-rect 207 587 241 621
-rect 110 441 144 457
-rect 176 382 210 398
-rect 35 348 176 382
-rect 35 165 69 348
-rect 176 332 210 348
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 207 165 241 257
-rect 207 115 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 207 553 241 587
-rect 110 491 144 513
-rect 110 479 144 491
-rect 207 257 241 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 195 587 253 593
-rect 195 553 207 587
-rect 241 553 253 587
-rect 195 547 253 553
-rect 98 513 156 519
-rect 64 479 110 513
-rect 144 479 156 513
-rect 98 473 156 479
-rect 207 297 241 547
-rect 195 291 253 297
-rect 195 257 207 291
-rect 241 257 253 291
-rect 195 251 253 257
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 214 430 214 430 1 Y
-port 2 n
-rlabel viali 127 496 127 496 1 A
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__decap_1.mag b/12T_hs/sky130_osu_sc_12T_hs__decap_1.mag
deleted file mode 100644
index 19e4bb1..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__decap_1.mag
+++ /dev/null
@@ -1,83 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864449
-<< checkpaint >>
-rect -1209 -1243 1345 2131
-<< nwell >>
-rect -9 365 199 897
-<< pmos >>
-rect 80 601 110 773
-<< nmoslvt >>
-rect 80 115 110 263
-<< ndiff >>
-rect 27 200 80 263
-rect 27 131 35 200
-rect 69 131 80 200
-rect 27 115 80 131
-rect 110 200 163 263
-rect 110 131 121 200
-rect 155 131 163 200
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 601 80 621
-rect 110 757 163 773
-rect 110 621 121 757
-rect 155 621 163 757
-rect 110 601 163 621
-<< ndiffc >>
-rect 35 131 69 200
-rect 121 131 155 200
-<< pdiffc >>
-rect 35 621 69 757
-rect 121 621 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 263 110 601
-rect 80 80 110 115
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 827
-rect 35 605 69 621
-rect 121 757 155 827
-rect 121 605 155 621
-rect 35 200 69 216
-rect 35 61 69 131
-rect 121 200 155 216
-rect 121 61 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__decap_l.mag b/12T_hs/sky130_osu_sc_12T_hs__decap_l.mag
deleted file mode 100644
index 326755d..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__decap_l.mag
+++ /dev/null
@@ -1,83 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864449
-<< checkpaint >>
-rect -1209 -1243 1345 2131
-<< nwell >>
-rect -9 365 199 897
-<< pmos >>
-rect 80 673 110 773
-<< nmoslvt >>
-rect 80 115 110 225
-<< ndiff >>
-rect 27 191 80 225
-rect 27 131 35 191
-rect 69 131 80 191
-rect 27 115 80 131
-rect 110 191 163 225
-rect 110 131 121 191
-rect 155 131 163 191
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 689 35 757
-rect 69 689 80 757
-rect 27 673 80 689
-rect 110 757 163 773
-rect 110 689 121 757
-rect 155 689 163 757
-rect 110 673 163 689
-<< ndiffc >>
-rect 35 131 69 191
-rect 121 131 155 191
-<< pdiffc >>
-rect 35 689 69 757
-rect 121 689 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 225 110 673
-rect 80 80 110 115
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 827
-rect 35 673 69 689
-rect 121 757 155 827
-rect 121 673 155 689
-rect 35 191 69 207
-rect 35 61 69 131
-rect 121 191 155 207
-rect 121 61 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__dff_1.mag b/12T_hs/sky130_osu_sc_12T_hs__dff_1.mag
deleted file mode 100644
index e6a216d..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__dff_1.mag
+++ /dev/null
@@ -1,659 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864449
-<< checkpaint >>
-rect -1209 -1243 2569 2131
-<< nwell >>
-rect -9 485 1456 897
-<< pmos >>
-rect 85 521 115 773
-rect 171 521 201 773
-rect 243 521 273 773
-rect 363 521 393 773
-rect 435 521 465 773
-rect 521 521 551 773
-rect 593 521 623 773
-rect 713 521 743 773
-rect 785 521 815 773
-rect 871 521 901 773
-rect 1061 521 1091 773
-rect 1251 521 1281 773
-rect 1337 521 1367 773
-<< nmoslvt >>
-rect 85 115 115 225
-rect 171 115 201 225
-rect 243 115 273 225
-rect 363 115 393 225
-rect 435 115 465 225
-rect 521 115 551 225
-rect 593 115 623 225
-rect 713 115 743 225
-rect 785 115 815 225
-rect 871 115 901 225
-rect 1061 115 1091 225
-rect 1251 115 1281 225
-rect 1337 115 1367 225
-<< ndiff >>
-rect 32 171 85 225
-rect 32 131 40 171
-rect 74 131 85 171
-rect 32 115 85 131
-rect 115 171 171 225
-rect 115 131 126 171
-rect 160 131 171 171
-rect 115 115 171 131
-rect 201 115 243 225
-rect 273 171 363 225
-rect 273 131 284 171
-rect 352 131 363 171
-rect 273 115 363 131
-rect 393 115 435 225
-rect 465 165 521 225
-rect 465 131 476 165
-rect 510 131 521 165
-rect 465 115 521 131
-rect 551 115 593 225
-rect 623 171 713 225
-rect 623 131 634 171
-rect 702 131 713 171
-rect 623 115 713 131
-rect 743 115 785 225
-rect 815 171 871 225
-rect 815 131 826 171
-rect 860 131 871 171
-rect 815 115 871 131
-rect 901 171 954 225
-rect 901 131 912 171
-rect 946 131 954 171
-rect 901 115 954 131
-rect 1008 171 1061 225
-rect 1008 131 1016 171
-rect 1050 131 1061 171
-rect 1008 115 1061 131
-rect 1091 171 1144 225
-rect 1091 131 1102 171
-rect 1136 131 1144 171
-rect 1091 115 1144 131
-rect 1198 165 1251 225
-rect 1198 131 1206 165
-rect 1240 131 1251 165
-rect 1198 115 1251 131
-rect 1281 165 1337 225
-rect 1281 131 1292 165
-rect 1326 131 1337 165
-rect 1281 115 1337 131
-rect 1367 165 1420 225
-rect 1367 131 1378 165
-rect 1412 131 1420 165
-rect 1367 115 1420 131
-<< pdiff >>
-rect 32 757 85 773
-rect 32 561 40 757
-rect 74 561 85 757
-rect 32 521 85 561
-rect 115 757 171 773
-rect 115 629 126 757
-rect 160 629 171 757
-rect 115 521 171 629
-rect 201 521 243 773
-rect 273 757 363 773
-rect 273 561 284 757
-rect 352 561 363 757
-rect 273 521 363 561
-rect 393 521 435 773
-rect 465 757 521 773
-rect 465 629 476 757
-rect 510 629 521 757
-rect 465 521 521 629
-rect 551 521 593 773
-rect 623 757 713 773
-rect 623 629 634 757
-rect 702 629 713 757
-rect 623 521 713 629
-rect 743 521 785 773
-rect 815 757 871 773
-rect 815 595 826 757
-rect 860 595 871 757
-rect 815 521 871 595
-rect 901 757 954 773
-rect 901 561 912 757
-rect 946 561 954 757
-rect 901 521 954 561
-rect 1008 757 1061 773
-rect 1008 629 1016 757
-rect 1050 629 1061 757
-rect 1008 521 1061 629
-rect 1091 757 1144 773
-rect 1091 561 1102 757
-rect 1136 561 1144 757
-rect 1091 521 1144 561
-rect 1198 757 1251 773
-rect 1198 689 1206 757
-rect 1240 689 1251 757
-rect 1198 521 1251 689
-rect 1281 757 1337 773
-rect 1281 689 1292 757
-rect 1326 689 1337 757
-rect 1281 521 1337 689
-rect 1367 757 1420 773
-rect 1367 689 1378 757
-rect 1412 689 1420 757
-rect 1367 521 1420 689
-<< ndiffc >>
-rect 40 131 74 171
-rect 126 131 160 171
-rect 284 131 352 171
-rect 476 131 510 165
-rect 634 131 702 171
-rect 826 131 860 171
-rect 912 131 946 171
-rect 1016 131 1050 171
-rect 1102 131 1136 171
-rect 1206 131 1240 165
-rect 1292 131 1326 165
-rect 1378 131 1412 165
-<< pdiffc >>
-rect 40 561 74 757
-rect 126 629 160 757
-rect 284 561 352 757
-rect 476 629 510 757
-rect 634 629 702 757
-rect 826 595 860 757
-rect 912 561 946 757
-rect 1016 629 1050 757
-rect 1102 561 1136 757
-rect 1206 689 1240 757
-rect 1292 689 1326 757
-rect 1378 689 1412 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-rect 979 827 1003 861
-rect 1037 827 1061 861
-rect 1115 827 1139 861
-rect 1173 827 1197 861
-rect 1251 827 1275 861
-rect 1309 827 1333 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-rect 1003 827 1037 861
-rect 1139 827 1173 861
-rect 1275 827 1309 861
-<< poly >>
-rect 85 773 115 799
-rect 171 773 201 799
-rect 243 773 273 799
-rect 363 773 393 799
-rect 435 773 465 799
-rect 521 773 551 799
-rect 593 773 623 799
-rect 713 773 743 799
-rect 785 773 815 799
-rect 871 773 901 799
-rect 1061 773 1091 799
-rect 1251 773 1281 799
-rect 1337 773 1367 799
-rect 85 490 115 521
-rect 75 474 129 490
-rect 75 440 85 474
-rect 119 440 129 474
-rect 75 424 129 440
-rect 75 278 105 424
-rect 171 381 201 521
-rect 243 490 273 521
-rect 243 474 309 490
-rect 243 440 259 474
-rect 293 440 309 474
-rect 243 430 309 440
-rect 363 385 393 521
-rect 435 484 465 521
-rect 521 484 551 521
-rect 435 474 551 484
-rect 435 440 467 474
-rect 501 440 551 474
-rect 435 430 551 440
-rect 593 385 623 521
-rect 713 490 743 521
-rect 677 474 743 490
-rect 677 440 693 474
-rect 727 440 743 474
-rect 677 430 743 440
-rect 171 365 225 381
-rect 171 331 181 365
-rect 215 331 225 365
-rect 171 315 225 331
-rect 267 365 743 385
-rect 267 355 699 365
-rect 75 248 115 278
-rect 85 225 115 248
-rect 171 225 201 315
-rect 267 271 297 355
-rect 689 331 699 355
-rect 733 331 743 365
-rect 689 315 743 331
-rect 243 241 297 271
-rect 339 297 393 313
-rect 339 263 349 297
-rect 383 263 393 297
-rect 339 247 393 263
-rect 243 225 273 241
-rect 363 225 393 247
-rect 435 297 551 307
-rect 435 263 467 297
-rect 501 263 551 297
-rect 435 253 551 263
-rect 435 225 465 253
-rect 521 225 551 253
-rect 593 297 647 313
-rect 593 263 603 297
-rect 637 263 647 297
-rect 593 247 647 263
-rect 593 225 623 247
-rect 713 225 743 315
-rect 785 381 815 521
-rect 871 490 901 521
-rect 871 474 942 490
-rect 871 460 898 474
-rect 882 440 898 460
-rect 932 440 942 474
-rect 882 424 942 440
-rect 785 365 839 381
-rect 785 331 795 365
-rect 829 331 839 365
-rect 785 315 839 331
-rect 785 225 815 315
-rect 882 271 912 424
-rect 1061 313 1091 521
-rect 1251 498 1281 521
-rect 1241 472 1281 498
-rect 1241 381 1271 472
-rect 1337 436 1367 521
-rect 1216 365 1271 381
-rect 1313 420 1367 436
-rect 1313 386 1323 420
-rect 1357 386 1367 420
-rect 1313 370 1367 386
-rect 1216 331 1226 365
-rect 1260 331 1271 365
-rect 1216 315 1271 331
-rect 871 241 912 271
-rect 1008 297 1091 313
-rect 1240 308 1271 315
-rect 1008 263 1018 297
-rect 1052 263 1091 297
-rect 1008 247 1091 263
-rect 1241 284 1271 308
-rect 1241 254 1281 284
-rect 871 225 901 241
-rect 1061 225 1091 247
-rect 1251 225 1281 254
-rect 1337 225 1367 370
-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 440 119 474
-rect 259 440 293 474
-rect 467 440 501 474
-rect 693 440 727 474
-rect 181 331 215 365
-rect 699 331 733 365
-rect 349 263 383 297
-rect 467 263 501 297
-rect 603 263 637 297
-rect 898 440 932 474
-rect 795 331 829 365
-rect 1323 386 1357 420
-rect 1226 331 1260 365
-rect 1018 263 1052 297
-<< locali >>
-rect 0 867 1452 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 1003 867
-rect 1037 827 1139 867
-rect 1173 827 1275 867
-rect 1309 827 1452 867
-rect 40 757 74 773
-rect 17 561 40 573
-rect 126 757 160 827
-rect 126 613 160 629
-rect 284 757 352 773
-rect 17 539 74 561
-rect 476 757 510 827
-rect 476 613 510 629
-rect 634 757 702 773
-rect 352 561 355 579
-rect 284 558 355 561
-rect 634 558 702 629
-rect 17 291 51 539
-rect 108 524 355 558
-rect 535 524 702 558
-rect 826 757 860 827
-rect 826 549 860 595
-rect 912 757 946 773
-rect 1016 757 1050 827
-rect 1016 613 1050 629
-rect 1102 757 1136 773
-rect 912 558 946 561
-rect 912 524 1000 558
-rect 108 490 142 524
-rect 85 474 142 490
-rect 119 440 142 474
-rect 85 424 142 440
-rect 259 474 293 490
-rect 259 439 293 440
-rect 467 474 501 490
-rect 17 257 40 291
-rect 17 236 74 257
-rect 108 274 142 424
-rect 287 405 383 439
-rect 181 365 215 381
-rect 181 315 215 331
-rect 349 297 383 405
-rect 108 240 315 274
-rect 467 297 501 440
-rect 349 247 383 263
-rect 483 257 501 263
-rect 535 291 569 524
-rect 693 474 727 490
-rect 693 439 727 440
-rect 829 479 830 513
-rect 603 405 699 439
-rect 603 297 637 405
-rect 795 365 830 479
-rect 898 474 932 490
-rect 898 439 932 440
-rect 966 371 1000 524
-rect 683 331 699 365
-rect 733 331 749 365
-rect 829 345 830 365
-rect 795 315 829 331
-rect 946 331 1000 371
-rect 1102 365 1136 561
-rect 1206 757 1240 773
-rect 1206 439 1240 689
-rect 1292 757 1326 827
-rect 1292 673 1326 689
-rect 1378 757 1412 773
-rect 1378 635 1412 689
-rect 1377 576 1412 635
-rect 1377 513 1411 576
-rect 1411 479 1435 513
-rect 1240 420 1357 439
-rect 1240 405 1323 420
-rect 1102 331 1226 365
-rect 1260 331 1276 365
-rect 1323 349 1357 386
-rect 467 247 501 257
-rect 603 247 637 263
-rect 671 285 705 291
-rect 40 171 74 236
-rect 281 187 315 240
-rect 671 207 705 251
-rect 40 115 74 131
-rect 126 171 160 187
-rect 281 171 352 187
-rect 281 153 284 171
-rect 126 61 160 131
-rect 284 115 352 131
-rect 476 165 510 181
-rect 476 61 510 131
-rect 634 171 705 207
-rect 702 131 705 171
-rect 634 115 705 131
-rect 826 171 860 187
-rect 826 61 860 131
-rect 912 171 946 331
-rect 1002 263 1018 297
-rect 1052 263 1068 297
-rect 912 115 946 131
-rect 1016 171 1050 187
-rect 1016 61 1050 131
-rect 1102 171 1136 331
-rect 1323 297 1358 349
-rect 1102 115 1136 131
-rect 1206 263 1358 297
-rect 1206 165 1240 263
-rect 1401 231 1435 479
-rect 1378 197 1435 231
-rect 1206 115 1240 131
-rect 1292 165 1326 181
-rect 1292 61 1326 131
-rect 1378 165 1412 197
-rect 1378 115 1412 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 1003 861 1037 867
-rect 1003 833 1037 861
-rect 1139 861 1173 867
-rect 1139 833 1173 861
-rect 1275 861 1309 867
-rect 1275 833 1309 861
-rect 40 257 74 291
-rect 253 405 287 439
-rect 181 331 215 365
-rect 449 263 467 291
-rect 467 263 483 291
-rect 449 257 483 263
-rect 795 479 829 513
-rect 535 257 569 291
-rect 699 405 733 439
-rect 898 405 932 439
-rect 699 331 733 365
-rect 912 331 946 365
-rect 1377 479 1411 513
-rect 1206 405 1240 439
-rect 1226 331 1260 365
-rect 671 251 705 285
-rect 1018 263 1052 291
-rect 1018 257 1052 263
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 867 1452 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 1003 867
-rect 1037 833 1139 867
-rect 1173 833 1275 867
-rect 1309 833 1452 867
-rect 0 827 1452 833
-rect 783 513 841 519
-rect 1365 513 1424 519
-rect 783 479 795 513
-rect 829 479 1016 513
-rect 1344 479 1377 513
-rect 1411 479 1424 513
-rect 783 473 841 479
-rect 241 439 299 445
-rect 687 439 745 445
-rect 886 439 944 445
-rect 241 405 253 439
-rect 287 405 699 439
-rect 733 405 898 439
-rect 932 405 944 439
-rect 241 399 299 405
-rect 687 399 745 405
-rect 886 399 944 405
-rect 169 365 227 371
-rect 687 365 745 371
-rect 169 331 181 365
-rect 215 331 249 365
-rect 683 331 699 365
-rect 733 359 745 365
-rect 900 365 958 371
-rect 900 359 912 365
-rect 733 331 912 359
-rect 946 331 958 365
-rect 987 365 1016 479
-rect 1365 473 1424 479
-rect 1194 439 1252 445
-rect 1194 438 1206 439
-rect 1173 405 1206 438
-rect 1240 405 1252 439
-rect 1173 404 1252 405
-rect 1194 399 1252 404
-rect 1216 365 1272 371
-rect 987 331 1226 365
-rect 1260 331 1272 365
-rect 169 325 227 331
-rect 687 325 745 331
-rect 900 325 958 331
-rect 1216 325 1272 331
-rect 28 291 86 297
-rect 437 291 495 297
-rect 28 257 40 291
-rect 74 257 449 291
-rect 483 257 495 291
-rect 28 251 86 257
-rect 437 251 495 257
-rect 523 291 581 297
-rect 1006 291 1064 297
-rect 523 257 535 291
-rect 569 285 1018 291
-rect 569 257 671 285
-rect 523 251 581 257
-rect 659 251 671 257
-rect 705 257 1018 285
-rect 1052 257 1064 291
-rect 705 251 717 257
-rect 1006 251 1064 257
-rect 665 245 711 251
-rect 0 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel viali 198 348 198 348 1 D
-port 1 n
-rlabel viali 915 422 915 422 1 CK
-port 4 n
-rlabel viali 1223 422 1223 422 1 ON
-rlabel viali 1394 496 1394 496 1 Q
-rlabel viali 68 49 68 49 1 gnd
-rlabel viali 68 841 68 841 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__dff_l.mag b/12T_hs/sky130_osu_sc_12T_hs__dff_l.mag
deleted file mode 100644
index 67e914d..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__dff_l.mag
+++ /dev/null
@@ -1,660 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864449
-<< checkpaint >>
-rect -1209 -1243 2569 2131
-<< nwell >>
-rect -9 485 1456 897
-<< pmos >>
-rect 85 521 115 773
-rect 171 521 201 773
-rect 243 521 273 773
-rect 363 521 393 773
-rect 435 521 465 773
-rect 521 521 551 773
-rect 593 521 623 773
-rect 713 521 743 773
-rect 785 521 815 773
-rect 871 521 901 773
-rect 1061 521 1091 773
-rect 1251 605 1281 773
-rect 1337 605 1367 773
-<< nmoslvt >>
-rect 85 115 115 225
-rect 171 115 201 225
-rect 243 115 273 225
-rect 363 115 393 225
-rect 435 115 465 225
-rect 521 115 551 225
-rect 593 115 623 225
-rect 713 115 743 225
-rect 785 115 815 225
-rect 871 115 901 225
-rect 1061 115 1091 225
-rect 1251 115 1281 199
-rect 1337 115 1367 199
-<< ndiff >>
-rect 32 171 85 225
-rect 32 131 40 171
-rect 74 131 85 171
-rect 32 115 85 131
-rect 115 171 171 225
-rect 115 131 126 171
-rect 160 131 171 171
-rect 115 115 171 131
-rect 201 115 243 225
-rect 273 171 363 225
-rect 273 131 284 171
-rect 352 131 363 171
-rect 273 115 363 131
-rect 393 115 435 225
-rect 465 165 521 225
-rect 465 131 476 165
-rect 510 131 521 165
-rect 465 115 521 131
-rect 551 115 593 225
-rect 623 171 713 225
-rect 623 131 634 171
-rect 702 131 713 171
-rect 623 115 713 131
-rect 743 115 785 225
-rect 815 171 871 225
-rect 815 131 826 171
-rect 860 131 871 171
-rect 815 115 871 131
-rect 901 171 954 225
-rect 901 131 912 171
-rect 946 131 954 171
-rect 901 115 954 131
-rect 1008 171 1061 225
-rect 1008 131 1016 171
-rect 1050 131 1061 171
-rect 1008 115 1061 131
-rect 1091 171 1144 225
-rect 1091 131 1102 171
-rect 1136 131 1144 171
-rect 1091 115 1144 131
-rect 1198 165 1251 199
-rect 1198 131 1206 165
-rect 1240 131 1251 165
-rect 1198 115 1251 131
-rect 1281 165 1337 199
-rect 1281 131 1292 165
-rect 1326 131 1337 165
-rect 1281 115 1337 131
-rect 1367 165 1420 199
-rect 1367 131 1378 165
-rect 1412 131 1420 165
-rect 1367 115 1420 131
-<< pdiff >>
-rect 32 757 85 773
-rect 32 561 40 757
-rect 74 561 85 757
-rect 32 521 85 561
-rect 115 757 171 773
-rect 115 629 126 757
-rect 160 629 171 757
-rect 115 521 171 629
-rect 201 521 243 773
-rect 273 757 363 773
-rect 273 561 284 757
-rect 352 561 363 757
-rect 273 521 363 561
-rect 393 521 435 773
-rect 465 757 521 773
-rect 465 629 476 757
-rect 510 629 521 757
-rect 465 521 521 629
-rect 551 521 593 773
-rect 623 757 713 773
-rect 623 629 634 757
-rect 702 629 713 757
-rect 623 521 713 629
-rect 743 521 785 773
-rect 815 757 871 773
-rect 815 595 826 757
-rect 860 595 871 757
-rect 815 521 871 595
-rect 901 757 954 773
-rect 901 561 912 757
-rect 946 561 954 757
-rect 901 521 954 561
-rect 1008 757 1061 773
-rect 1008 629 1016 757
-rect 1050 629 1061 757
-rect 1008 521 1061 629
-rect 1091 757 1144 773
-rect 1091 561 1102 757
-rect 1136 561 1144 757
-rect 1198 757 1251 773
-rect 1198 689 1206 757
-rect 1240 689 1251 757
-rect 1198 605 1251 689
-rect 1281 757 1337 773
-rect 1281 689 1292 757
-rect 1326 689 1337 757
-rect 1281 605 1337 689
-rect 1367 757 1420 773
-rect 1367 689 1378 757
-rect 1412 689 1420 757
-rect 1367 605 1420 689
-rect 1091 521 1144 561
-<< ndiffc >>
-rect 40 131 74 171
-rect 126 131 160 171
-rect 284 131 352 171
-rect 476 131 510 165
-rect 634 131 702 171
-rect 826 131 860 171
-rect 912 131 946 171
-rect 1016 131 1050 171
-rect 1102 131 1136 171
-rect 1206 131 1240 165
-rect 1292 131 1326 165
-rect 1378 131 1412 165
-<< pdiffc >>
-rect 40 561 74 757
-rect 126 629 160 757
-rect 284 561 352 757
-rect 476 629 510 757
-rect 634 629 702 757
-rect 826 595 860 757
-rect 912 561 946 757
-rect 1016 629 1050 757
-rect 1102 561 1136 757
-rect 1206 689 1240 757
-rect 1292 689 1326 757
-rect 1378 689 1412 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-rect 979 827 1003 861
-rect 1037 827 1061 861
-rect 1115 827 1139 861
-rect 1173 827 1197 861
-rect 1251 827 1275 861
-rect 1309 827 1333 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-rect 1003 827 1037 861
-rect 1139 827 1173 861
-rect 1275 827 1309 861
-<< poly >>
-rect 85 773 115 799
-rect 171 773 201 799
-rect 243 773 273 799
-rect 363 773 393 799
-rect 435 773 465 799
-rect 521 773 551 799
-rect 593 773 623 799
-rect 713 773 743 799
-rect 785 773 815 799
-rect 871 773 901 799
-rect 1061 773 1091 799
-rect 1251 773 1281 799
-rect 1337 773 1367 799
-rect 1251 525 1281 605
-rect 85 490 115 521
-rect 75 474 129 490
-rect 75 440 85 474
-rect 119 440 129 474
-rect 75 424 129 440
-rect 75 278 105 424
-rect 171 381 201 521
-rect 243 490 273 521
-rect 243 474 309 490
-rect 243 440 259 474
-rect 293 440 309 474
-rect 243 430 309 440
-rect 363 385 393 521
-rect 435 484 465 521
-rect 521 484 551 521
-rect 435 474 551 484
-rect 435 440 467 474
-rect 501 440 551 474
-rect 435 430 551 440
-rect 593 385 623 521
-rect 713 490 743 521
-rect 677 474 743 490
-rect 677 440 693 474
-rect 727 440 743 474
-rect 677 430 743 440
-rect 171 365 225 381
-rect 171 331 181 365
-rect 215 331 225 365
-rect 171 315 225 331
-rect 267 365 743 385
-rect 267 355 699 365
-rect 75 248 115 278
-rect 85 225 115 248
-rect 171 225 201 315
-rect 267 271 297 355
-rect 689 331 699 355
-rect 733 331 743 365
-rect 689 315 743 331
-rect 243 241 297 271
-rect 339 297 393 313
-rect 339 263 349 297
-rect 383 263 393 297
-rect 339 247 393 263
-rect 243 225 273 241
-rect 363 225 393 247
-rect 435 297 551 307
-rect 435 263 467 297
-rect 501 263 551 297
-rect 435 253 551 263
-rect 435 225 465 253
-rect 521 225 551 253
-rect 593 297 647 313
-rect 593 263 603 297
-rect 637 263 647 297
-rect 593 247 647 263
-rect 593 225 623 247
-rect 713 225 743 315
-rect 785 381 815 521
-rect 871 490 901 521
-rect 871 474 942 490
-rect 871 460 898 474
-rect 882 440 898 460
-rect 932 440 942 474
-rect 882 424 942 440
-rect 785 365 839 381
-rect 785 331 795 365
-rect 829 331 839 365
-rect 785 315 839 331
-rect 785 225 815 315
-rect 882 271 912 424
-rect 1061 313 1091 521
-rect 1241 495 1281 525
-rect 1241 381 1271 495
-rect 1337 436 1367 605
-rect 1216 365 1271 381
-rect 1313 420 1367 436
-rect 1313 386 1323 420
-rect 1357 386 1367 420
-rect 1313 370 1367 386
-rect 1216 331 1226 365
-rect 1260 331 1271 365
-rect 1216 315 1271 331
-rect 871 241 912 271
-rect 1008 297 1091 313
-rect 1240 308 1271 315
-rect 1008 263 1018 297
-rect 1052 263 1091 297
-rect 1008 247 1091 263
-rect 1241 284 1271 308
-rect 1241 254 1281 284
-rect 871 225 901 241
-rect 1061 225 1091 247
-rect 1251 199 1281 254
-rect 1337 199 1367 370
-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 440 119 474
-rect 259 440 293 474
-rect 467 440 501 474
-rect 693 440 727 474
-rect 181 331 215 365
-rect 699 331 733 365
-rect 349 263 383 297
-rect 467 263 501 297
-rect 603 263 637 297
-rect 898 440 932 474
-rect 795 331 829 365
-rect 1323 386 1357 420
-rect 1226 331 1260 365
-rect 1018 263 1052 297
-<< locali >>
-rect 0 867 1452 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 1003 867
-rect 1037 827 1139 867
-rect 1173 827 1275 867
-rect 1309 827 1452 867
-rect 40 757 74 773
-rect 17 561 40 573
-rect 126 757 160 827
-rect 126 613 160 629
-rect 284 757 352 773
-rect 17 539 74 561
-rect 476 757 510 827
-rect 476 613 510 629
-rect 634 757 702 773
-rect 352 561 355 579
-rect 284 558 355 561
-rect 634 558 702 629
-rect 17 291 51 539
-rect 108 524 355 558
-rect 535 524 702 558
-rect 826 757 860 827
-rect 826 549 860 595
-rect 912 757 946 773
-rect 1016 757 1050 827
-rect 1016 613 1050 629
-rect 1102 757 1136 773
-rect 912 558 946 561
-rect 912 524 1000 558
-rect 108 490 142 524
-rect 85 474 142 490
-rect 119 440 142 474
-rect 85 424 142 440
-rect 259 474 293 490
-rect 259 439 293 440
-rect 467 474 501 490
-rect 17 257 40 291
-rect 17 236 74 257
-rect 108 274 142 424
-rect 287 405 383 439
-rect 181 365 215 381
-rect 181 315 215 331
-rect 349 297 383 405
-rect 108 240 315 274
-rect 467 297 501 440
-rect 349 247 383 263
-rect 483 257 501 263
-rect 535 291 569 524
-rect 693 474 727 490
-rect 693 439 727 440
-rect 829 479 830 513
-rect 603 405 699 439
-rect 603 297 637 405
-rect 795 365 830 479
-rect 898 474 932 490
-rect 898 439 932 440
-rect 966 371 1000 524
-rect 683 331 699 365
-rect 733 331 749 365
-rect 829 345 830 365
-rect 912 365 1000 371
-rect 795 315 829 331
-rect 946 331 1000 365
-rect 1102 365 1136 561
-rect 1206 757 1240 773
-rect 1206 439 1240 689
-rect 1292 757 1326 827
-rect 1292 673 1326 689
-rect 1378 757 1412 773
-rect 1378 635 1412 689
-rect 1377 576 1412 635
-rect 1377 513 1411 576
-rect 1411 479 1435 513
-rect 1240 420 1357 439
-rect 1240 405 1323 420
-rect 1102 331 1226 365
-rect 1260 331 1276 365
-rect 1323 349 1357 386
-rect 467 247 501 257
-rect 603 247 637 263
-rect 671 285 705 291
-rect 40 171 74 236
-rect 281 187 315 240
-rect 671 207 705 251
-rect 40 115 74 131
-rect 126 171 160 187
-rect 281 171 352 187
-rect 281 153 284 171
-rect 126 61 160 131
-rect 284 115 352 131
-rect 476 165 510 181
-rect 476 61 510 131
-rect 634 171 705 207
-rect 702 131 705 171
-rect 634 115 705 131
-rect 826 171 860 187
-rect 826 61 860 131
-rect 912 171 946 331
-rect 1002 263 1018 297
-rect 1052 263 1068 297
-rect 912 115 946 131
-rect 1016 171 1050 187
-rect 1016 61 1050 131
-rect 1102 171 1136 331
-rect 1323 297 1358 349
-rect 1102 115 1136 131
-rect 1206 263 1358 297
-rect 1206 165 1240 263
-rect 1401 231 1435 479
-rect 1378 197 1435 231
-rect 1206 115 1240 131
-rect 1292 165 1326 181
-rect 1292 61 1326 131
-rect 1378 165 1412 197
-rect 1378 115 1412 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 1003 861 1037 867
-rect 1003 833 1037 861
-rect 1139 861 1173 867
-rect 1139 833 1173 861
-rect 1275 861 1309 867
-rect 1275 833 1309 861
-rect 40 257 74 291
-rect 253 405 287 439
-rect 181 331 215 365
-rect 449 263 467 291
-rect 467 263 483 291
-rect 449 257 483 263
-rect 795 479 829 513
-rect 535 257 569 291
-rect 699 405 733 439
-rect 898 405 932 439
-rect 699 331 733 365
-rect 912 331 946 365
-rect 1377 479 1411 513
-rect 1206 405 1240 439
-rect 1226 331 1260 365
-rect 671 251 705 285
-rect 1018 263 1052 291
-rect 1018 257 1052 263
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 867 1452 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 1003 867
-rect 1037 833 1139 867
-rect 1173 833 1275 867
-rect 1309 833 1452 867
-rect 0 827 1452 833
-rect 783 513 841 519
-rect 1365 513 1424 519
-rect 783 479 795 513
-rect 829 479 1016 513
-rect 1344 479 1377 513
-rect 1411 479 1424 513
-rect 783 473 841 479
-rect 241 439 299 445
-rect 687 439 745 445
-rect 886 439 944 445
-rect 241 405 253 439
-rect 287 405 699 439
-rect 733 405 898 439
-rect 932 405 944 439
-rect 241 399 299 405
-rect 687 399 745 405
-rect 886 399 944 405
-rect 169 365 227 371
-rect 687 365 745 371
-rect 169 331 181 365
-rect 215 331 249 365
-rect 683 331 699 365
-rect 733 359 745 365
-rect 900 365 958 371
-rect 900 359 912 365
-rect 733 331 912 359
-rect 946 331 958 365
-rect 987 365 1016 479
-rect 1365 473 1424 479
-rect 1194 439 1252 445
-rect 1194 438 1206 439
-rect 1173 405 1206 438
-rect 1240 405 1252 439
-rect 1173 404 1252 405
-rect 1194 399 1252 404
-rect 1216 365 1272 371
-rect 987 331 1226 365
-rect 1260 331 1272 365
-rect 169 325 227 331
-rect 687 325 745 331
-rect 900 325 958 331
-rect 1216 325 1272 331
-rect 28 291 86 297
-rect 437 291 495 297
-rect 28 257 40 291
-rect 74 257 449 291
-rect 483 257 495 291
-rect 28 251 86 257
-rect 437 251 495 257
-rect 523 291 581 297
-rect 1006 291 1064 297
-rect 523 257 535 291
-rect 569 285 1018 291
-rect 569 257 671 285
-rect 523 251 581 257
-rect 659 251 671 257
-rect 705 257 1018 285
-rect 1052 257 1064 291
-rect 705 251 717 257
-rect 1006 251 1064 257
-rect 665 245 711 251
-rect 0 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel viali 198 348 198 348 1 D
-port 1 n
-rlabel viali 915 422 915 422 1 CK
-port 4 n
-rlabel viali 1223 422 1223 422 1 ON
-rlabel viali 1394 496 1394 496 1 Q
-rlabel viali 68 49 68 49 1 gnd
-rlabel viali 68 841 68 841 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__dffr_1.mag b/12T_hs/sky130_osu_sc_12T_hs__dffr_1.mag
deleted file mode 100644
index 4d49f7f..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__dffr_1.mag
+++ /dev/null
@@ -1,844 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864449
-<< checkpaint >>
-rect -1210 -1243 3112 2131
-<< nwell >>
-rect -10 485 1917 897
-<< pmos >>
-rect 80 521 110 773
-rect 270 605 300 773
-rect 342 605 372 773
-rect 546 521 576 773
-rect 618 521 648 773
-rect 738 521 768 773
-rect 810 521 840 773
-rect 896 521 926 773
-rect 968 521 998 773
-rect 1088 521 1118 773
-rect 1160 521 1190 773
-rect 1246 521 1276 773
-rect 1436 605 1466 773
-rect 1508 605 1538 773
-rect 1712 521 1742 773
-rect 1798 521 1828 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 270 115 300 199
-rect 356 115 386 199
-rect 546 115 576 225
-rect 618 115 648 225
-rect 738 115 768 225
-rect 810 115 840 225
-rect 896 115 926 225
-rect 968 115 998 225
-rect 1088 115 1118 225
-rect 1160 115 1190 225
-rect 1246 115 1276 225
-rect 1436 115 1466 199
-rect 1522 115 1552 199
-rect 1712 115 1742 225
-rect 1798 115 1828 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 225
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-rect 217 165 270 199
-rect 217 131 225 165
-rect 259 131 270 165
-rect 217 115 270 131
-rect 300 165 356 199
-rect 300 131 311 165
-rect 345 131 356 165
-rect 300 115 356 131
-rect 386 165 439 199
-rect 386 131 397 165
-rect 431 131 439 165
-rect 386 115 439 131
-rect 493 171 546 225
-rect 493 131 501 171
-rect 535 131 546 171
-rect 493 115 546 131
-rect 576 115 618 225
-rect 648 171 738 225
-rect 648 131 659 171
-rect 727 131 738 171
-rect 648 115 738 131
-rect 768 115 810 225
-rect 840 165 896 225
-rect 840 131 851 165
-rect 885 131 896 165
-rect 840 115 896 131
-rect 926 115 968 225
-rect 998 171 1088 225
-rect 998 131 1009 171
-rect 1077 131 1088 171
-rect 998 115 1088 131
-rect 1118 115 1160 225
-rect 1190 171 1246 225
-rect 1190 131 1201 171
-rect 1235 131 1246 171
-rect 1190 115 1246 131
-rect 1276 171 1329 225
-rect 1276 131 1287 171
-rect 1321 131 1329 171
-rect 1276 115 1329 131
-rect 1383 165 1436 199
-rect 1383 131 1391 165
-rect 1425 131 1436 165
-rect 1383 115 1436 131
-rect 1466 165 1522 199
-rect 1466 131 1477 165
-rect 1511 131 1522 165
-rect 1466 115 1522 131
-rect 1552 165 1605 199
-rect 1552 131 1563 165
-rect 1597 131 1605 165
-rect 1552 115 1605 131
-rect 1659 165 1712 225
-rect 1659 131 1667 165
-rect 1701 131 1712 165
-rect 1659 115 1712 131
-rect 1742 165 1798 225
-rect 1742 131 1753 165
-rect 1787 131 1798 165
-rect 1742 115 1798 131
-rect 1828 165 1881 225
-rect 1828 131 1839 165
-rect 1873 131 1881 165
-rect 1828 115 1881 131
-<< pdiff >>
-rect 27 758 80 773
-rect 27 697 35 758
-rect 69 697 80 758
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 560 121 757
-rect 155 560 163 757
-rect 217 757 270 773
-rect 217 621 225 757
-rect 259 621 270 757
-rect 217 605 270 621
-rect 300 605 342 773
-rect 372 757 425 773
-rect 372 621 383 757
-rect 417 621 425 757
-rect 372 605 425 621
-rect 493 757 546 773
-rect 493 629 501 757
-rect 535 629 546 757
-rect 110 521 163 560
-rect 493 521 546 629
-rect 576 521 618 773
-rect 648 757 738 773
-rect 648 561 659 757
-rect 727 561 738 757
-rect 648 521 738 561
-rect 768 521 810 773
-rect 840 757 896 773
-rect 840 629 851 757
-rect 885 629 896 757
-rect 840 521 896 629
-rect 926 521 968 773
-rect 998 757 1088 773
-rect 998 629 1009 757
-rect 1077 629 1088 757
-rect 998 521 1088 629
-rect 1118 521 1160 773
-rect 1190 757 1246 773
-rect 1190 595 1201 757
-rect 1235 595 1246 757
-rect 1190 521 1246 595
-rect 1276 757 1329 773
-rect 1276 561 1287 757
-rect 1321 561 1329 757
-rect 1383 757 1436 773
-rect 1383 621 1391 757
-rect 1425 621 1436 757
-rect 1383 605 1436 621
-rect 1466 605 1508 773
-rect 1538 757 1591 773
-rect 1538 621 1549 757
-rect 1583 621 1591 757
-rect 1538 605 1591 621
-rect 1659 757 1712 773
-rect 1659 617 1667 757
-rect 1701 617 1712 757
-rect 1276 521 1329 561
-rect 1659 521 1712 617
-rect 1742 757 1798 773
-rect 1742 617 1753 757
-rect 1787 617 1798 757
-rect 1742 521 1798 617
-rect 1828 757 1881 773
-rect 1828 617 1839 757
-rect 1873 617 1881 757
-rect 1828 521 1881 617
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 225 131 259 165
-rect 311 131 345 165
-rect 397 131 431 165
-rect 501 131 535 171
-rect 659 131 727 171
-rect 851 131 885 165
-rect 1009 131 1077 171
-rect 1201 131 1235 171
-rect 1287 131 1321 171
-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 697 69 758
-rect 121 560 155 757
-rect 225 621 259 757
-rect 383 621 417 757
-rect 501 629 535 757
-rect 659 561 727 757
-rect 851 629 885 757
-rect 1009 629 1077 757
-rect 1201 595 1235 757
-rect 1287 561 1321 757
-rect 1391 621 1425 757
-rect 1549 621 1583 757
-rect 1667 617 1701 757
-rect 1753 617 1787 757
-rect 1839 617 1873 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-rect 1658 827 1682 861
-rect 1716 827 1740 861
-rect 1794 827 1818 861
-rect 1852 827 1876 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-rect 1682 827 1716 861
-rect 1818 827 1852 861
-<< poly >>
-rect 80 773 110 799
-rect 270 773 300 799
-rect 342 773 372 799
-rect 546 773 576 799
-rect 618 773 648 799
-rect 738 773 768 799
-rect 810 773 840 799
-rect 896 773 926 799
-rect 968 773 998 799
-rect 1088 773 1118 799
-rect 1160 773 1190 799
-rect 1246 773 1276 799
-rect 1436 773 1466 799
-rect 1508 773 1538 799
-rect 1712 773 1742 799
-rect 1798 773 1828 799
-rect 80 398 110 521
-rect 79 382 133 398
-rect 79 348 89 382
-rect 123 348 133 382
-rect 79 332 133 348
-rect 79 331 110 332
-rect 80 225 110 331
-rect 270 287 300 605
-rect 342 508 372 605
-rect 342 492 415 508
-rect 342 458 371 492
-rect 405 458 415 492
-rect 342 442 415 458
-rect 217 271 300 287
-rect 217 237 227 271
-rect 261 237 300 271
-rect 217 221 300 237
-rect 270 199 300 221
-rect 356 199 386 442
-rect 546 381 576 521
-rect 618 490 648 521
-rect 618 474 684 490
-rect 618 440 634 474
-rect 668 440 684 474
-rect 618 430 684 440
-rect 738 385 768 521
-rect 810 484 840 521
-rect 896 484 926 521
-rect 810 474 926 484
-rect 810 440 842 474
-rect 876 440 926 474
-rect 810 430 926 440
-rect 968 385 998 521
-rect 1088 490 1118 521
-rect 1052 474 1118 490
-rect 1052 440 1068 474
-rect 1102 440 1118 474
-rect 1052 430 1118 440
-rect 1160 451 1190 521
-rect 1246 490 1276 521
-rect 1246 474 1317 490
-rect 1246 460 1273 474
-rect 1160 421 1196 451
-rect 1257 440 1273 460
-rect 1307 440 1317 474
-rect 1257 424 1317 440
-rect 1166 387 1196 421
-rect 546 365 600 381
-rect 546 331 556 365
-rect 590 331 600 365
-rect 546 315 600 331
-rect 642 365 1124 385
-rect 642 355 1074 365
-rect 546 225 576 315
-rect 642 271 672 355
-rect 1064 325 1074 355
-rect 1108 325 1124 365
-rect 618 241 672 271
-rect 714 297 768 313
-rect 714 263 724 297
-rect 758 263 768 297
-rect 714 247 768 263
-rect 618 225 648 241
-rect 738 225 768 247
-rect 810 297 926 307
-rect 810 263 842 297
-rect 876 263 926 297
-rect 810 253 926 263
-rect 810 225 840 253
-rect 896 225 926 253
-rect 968 297 1022 313
-rect 1064 304 1124 325
-rect 1166 371 1220 387
-rect 1166 337 1176 371
-rect 1210 337 1220 371
-rect 1166 321 1220 337
-rect 968 263 978 297
-rect 1012 263 1022 297
-rect 968 247 1022 263
-rect 968 225 998 247
-rect 1088 225 1118 304
-rect 1166 273 1196 321
-rect 1160 241 1196 273
-rect 1262 271 1292 424
-rect 1436 307 1466 605
-rect 1246 241 1292 271
-rect 1399 291 1466 307
-rect 1399 257 1409 291
-rect 1443 257 1466 291
-rect 1508 316 1538 605
-rect 1712 505 1742 521
-rect 1702 475 1742 505
-rect 1702 381 1732 475
-rect 1798 416 1828 521
-rect 1677 365 1732 381
-rect 1677 331 1687 365
-rect 1721 331 1732 365
-rect 1774 400 1828 416
-rect 1774 366 1784 400
-rect 1818 366 1828 400
-rect 1774 350 1828 366
-rect 1508 287 1552 316
-rect 1677 315 1732 331
-rect 1508 275 1605 287
-rect 1399 241 1466 257
-rect 1160 225 1190 241
-rect 1246 225 1276 241
-rect 1436 199 1466 241
-rect 1522 271 1605 275
-rect 1522 237 1561 271
-rect 1595 237 1605 271
-rect 1702 270 1732 315
-rect 1702 240 1742 270
-rect 1522 221 1605 237
-rect 1712 225 1742 240
-rect 1798 225 1828 350
-rect 1522 199 1552 221
-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 348 123 382
-rect 371 458 405 492
-rect 227 237 261 271
-rect 634 440 668 474
-rect 842 440 876 474
-rect 1068 440 1102 474
-rect 1273 440 1307 474
-rect 556 331 590 365
-rect 1074 325 1108 365
-rect 724 263 758 297
-rect 842 263 876 297
-rect 1176 337 1210 371
-rect 978 263 1012 297
-rect 1409 257 1443 291
-rect 1687 331 1721 365
-rect 1784 366 1818 400
-rect 1561 237 1595 271
-<< locali >>
-rect 0 867 1914 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1682 867
-rect 1716 827 1818 867
-rect 1852 827 1914 867
-rect 35 758 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 398 81 553
-rect 121 469 155 560
-rect 225 757 259 773
-rect 121 435 191 469
-rect 47 382 123 398
-rect 47 348 89 382
-rect 89 332 123 348
-rect 157 271 191 435
-rect 225 379 259 621
-rect 383 757 417 827
-rect 383 605 417 621
-rect 501 757 535 827
-rect 501 613 535 629
-rect 659 757 727 773
-rect 851 757 885 827
-rect 851 613 885 629
-rect 1009 757 1077 773
-rect 659 558 727 561
-rect 1009 558 1077 629
-rect 1201 757 1235 827
-rect 1201 579 1235 595
-rect 1287 757 1321 773
-rect 405 524 727 558
-rect 910 524 1077 558
-rect 1391 757 1425 773
-rect 1549 757 1583 827
-rect 1425 621 1511 626
-rect 1391 592 1511 621
-rect 1549 605 1583 621
-rect 1667 757 1701 773
-rect 1287 558 1321 561
-rect 1287 524 1377 558
-rect 405 508 439 524
-rect 371 492 439 508
-rect 405 458 439 492
-rect 371 442 439 458
-rect 225 345 345 379
-rect 311 297 345 345
-rect 311 291 347 297
-rect 157 239 227 271
-rect 121 237 227 239
-rect 261 237 277 271
-rect 311 257 313 291
-rect 311 250 347 257
-rect 405 294 439 442
-rect 634 474 668 490
-rect 634 439 668 440
-rect 842 474 876 490
-rect 662 405 758 439
-rect 556 365 590 381
-rect 556 315 590 331
-rect 724 297 758 405
-rect 405 274 440 294
-rect 121 205 191 237
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 205
-rect 121 115 155 131
-rect 225 165 259 181
-rect 225 61 259 131
-rect 311 165 345 250
-rect 405 240 690 274
-rect 842 297 876 440
-rect 724 247 758 263
-rect 858 257 876 263
-rect 842 247 876 257
-rect 910 291 944 524
-rect 1068 474 1102 490
-rect 1068 439 1102 440
-rect 910 247 944 257
-rect 978 405 1074 439
-rect 1170 405 1204 479
-rect 1273 474 1307 490
-rect 1273 439 1307 440
-rect 978 297 1012 405
-rect 1170 371 1210 405
-rect 1058 325 1074 365
-rect 1108 325 1124 365
-rect 1341 365 1377 524
-rect 1176 321 1210 337
-rect 1289 331 1377 365
-rect 1287 325 1377 331
-rect 1477 365 1511 592
-rect 1667 513 1701 617
-rect 1753 757 1787 827
-rect 1753 545 1787 617
-rect 1839 757 1873 773
-rect 1839 587 1873 617
-rect 1872 570 1873 587
-rect 1872 553 1896 570
-rect 1839 536 1896 553
-rect 1667 474 1701 479
-rect 1667 440 1818 474
-rect 1784 400 1818 440
-rect 1477 331 1687 365
-rect 1721 331 1737 365
-rect 978 247 1012 263
-rect 656 187 690 240
-rect 1046 207 1080 257
-rect 311 115 345 131
-rect 397 165 431 181
-rect 397 61 431 131
-rect 501 171 535 187
-rect 656 171 727 187
-rect 656 153 659 171
-rect 501 61 535 131
-rect 659 115 727 131
-rect 851 165 885 181
-rect 851 61 885 131
-rect 1009 171 1080 207
-rect 1077 131 1080 171
-rect 1009 115 1080 131
-rect 1201 171 1235 187
-rect 1201 61 1235 131
-rect 1287 171 1321 325
-rect 1409 291 1443 307
-rect 1409 241 1443 257
-rect 1287 115 1321 131
-rect 1391 165 1425 181
-rect 1391 61 1425 131
-rect 1477 165 1511 331
-rect 1784 291 1818 366
-rect 1545 237 1561 271
-rect 1595 237 1611 271
-rect 1667 257 1818 291
-rect 1477 115 1511 131
-rect 1563 165 1597 181
-rect 1563 61 1597 131
-rect 1667 165 1701 257
-rect 1862 224 1896 536
-rect 1839 190 1896 224
-rect 1667 115 1701 131
-rect 1753 165 1787 181
-rect 1753 61 1787 131
-rect 1839 165 1873 190
-rect 1839 115 1873 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 1682 861 1716 867
-rect 1682 833 1716 861
-rect 1818 861 1852 867
-rect 1818 833 1852 861
-rect 47 553 81 587
-rect 227 271 261 291
-rect 227 257 261 271
-rect 313 257 347 291
-rect 628 405 662 439
-rect 556 331 590 365
-rect 824 263 842 291
-rect 842 263 858 291
-rect 824 257 858 263
-rect 1170 479 1204 513
-rect 910 257 944 291
-rect 1074 405 1108 439
-rect 1273 405 1307 439
-rect 1074 331 1108 365
-rect 1255 331 1289 365
-rect 1838 553 1872 587
-rect 1667 479 1701 513
-rect 1687 331 1721 365
-rect 1046 257 1080 291
-rect 1409 257 1443 291
-rect 1561 271 1595 291
-rect 1561 257 1595 271
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 867 1914 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1682 867
-rect 1716 833 1818 867
-rect 1852 833 1914 867
-rect 0 827 1914 833
-rect 35 587 93 593
-rect 1826 587 1884 593
-rect 35 553 47 587
-rect 81 586 121 587
-rect 81 553 127 586
-rect 1804 553 1838 587
-rect 1872 553 1884 587
-rect 35 547 93 553
-rect 1826 547 1884 553
-rect 1158 513 1216 519
-rect 1655 513 1713 519
-rect 1158 479 1170 513
-rect 1204 479 1383 513
-rect 1632 479 1667 513
-rect 1701 479 1713 513
-rect 1158 473 1216 479
-rect 616 439 674 445
-rect 1062 439 1120 445
-rect 1261 439 1319 445
-rect 616 405 628 439
-rect 662 405 1074 439
-rect 1108 405 1273 439
-rect 1307 405 1319 439
-rect 616 399 674 405
-rect 1062 399 1120 405
-rect 1261 399 1319 405
-rect 544 365 602 371
-rect 1062 365 1120 371
-rect 1243 365 1302 371
-rect 544 331 556 365
-rect 590 331 624 365
-rect 1062 331 1074 365
-rect 1108 331 1255 365
-rect 1289 331 1302 365
-rect 544 325 602 331
-rect 1062 325 1120 331
-rect 1243 325 1302 331
-rect 1347 365 1383 479
-rect 1655 473 1713 479
-rect 1675 365 1733 371
-rect 1347 331 1687 365
-rect 1721 331 1733 365
-rect 1347 330 1733 331
-rect 1675 325 1733 330
-rect 215 291 273 297
-rect 215 257 227 291
-rect 261 257 273 291
-rect 215 251 273 257
-rect 301 291 358 297
-rect 812 291 870 297
-rect 301 257 313 291
-rect 347 257 824 291
-rect 858 257 870 291
-rect 227 217 261 251
-rect 301 250 358 257
-rect 812 251 870 257
-rect 898 291 956 297
-rect 1036 291 1088 297
-rect 1397 291 1455 297
-rect 898 257 910 291
-rect 944 257 1046 291
-rect 1080 257 1409 291
-rect 1443 257 1455 291
-rect 898 251 956 257
-rect 1036 251 1088 257
-rect 1397 251 1455 257
-rect 1549 291 1607 297
-rect 1549 257 1561 291
-rect 1595 257 1607 291
-rect 1549 251 1607 257
-rect 1561 217 1595 251
-rect 227 183 1595 217
-rect 0 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel viali 65 570 65 570 1 RN
-port 1 n
-rlabel viali 1855 570 1855 570 1 Q
-port 4 n
-rlabel viali 1685 496 1685 496 1 QN
-port 5 n
-rlabel viali 573 348 573 348 1 D
-port 2 n
-rlabel viali 1290 422 1290 422 1 CK
-port 3 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__dffr_l.mag b/12T_hs/sky130_osu_sc_12T_hs__dffr_l.mag
deleted file mode 100644
index 30b43a7..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__dffr_l.mag
+++ /dev/null
@@ -1,841 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864450
-<< checkpaint >>
-rect -1210 -1243 3112 2131
-<< nwell >>
-rect -10 485 1917 897
-<< pmos >>
-rect 80 521 110 773
-rect 270 605 300 773
-rect 342 605 372 773
-rect 546 521 576 773
-rect 618 521 648 773
-rect 738 521 768 773
-rect 810 521 840 773
-rect 896 521 926 773
-rect 968 521 998 773
-rect 1088 521 1118 773
-rect 1160 521 1190 773
-rect 1246 521 1276 773
-rect 1436 605 1466 773
-rect 1508 605 1538 773
-rect 1712 605 1742 773
-rect 1798 605 1828 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 270 115 300 199
-rect 356 115 386 199
-rect 546 115 576 225
-rect 618 115 648 225
-rect 738 115 768 225
-rect 810 115 840 225
-rect 896 115 926 225
-rect 968 115 998 225
-rect 1088 115 1118 225
-rect 1160 115 1190 225
-rect 1246 115 1276 225
-rect 1436 115 1466 199
-rect 1522 115 1552 199
-rect 1712 115 1742 199
-rect 1798 115 1828 199
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 225
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-rect 217 165 270 199
-rect 217 131 225 165
-rect 259 131 270 165
-rect 217 115 270 131
-rect 300 165 356 199
-rect 300 131 311 165
-rect 345 131 356 165
-rect 300 115 356 131
-rect 386 165 439 199
-rect 386 131 397 165
-rect 431 131 439 165
-rect 386 115 439 131
-rect 493 171 546 225
-rect 493 131 501 171
-rect 535 131 546 171
-rect 493 115 546 131
-rect 576 115 618 225
-rect 648 171 738 225
-rect 648 131 659 171
-rect 727 131 738 171
-rect 648 115 738 131
-rect 768 115 810 225
-rect 840 165 896 225
-rect 840 131 851 165
-rect 885 131 896 165
-rect 840 115 896 131
-rect 926 115 968 225
-rect 998 171 1088 225
-rect 998 131 1009 171
-rect 1077 131 1088 171
-rect 998 115 1088 131
-rect 1118 115 1160 225
-rect 1190 171 1246 225
-rect 1190 131 1201 171
-rect 1235 131 1246 171
-rect 1190 115 1246 131
-rect 1276 171 1329 225
-rect 1276 131 1287 171
-rect 1321 131 1329 171
-rect 1276 115 1329 131
-rect 1383 165 1436 199
-rect 1383 131 1391 165
-rect 1425 131 1436 165
-rect 1383 115 1436 131
-rect 1466 165 1522 199
-rect 1466 131 1477 165
-rect 1511 131 1522 165
-rect 1466 115 1522 131
-rect 1552 165 1605 199
-rect 1552 131 1563 165
-rect 1597 131 1605 165
-rect 1552 115 1605 131
-rect 1659 165 1712 199
-rect 1659 131 1667 165
-rect 1701 131 1712 165
-rect 1659 115 1712 131
-rect 1742 165 1798 199
-rect 1742 131 1753 165
-rect 1787 131 1798 165
-rect 1742 115 1798 131
-rect 1828 165 1881 199
-rect 1828 131 1839 165
-rect 1873 131 1881 165
-rect 1828 115 1881 131
-<< pdiff >>
-rect 27 758 80 773
-rect 27 697 35 758
-rect 69 697 80 758
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 560 121 757
-rect 155 560 163 757
-rect 217 757 270 773
-rect 217 621 225 757
-rect 259 621 270 757
-rect 217 605 270 621
-rect 300 605 342 773
-rect 372 757 425 773
-rect 372 621 383 757
-rect 417 621 425 757
-rect 372 605 425 621
-rect 493 757 546 773
-rect 493 629 501 757
-rect 535 629 546 757
-rect 110 521 163 560
-rect 493 521 546 629
-rect 576 521 618 773
-rect 648 757 738 773
-rect 648 561 659 757
-rect 727 561 738 757
-rect 648 521 738 561
-rect 768 521 810 773
-rect 840 757 896 773
-rect 840 629 851 757
-rect 885 629 896 757
-rect 840 521 896 629
-rect 926 521 968 773
-rect 998 757 1088 773
-rect 998 629 1009 757
-rect 1077 629 1088 757
-rect 998 521 1088 629
-rect 1118 521 1160 773
-rect 1190 757 1246 773
-rect 1190 595 1201 757
-rect 1235 595 1246 757
-rect 1190 521 1246 595
-rect 1276 757 1329 773
-rect 1276 561 1287 757
-rect 1321 561 1329 757
-rect 1383 757 1436 773
-rect 1383 621 1391 757
-rect 1425 621 1436 757
-rect 1383 605 1436 621
-rect 1466 605 1508 773
-rect 1538 757 1591 773
-rect 1538 621 1549 757
-rect 1583 621 1591 757
-rect 1538 605 1591 621
-rect 1659 757 1712 773
-rect 1659 617 1667 757
-rect 1701 617 1712 757
-rect 1659 605 1712 617
-rect 1742 757 1798 773
-rect 1742 617 1753 757
-rect 1787 617 1798 757
-rect 1742 605 1798 617
-rect 1828 757 1881 773
-rect 1828 617 1839 757
-rect 1873 617 1881 757
-rect 1828 605 1881 617
-rect 1276 521 1329 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 225 131 259 165
-rect 311 131 345 165
-rect 397 131 431 165
-rect 501 131 535 171
-rect 659 131 727 171
-rect 851 131 885 165
-rect 1009 131 1077 171
-rect 1201 131 1235 171
-rect 1287 131 1321 171
-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 697 69 758
-rect 121 560 155 757
-rect 225 621 259 757
-rect 383 621 417 757
-rect 501 629 535 757
-rect 659 561 727 757
-rect 851 629 885 757
-rect 1009 629 1077 757
-rect 1201 595 1235 757
-rect 1287 561 1321 757
-rect 1391 621 1425 757
-rect 1549 621 1583 757
-rect 1667 617 1701 757
-rect 1753 617 1787 757
-rect 1839 617 1873 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-rect 1658 827 1682 861
-rect 1716 827 1740 861
-rect 1794 827 1818 861
-rect 1852 827 1876 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-rect 1682 827 1716 861
-rect 1818 827 1852 861
-<< poly >>
-rect 80 773 110 799
-rect 270 773 300 799
-rect 342 773 372 799
-rect 546 773 576 799
-rect 618 773 648 799
-rect 738 773 768 799
-rect 810 773 840 799
-rect 896 773 926 799
-rect 968 773 998 799
-rect 1088 773 1118 799
-rect 1160 773 1190 799
-rect 1246 773 1276 799
-rect 1436 773 1466 799
-rect 1508 773 1538 799
-rect 1712 773 1742 799
-rect 1798 773 1828 799
-rect 80 398 110 521
-rect 79 382 133 398
-rect 79 348 89 382
-rect 123 348 133 382
-rect 79 332 133 348
-rect 79 331 110 332
-rect 80 225 110 331
-rect 270 287 300 605
-rect 342 508 372 605
-rect 342 492 415 508
-rect 342 458 371 492
-rect 405 458 415 492
-rect 342 442 415 458
-rect 217 271 300 287
-rect 217 237 227 271
-rect 261 237 300 271
-rect 217 221 300 237
-rect 270 199 300 221
-rect 356 199 386 442
-rect 546 381 576 521
-rect 618 490 648 521
-rect 618 474 684 490
-rect 618 440 634 474
-rect 668 440 684 474
-rect 618 430 684 440
-rect 738 385 768 521
-rect 810 484 840 521
-rect 896 484 926 521
-rect 810 474 926 484
-rect 810 440 842 474
-rect 876 440 926 474
-rect 810 430 926 440
-rect 968 385 998 521
-rect 1088 490 1118 521
-rect 1052 474 1118 490
-rect 1052 440 1068 474
-rect 1102 440 1118 474
-rect 1052 430 1118 440
-rect 1160 451 1190 521
-rect 1246 490 1276 521
-rect 1246 474 1317 490
-rect 1246 460 1273 474
-rect 1160 421 1196 451
-rect 1257 440 1273 460
-rect 1307 440 1317 474
-rect 1257 424 1317 440
-rect 1166 387 1196 421
-rect 546 365 600 381
-rect 546 331 556 365
-rect 590 331 600 365
-rect 546 315 600 331
-rect 642 365 1124 385
-rect 642 355 1074 365
-rect 546 225 576 315
-rect 642 271 672 355
-rect 1064 325 1074 355
-rect 1108 325 1124 365
-rect 618 241 672 271
-rect 714 297 768 313
-rect 714 263 724 297
-rect 758 263 768 297
-rect 714 247 768 263
-rect 618 225 648 241
-rect 738 225 768 247
-rect 810 297 926 307
-rect 810 263 842 297
-rect 876 263 926 297
-rect 810 253 926 263
-rect 810 225 840 253
-rect 896 225 926 253
-rect 968 297 1022 313
-rect 1064 304 1124 325
-rect 1166 371 1220 387
-rect 1166 337 1176 371
-rect 1210 337 1220 371
-rect 1166 321 1220 337
-rect 968 263 978 297
-rect 1012 263 1022 297
-rect 968 247 1022 263
-rect 968 225 998 247
-rect 1088 225 1118 304
-rect 1166 273 1196 321
-rect 1160 241 1196 273
-rect 1262 271 1292 424
-rect 1436 307 1466 605
-rect 1246 241 1292 271
-rect 1399 291 1466 307
-rect 1399 257 1409 291
-rect 1443 257 1466 291
-rect 1508 316 1538 605
-rect 1712 505 1742 605
-rect 1702 475 1742 505
-rect 1702 381 1732 475
-rect 1798 416 1828 605
-rect 1677 365 1732 381
-rect 1677 331 1687 365
-rect 1721 331 1732 365
-rect 1774 400 1828 416
-rect 1774 366 1784 400
-rect 1818 366 1828 400
-rect 1774 350 1828 366
-rect 1508 287 1552 316
-rect 1677 315 1732 331
-rect 1508 275 1605 287
-rect 1399 241 1466 257
-rect 1160 225 1190 241
-rect 1246 225 1276 241
-rect 1436 199 1466 241
-rect 1522 271 1605 275
-rect 1522 237 1561 271
-rect 1595 237 1605 271
-rect 1522 221 1605 237
-rect 1702 264 1732 315
-rect 1702 234 1742 264
-rect 1522 199 1552 221
-rect 1712 199 1742 234
-rect 1798 199 1828 350
-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 348 123 382
-rect 371 458 405 492
-rect 227 237 261 271
-rect 634 440 668 474
-rect 842 440 876 474
-rect 1068 440 1102 474
-rect 1273 440 1307 474
-rect 556 331 590 365
-rect 1074 325 1108 365
-rect 724 263 758 297
-rect 842 263 876 297
-rect 1176 337 1210 371
-rect 978 263 1012 297
-rect 1409 257 1443 291
-rect 1687 331 1721 365
-rect 1784 366 1818 400
-rect 1561 237 1595 271
-<< locali >>
-rect 0 867 1914 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1682 867
-rect 1716 827 1818 867
-rect 1852 827 1914 867
-rect 35 758 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 398 81 553
-rect 121 469 155 560
-rect 225 757 259 773
-rect 121 435 191 469
-rect 47 382 123 398
-rect 47 348 89 382
-rect 89 332 123 348
-rect 157 271 191 435
-rect 225 379 259 621
-rect 383 757 417 827
-rect 383 605 417 621
-rect 501 757 535 827
-rect 501 613 535 629
-rect 659 757 727 773
-rect 851 757 885 827
-rect 851 613 885 629
-rect 1009 757 1077 773
-rect 659 558 727 561
-rect 1009 558 1077 629
-rect 1201 757 1235 827
-rect 1201 579 1235 595
-rect 1287 757 1321 773
-rect 405 524 727 558
-rect 910 524 1077 558
-rect 1391 757 1425 773
-rect 1549 757 1583 827
-rect 1425 621 1511 626
-rect 1391 592 1511 621
-rect 1549 605 1583 621
-rect 1667 757 1701 773
-rect 1287 558 1321 561
-rect 1287 524 1377 558
-rect 405 508 439 524
-rect 371 492 439 508
-rect 405 458 439 492
-rect 371 442 439 458
-rect 225 345 345 379
-rect 311 291 345 345
-rect 157 239 227 271
-rect 121 237 227 239
-rect 261 237 277 271
-rect 121 205 191 237
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 205
-rect 121 115 155 131
-rect 225 165 259 181
-rect 225 61 259 131
-rect 311 165 345 257
-rect 405 294 439 442
-rect 634 474 668 490
-rect 634 439 668 440
-rect 842 474 876 490
-rect 662 405 758 439
-rect 556 365 590 381
-rect 556 315 590 331
-rect 724 297 758 405
-rect 405 274 440 294
-rect 405 240 690 274
-rect 842 297 876 440
-rect 724 247 758 263
-rect 858 257 876 263
-rect 842 247 876 257
-rect 910 291 944 524
-rect 1068 474 1102 490
-rect 1068 439 1102 440
-rect 910 247 944 257
-rect 978 405 1074 439
-rect 1170 405 1204 479
-rect 1273 474 1307 490
-rect 1273 439 1307 440
-rect 978 297 1012 405
-rect 1170 371 1210 405
-rect 1058 325 1074 365
-rect 1108 325 1124 365
-rect 1341 365 1377 524
-rect 1176 321 1210 337
-rect 1289 331 1377 365
-rect 1287 325 1377 331
-rect 1477 365 1511 592
-rect 1667 513 1701 617
-rect 1753 757 1787 827
-rect 1753 545 1787 617
-rect 1839 757 1873 773
-rect 1839 587 1873 617
-rect 1872 570 1873 587
-rect 1872 553 1896 570
-rect 1839 536 1896 553
-rect 1667 474 1701 479
-rect 1667 440 1818 474
-rect 1784 400 1818 440
-rect 1477 331 1687 365
-rect 1721 331 1737 365
-rect 978 247 1012 263
-rect 656 187 690 240
-rect 1046 207 1080 257
-rect 311 115 345 131
-rect 397 165 431 181
-rect 397 61 431 131
-rect 501 171 535 187
-rect 656 171 727 187
-rect 656 153 659 171
-rect 501 61 535 131
-rect 659 115 727 131
-rect 851 165 885 181
-rect 851 61 885 131
-rect 1009 171 1080 207
-rect 1077 131 1080 171
-rect 1009 115 1080 131
-rect 1201 171 1235 187
-rect 1201 61 1235 131
-rect 1287 171 1321 325
-rect 1409 291 1443 307
-rect 1409 241 1443 257
-rect 1287 115 1321 131
-rect 1391 165 1425 181
-rect 1391 61 1425 131
-rect 1477 165 1511 331
-rect 1784 291 1818 366
-rect 1545 237 1561 271
-rect 1595 237 1611 271
-rect 1667 257 1818 291
-rect 1477 115 1511 131
-rect 1563 165 1597 181
-rect 1563 61 1597 131
-rect 1667 165 1701 257
-rect 1862 224 1896 536
-rect 1839 190 1896 224
-rect 1667 115 1701 131
-rect 1753 165 1787 181
-rect 1753 61 1787 131
-rect 1839 165 1873 190
-rect 1839 115 1873 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 1682 861 1716 867
-rect 1682 833 1716 861
-rect 1818 861 1852 867
-rect 1818 833 1852 861
-rect 47 553 81 587
-rect 227 271 261 291
-rect 227 257 261 271
-rect 311 257 345 291
-rect 628 405 662 439
-rect 556 331 590 365
-rect 824 263 842 291
-rect 842 263 858 291
-rect 824 257 858 263
-rect 1170 479 1204 513
-rect 910 257 944 291
-rect 1074 405 1108 439
-rect 1273 405 1307 439
-rect 1074 331 1108 365
-rect 1255 331 1289 365
-rect 1838 553 1872 587
-rect 1667 479 1701 513
-rect 1687 331 1721 365
-rect 1046 257 1080 291
-rect 1409 257 1443 291
-rect 1561 271 1595 291
-rect 1561 257 1595 271
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 867 1914 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1682 867
-rect 1716 833 1818 867
-rect 1852 833 1914 867
-rect 0 827 1914 833
-rect 35 587 93 593
-rect 1826 587 1884 593
-rect 35 553 47 587
-rect 81 586 121 587
-rect 81 553 127 586
-rect 1804 553 1838 587
-rect 1872 553 1884 587
-rect 35 547 93 553
-rect 1826 547 1884 553
-rect 1158 513 1216 519
-rect 1655 513 1713 519
-rect 1158 479 1170 513
-rect 1204 479 1383 513
-rect 1632 479 1667 513
-rect 1701 479 1713 513
-rect 1158 473 1216 479
-rect 616 439 674 445
-rect 1062 439 1120 445
-rect 1261 439 1319 445
-rect 616 405 628 439
-rect 662 405 1074 439
-rect 1108 405 1273 439
-rect 1307 405 1319 439
-rect 616 399 674 405
-rect 1062 399 1120 405
-rect 1261 399 1319 405
-rect 544 365 602 371
-rect 1062 365 1120 371
-rect 1243 365 1302 371
-rect 544 331 556 365
-rect 590 331 624 365
-rect 1062 331 1074 365
-rect 1108 331 1255 365
-rect 1289 331 1302 365
-rect 544 325 602 331
-rect 1062 325 1120 331
-rect 1243 325 1302 331
-rect 1347 365 1383 479
-rect 1655 473 1713 479
-rect 1675 365 1733 371
-rect 1347 331 1687 365
-rect 1721 331 1733 365
-rect 1347 330 1733 331
-rect 1675 325 1733 330
-rect 217 291 271 303
-rect 217 257 227 291
-rect 261 257 271 291
-rect 217 251 271 257
-rect 299 291 356 299
-rect 812 291 870 297
-rect 299 257 311 291
-rect 345 257 824 291
-rect 858 257 870 291
-rect 227 217 261 251
-rect 299 250 356 257
-rect 812 251 870 257
-rect 898 291 956 297
-rect 1036 291 1088 297
-rect 1397 291 1455 297
-rect 898 257 910 291
-rect 944 257 1046 291
-rect 1080 257 1409 291
-rect 1443 257 1455 291
-rect 898 251 956 257
-rect 1036 251 1088 257
-rect 1397 251 1455 257
-rect 1549 291 1607 297
-rect 1549 257 1561 291
-rect 1595 257 1607 291
-rect 1549 251 1607 257
-rect 1561 217 1595 251
-rect 227 183 1595 217
-rect 0 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel viali 65 570 65 570 1 RN
-port 1 n
-rlabel viali 1855 570 1855 570 1 Q
-port 4 n
-rlabel viali 1685 496 1685 496 1 QN
-port 5 n
-rlabel viali 573 348 573 348 1 D
-port 2 n
-rlabel viali 1290 422 1290 422 1 CK
-port 3 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__dffs_1.mag b/12T_hs/sky130_osu_sc_12T_hs__dffs_1.mag
deleted file mode 100644
index 655a260..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__dffs_1.mag
+++ /dev/null
@@ -1,751 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864450
-<< checkpaint >>
-rect -1210 -1243 2840 2131
-<< nwell >>
-rect -10 789 1741 897
-rect -11 563 1741 789
-rect -10 485 1741 563
-<< pmos >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 356 521 386 773
-rect 428 521 458 773
-rect 548 521 578 773
-rect 620 521 650 773
-rect 706 521 736 773
-rect 778 521 808 773
-rect 898 521 928 773
-rect 970 521 1000 773
-rect 1056 521 1086 773
-rect 1246 605 1276 773
-rect 1332 605 1362 773
-rect 1522 521 1552 773
-rect 1608 521 1638 773
-<< nmoslvt >>
-rect 80 115 110 199
-rect 152 115 182 199
-rect 356 115 386 225
-rect 428 115 458 225
-rect 548 115 578 225
-rect 620 115 650 225
-rect 706 115 736 225
-rect 778 115 808 225
-rect 898 115 928 225
-rect 970 115 1000 225
-rect 1056 115 1086 225
-rect 1246 115 1276 199
-rect 1318 115 1348 199
-rect 1522 115 1552 225
-rect 1608 115 1638 225
-<< ndiff >>
-rect 27 165 80 199
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 115 152 199
-rect 182 165 235 199
-rect 182 131 193 165
-rect 227 131 235 165
-rect 182 115 235 131
-rect 303 171 356 225
-rect 303 131 311 171
-rect 345 131 356 171
-rect 303 115 356 131
-rect 386 115 428 225
-rect 458 171 548 225
-rect 458 131 469 171
-rect 537 131 548 171
-rect 458 115 548 131
-rect 578 115 620 225
-rect 650 165 706 225
-rect 650 131 661 165
-rect 695 131 706 165
-rect 650 115 706 131
-rect 736 115 778 225
-rect 808 171 898 225
-rect 808 131 819 171
-rect 887 131 898 171
-rect 808 115 898 131
-rect 928 115 970 225
-rect 1000 171 1056 225
-rect 1000 131 1011 171
-rect 1045 131 1056 171
-rect 1000 115 1056 131
-rect 1086 171 1139 225
-rect 1086 131 1097 171
-rect 1131 131 1139 171
-rect 1086 115 1139 131
-rect 1193 165 1246 199
-rect 1193 131 1201 165
-rect 1235 131 1246 165
-rect 1193 115 1246 131
-rect 1276 115 1318 199
-rect 1348 165 1401 199
-rect 1348 131 1359 165
-rect 1393 131 1401 165
-rect 1348 115 1401 131
-rect 1469 165 1522 225
-rect 1469 131 1477 165
-rect 1511 131 1522 165
-rect 1469 115 1522 131
-rect 1552 165 1608 225
-rect 1552 131 1563 165
-rect 1597 131 1608 165
-rect 1552 115 1608 131
-rect 1638 165 1691 225
-rect 1638 131 1649 165
-rect 1683 131 1691 165
-rect 1638 115 1691 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 689 35 757
-rect 69 689 80 757
-rect 27 605 80 689
-rect 110 757 166 773
-rect 110 689 121 757
-rect 155 689 166 757
-rect 110 605 166 689
-rect 196 757 249 773
-rect 196 689 207 757
-rect 241 689 249 757
-rect 196 605 249 689
-rect 303 757 356 773
-rect 303 629 311 757
-rect 345 629 356 757
-rect 303 521 356 629
-rect 386 521 428 773
-rect 458 757 548 773
-rect 458 561 469 757
-rect 537 561 548 757
-rect 458 521 548 561
-rect 578 521 620 773
-rect 650 757 706 773
-rect 650 629 661 757
-rect 695 629 706 757
-rect 650 521 706 629
-rect 736 521 778 773
-rect 808 757 898 773
-rect 808 629 819 757
-rect 887 629 898 757
-rect 808 521 898 629
-rect 928 521 970 773
-rect 1000 757 1056 773
-rect 1000 595 1011 757
-rect 1045 595 1056 757
-rect 1000 521 1056 595
-rect 1086 757 1139 773
-rect 1086 561 1097 757
-rect 1131 561 1139 757
-rect 1193 757 1246 773
-rect 1193 689 1201 757
-rect 1235 689 1246 757
-rect 1193 605 1246 689
-rect 1276 757 1332 773
-rect 1276 689 1287 757
-rect 1321 689 1332 757
-rect 1276 605 1332 689
-rect 1362 757 1415 773
-rect 1362 689 1373 757
-rect 1407 689 1415 757
-rect 1362 605 1415 689
-rect 1469 757 1522 773
-rect 1469 617 1477 757
-rect 1511 617 1522 757
-rect 1086 521 1139 561
-rect 1469 521 1522 617
-rect 1552 757 1608 773
-rect 1552 617 1563 757
-rect 1597 617 1608 757
-rect 1552 521 1608 617
-rect 1638 757 1691 773
-rect 1638 617 1649 757
-rect 1683 617 1691 757
-rect 1638 521 1691 617
-<< ndiffc >>
-rect 35 131 69 165
-rect 193 131 227 165
-rect 311 131 345 171
-rect 469 131 537 171
-rect 661 131 695 165
-rect 819 131 887 171
-rect 1011 131 1045 171
-rect 1097 131 1131 171
-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 689 69 757
-rect 121 689 155 757
-rect 207 689 241 757
-rect 311 629 345 757
-rect 469 561 537 757
-rect 661 629 695 757
-rect 819 629 887 757
-rect 1011 595 1045 757
-rect 1097 561 1131 757
-rect 1201 689 1235 757
-rect 1287 689 1321 757
-rect 1373 689 1407 757
-rect 1477 617 1511 757
-rect 1563 617 1597 757
-rect 1649 617 1683 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 356 773 386 799
-rect 428 773 458 799
-rect 548 773 578 799
-rect 620 773 650 799
-rect 706 773 736 799
-rect 778 773 808 799
-rect 898 773 928 799
-rect 970 773 1000 799
-rect 1056 773 1086 799
-rect 1246 773 1276 799
-rect 1332 773 1362 799
-rect 1522 773 1552 799
-rect 1608 773 1638 799
-rect 80 327 110 605
-rect 166 418 196 605
-rect 37 311 110 327
-rect 37 277 47 311
-rect 81 277 110 311
-rect 37 261 110 277
-rect 80 199 110 261
-rect 152 402 233 418
-rect 152 368 189 402
-rect 223 368 233 402
-rect 152 352 233 368
-rect 356 381 386 521
-rect 428 490 458 521
-rect 428 474 494 490
-rect 428 440 444 474
-rect 478 440 494 474
-rect 428 430 494 440
-rect 548 385 578 521
-rect 620 484 650 521
-rect 706 484 736 521
-rect 620 474 736 484
-rect 620 440 652 474
-rect 686 440 736 474
-rect 620 430 736 440
-rect 778 385 808 521
-rect 898 490 928 521
-rect 862 474 928 490
-rect 862 440 878 474
-rect 912 440 928 474
-rect 862 430 928 440
-rect 356 365 410 381
-rect 152 199 182 352
-rect 356 331 366 365
-rect 400 331 410 365
-rect 356 315 410 331
-rect 452 365 928 385
-rect 452 355 884 365
-rect 356 225 386 315
-rect 452 271 482 355
-rect 874 331 884 355
-rect 918 331 928 365
-rect 874 313 928 331
-rect 428 241 482 271
-rect 524 297 578 313
-rect 524 263 534 297
-rect 568 263 578 297
-rect 524 247 578 263
-rect 428 225 458 241
-rect 548 225 578 247
-rect 620 297 736 307
-rect 620 263 652 297
-rect 686 263 736 297
-rect 620 253 736 263
-rect 620 225 650 253
-rect 706 225 736 253
-rect 778 297 832 313
-rect 778 263 788 297
-rect 822 263 832 297
-rect 778 247 832 263
-rect 778 225 808 247
-rect 898 225 928 313
-rect 970 375 1000 521
-rect 1056 490 1086 521
-rect 1056 474 1127 490
-rect 1056 460 1083 474
-rect 1067 440 1083 460
-rect 1117 440 1127 474
-rect 1067 424 1127 440
-rect 970 359 1024 375
-rect 970 325 980 359
-rect 1014 325 1024 359
-rect 970 309 1024 325
-rect 970 225 1000 309
-rect 1067 271 1097 424
-rect 1246 307 1276 605
-rect 1056 241 1097 271
-rect 1193 291 1276 307
-rect 1193 257 1203 291
-rect 1237 257 1276 291
-rect 1332 287 1362 605
-rect 1522 505 1552 521
-rect 1512 475 1552 505
-rect 1512 375 1542 475
-rect 1608 416 1638 521
-rect 1487 359 1542 375
-rect 1487 325 1497 359
-rect 1531 325 1542 359
-rect 1584 400 1638 416
-rect 1584 366 1594 400
-rect 1628 366 1638 400
-rect 1584 350 1638 366
-rect 1487 309 1542 325
-rect 1193 241 1276 257
-rect 1056 225 1086 241
-rect 1246 199 1276 241
-rect 1318 271 1415 287
-rect 1318 237 1371 271
-rect 1405 237 1415 271
-rect 1512 270 1542 309
-rect 1512 240 1552 270
-rect 1318 220 1415 237
-rect 1522 225 1552 240
-rect 1608 225 1638 350
-rect 1318 199 1348 220
-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 277 81 311
-rect 189 368 223 402
-rect 444 440 478 474
-rect 652 440 686 474
-rect 878 440 912 474
-rect 366 331 400 365
-rect 884 331 918 365
-rect 534 263 568 297
-rect 652 263 686 297
-rect 788 263 822 297
-rect 1083 440 1117 474
-rect 980 325 1014 359
-rect 1203 257 1237 291
-rect 1497 325 1531 359
-rect 1594 366 1628 400
-rect 1371 237 1405 271
-<< locali >>
-rect 0 867 1738 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1738 867
-rect 35 757 69 827
-rect 35 673 69 689
-rect 121 757 155 773
-rect 121 398 155 689
-rect 207 757 241 827
-rect 207 673 241 689
-rect 311 757 345 827
-rect 311 613 345 629
-rect 469 757 537 773
-rect 661 757 695 827
-rect 661 613 695 629
-rect 819 757 887 773
-rect 469 558 537 561
-rect 819 558 887 629
-rect 1011 757 1045 827
-rect 1011 579 1045 595
-rect 1097 757 1131 773
-rect 47 324 81 327
-rect 47 261 81 277
-rect 121 199 155 364
-rect 189 524 537 558
-rect 720 524 887 558
-rect 1201 757 1235 827
-rect 1201 673 1235 689
-rect 1287 757 1321 773
-rect 1097 558 1131 561
-rect 1097 524 1187 558
-rect 189 402 223 524
-rect 444 474 478 490
-rect 444 439 478 440
-rect 652 474 686 490
-rect 472 405 568 439
-rect 189 274 223 368
-rect 366 365 400 381
-rect 366 315 400 331
-rect 534 297 568 405
-rect 189 240 500 274
-rect 652 297 686 440
-rect 534 247 568 263
-rect 668 257 686 263
-rect 720 291 754 524
-rect 878 474 912 490
-rect 878 439 912 440
-rect 788 405 884 439
-rect 788 297 822 405
-rect 868 331 884 365
-rect 918 331 934 365
-rect 980 359 1014 479
-rect 1083 474 1117 490
-rect 1083 439 1117 440
-rect 1151 371 1187 524
-rect 1097 365 1187 371
-rect 1121 356 1187 365
-rect 1287 359 1321 689
-rect 1373 757 1407 827
-rect 1373 673 1407 689
-rect 1477 757 1511 773
-rect 1477 513 1511 617
-rect 1563 757 1597 827
-rect 1563 545 1597 617
-rect 1649 757 1683 773
-rect 1649 587 1683 617
-rect 1682 570 1683 587
-rect 1682 553 1706 570
-rect 1649 536 1706 553
-rect 1477 474 1511 479
-rect 1477 440 1628 474
-rect 1594 400 1628 440
-rect 1121 337 1183 356
-rect 1121 331 1131 337
-rect 980 309 1014 325
-rect 652 247 686 257
-rect 788 247 822 263
-rect 35 165 155 199
-rect 466 187 500 240
-rect 856 207 890 257
-rect 193 165 227 181
-rect 35 115 69 131
-rect 193 61 227 131
-rect 311 171 345 187
-rect 466 171 537 187
-rect 466 153 469 171
-rect 311 61 345 131
-rect 469 115 537 131
-rect 661 165 695 181
-rect 661 61 695 131
-rect 819 171 890 207
-rect 887 131 890 171
-rect 819 115 890 131
-rect 1011 171 1045 187
-rect 1011 61 1045 131
-rect 1097 171 1131 331
-rect 1287 325 1497 359
-rect 1531 325 1547 359
-rect 1187 257 1203 291
-rect 1237 257 1253 291
-rect 1287 199 1321 325
-rect 1594 291 1628 366
-rect 1355 223 1371 271
-rect 1405 223 1421 271
-rect 1477 257 1628 291
-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 257
-rect 1672 224 1706 536
-rect 1649 190 1706 224
-rect 1477 115 1511 131
-rect 1563 165 1597 181
-rect 1563 61 1597 131
-rect 1649 165 1683 190
-rect 1649 115 1683 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 121 364 155 398
-rect 47 311 81 324
-rect 47 290 81 311
-rect 438 405 472 439
-rect 366 331 400 365
-rect 634 263 652 291
-rect 652 263 668 291
-rect 634 257 668 263
-rect 980 479 1014 513
-rect 720 257 754 291
-rect 884 405 918 439
-rect 884 331 918 365
-rect 1083 405 1117 439
-rect 1087 331 1121 365
-rect 1648 553 1682 587
-rect 1477 479 1511 513
-rect 856 257 890 291
-rect 1497 325 1531 359
-rect 1203 257 1237 291
-rect 1371 237 1405 250
-rect 1371 216 1405 237
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 867 1738 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1738 867
-rect 0 827 1738 833
-rect 1636 587 1694 593
-rect 1614 553 1648 587
-rect 1682 553 1694 587
-rect 1636 547 1694 553
-rect 968 513 1026 519
-rect 1465 513 1523 519
-rect 968 479 980 513
-rect 1014 479 1192 513
-rect 1443 479 1477 513
-rect 1511 479 1523 513
-rect 968 473 1026 479
-rect 1157 478 1192 479
-rect 426 439 484 445
-rect 872 439 930 445
-rect 1071 439 1129 445
-rect 426 405 438 439
-rect 472 405 884 439
-rect 918 405 1083 439
-rect 1117 405 1129 439
-rect 109 398 167 404
-rect 426 399 484 405
-rect 872 399 930 405
-rect 1071 399 1129 405
-rect 109 364 121 398
-rect 155 364 167 398
-rect 109 358 167 364
-rect 354 365 412 371
-rect 872 365 930 371
-rect 1081 365 1133 371
-rect 35 324 93 330
-rect 35 290 47 324
-rect 81 290 93 324
-rect 35 283 93 290
-rect 121 291 155 358
-rect 354 331 366 365
-rect 400 331 434 365
-rect 872 331 884 365
-rect 918 331 1087 365
-rect 1121 331 1133 365
-rect 354 325 412 331
-rect 872 325 930 331
-rect 1081 325 1133 331
-rect 1161 359 1192 478
-rect 1465 473 1523 479
-rect 1485 359 1543 365
-rect 1161 325 1497 359
-rect 1531 325 1543 359
-rect 1485 319 1543 325
-rect 622 291 680 297
-rect 47 211 81 283
-rect 121 257 634 291
-rect 668 257 680 291
-rect 622 251 680 257
-rect 708 291 766 297
-rect 849 291 896 297
-rect 1191 291 1249 297
-rect 708 257 720 291
-rect 754 257 856 291
-rect 890 257 1203 291
-rect 1237 257 1249 291
-rect 708 251 766 257
-rect 849 251 896 257
-rect 1191 251 1249 257
-rect 1355 250 1417 256
-rect 1355 216 1371 250
-rect 1405 216 1417 250
-rect 1355 212 1417 216
-rect 281 211 1417 212
-rect 47 210 1417 211
-rect 47 183 1405 210
-rect 0 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 348 383 348 1 D
-port 1 n
-rlabel viali 1100 422 1100 422 1 CK
-port 2 n
-rlabel viali 1665 570 1665 570 1 Q
-port 4 n
-rlabel viali 1495 496 1495 496 1 QN
-port 3 n
-rlabel viali 64 307 64 307 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__dffs_l.mag b/12T_hs/sky130_osu_sc_12T_hs__dffs_l.mag
deleted file mode 100644
index cd723fd..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__dffs_l.mag
+++ /dev/null
@@ -1,752 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864450
-<< checkpaint >>
-rect -1210 -1243 2840 2131
-<< nwell >>
-rect -10 789 1741 897
-rect -11 563 1741 789
-rect -10 485 1741 563
-<< pmos >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 356 521 386 773
-rect 428 521 458 773
-rect 548 521 578 773
-rect 620 521 650 773
-rect 706 521 736 773
-rect 778 521 808 773
-rect 898 521 928 773
-rect 970 521 1000 773
-rect 1056 521 1086 773
-rect 1246 605 1276 773
-rect 1332 605 1362 773
-rect 1522 605 1552 773
-rect 1608 605 1638 773
-<< nmoslvt >>
-rect 80 115 110 199
-rect 152 115 182 199
-rect 356 115 386 225
-rect 428 115 458 225
-rect 548 115 578 225
-rect 620 115 650 225
-rect 706 115 736 225
-rect 778 115 808 225
-rect 898 115 928 225
-rect 970 115 1000 225
-rect 1056 115 1086 225
-rect 1246 115 1276 199
-rect 1318 115 1348 199
-rect 1522 115 1552 199
-rect 1608 115 1638 199
-<< ndiff >>
-rect 27 165 80 199
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 115 152 199
-rect 182 165 235 199
-rect 182 131 193 165
-rect 227 131 235 165
-rect 182 115 235 131
-rect 303 171 356 225
-rect 303 131 311 171
-rect 345 131 356 171
-rect 303 115 356 131
-rect 386 115 428 225
-rect 458 171 548 225
-rect 458 131 469 171
-rect 537 131 548 171
-rect 458 115 548 131
-rect 578 115 620 225
-rect 650 165 706 225
-rect 650 131 661 165
-rect 695 131 706 165
-rect 650 115 706 131
-rect 736 115 778 225
-rect 808 171 898 225
-rect 808 131 819 171
-rect 887 131 898 171
-rect 808 115 898 131
-rect 928 115 970 225
-rect 1000 171 1056 225
-rect 1000 131 1011 171
-rect 1045 131 1056 171
-rect 1000 115 1056 131
-rect 1086 171 1139 225
-rect 1086 131 1097 171
-rect 1131 131 1139 171
-rect 1086 115 1139 131
-rect 1193 165 1246 199
-rect 1193 131 1201 165
-rect 1235 131 1246 165
-rect 1193 115 1246 131
-rect 1276 115 1318 199
-rect 1348 165 1401 199
-rect 1348 131 1359 165
-rect 1393 131 1401 165
-rect 1348 115 1401 131
-rect 1469 165 1522 199
-rect 1469 131 1477 165
-rect 1511 131 1522 165
-rect 1469 115 1522 131
-rect 1552 165 1608 199
-rect 1552 131 1563 165
-rect 1597 131 1608 165
-rect 1552 115 1608 131
-rect 1638 165 1691 199
-rect 1638 131 1649 165
-rect 1683 131 1691 165
-rect 1638 115 1691 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 689 35 757
-rect 69 689 80 757
-rect 27 605 80 689
-rect 110 757 166 773
-rect 110 689 121 757
-rect 155 689 166 757
-rect 110 605 166 689
-rect 196 757 249 773
-rect 196 689 207 757
-rect 241 689 249 757
-rect 196 605 249 689
-rect 303 757 356 773
-rect 303 629 311 757
-rect 345 629 356 757
-rect 303 521 356 629
-rect 386 521 428 773
-rect 458 757 548 773
-rect 458 561 469 757
-rect 537 561 548 757
-rect 458 521 548 561
-rect 578 521 620 773
-rect 650 757 706 773
-rect 650 629 661 757
-rect 695 629 706 757
-rect 650 521 706 629
-rect 736 521 778 773
-rect 808 757 898 773
-rect 808 629 819 757
-rect 887 629 898 757
-rect 808 521 898 629
-rect 928 521 970 773
-rect 1000 757 1056 773
-rect 1000 595 1011 757
-rect 1045 595 1056 757
-rect 1000 521 1056 595
-rect 1086 757 1139 773
-rect 1086 561 1097 757
-rect 1131 561 1139 757
-rect 1193 757 1246 773
-rect 1193 689 1201 757
-rect 1235 689 1246 757
-rect 1193 605 1246 689
-rect 1276 757 1332 773
-rect 1276 689 1287 757
-rect 1321 689 1332 757
-rect 1276 605 1332 689
-rect 1362 757 1415 773
-rect 1362 689 1373 757
-rect 1407 689 1415 757
-rect 1362 605 1415 689
-rect 1469 757 1522 773
-rect 1469 617 1477 757
-rect 1511 617 1522 757
-rect 1469 605 1522 617
-rect 1552 757 1608 773
-rect 1552 617 1563 757
-rect 1597 617 1608 757
-rect 1552 605 1608 617
-rect 1638 757 1691 773
-rect 1638 617 1649 757
-rect 1683 617 1691 757
-rect 1638 605 1691 617
-rect 1086 521 1139 561
-<< ndiffc >>
-rect 35 131 69 165
-rect 193 131 227 165
-rect 311 131 345 171
-rect 469 131 537 171
-rect 661 131 695 165
-rect 819 131 887 171
-rect 1011 131 1045 171
-rect 1097 131 1131 171
-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 689 69 757
-rect 121 689 155 757
-rect 207 689 241 757
-rect 311 629 345 757
-rect 469 561 537 757
-rect 661 629 695 757
-rect 819 629 887 757
-rect 1011 595 1045 757
-rect 1097 561 1131 757
-rect 1201 689 1235 757
-rect 1287 689 1321 757
-rect 1373 689 1407 757
-rect 1477 617 1511 757
-rect 1563 617 1597 757
-rect 1649 617 1683 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 356 773 386 799
-rect 428 773 458 799
-rect 548 773 578 799
-rect 620 773 650 799
-rect 706 773 736 799
-rect 778 773 808 799
-rect 898 773 928 799
-rect 970 773 1000 799
-rect 1056 773 1086 799
-rect 1246 773 1276 799
-rect 1332 773 1362 799
-rect 1522 773 1552 799
-rect 1608 773 1638 799
-rect 80 327 110 605
-rect 166 418 196 605
-rect 37 311 110 327
-rect 37 277 47 311
-rect 81 277 110 311
-rect 37 261 110 277
-rect 80 199 110 261
-rect 152 402 233 418
-rect 152 368 189 402
-rect 223 368 233 402
-rect 152 352 233 368
-rect 356 381 386 521
-rect 428 490 458 521
-rect 428 474 494 490
-rect 428 440 444 474
-rect 478 440 494 474
-rect 428 430 494 440
-rect 548 385 578 521
-rect 620 484 650 521
-rect 706 484 736 521
-rect 620 474 736 484
-rect 620 440 652 474
-rect 686 440 736 474
-rect 620 430 736 440
-rect 778 385 808 521
-rect 898 490 928 521
-rect 862 474 928 490
-rect 862 440 878 474
-rect 912 440 928 474
-rect 862 430 928 440
-rect 356 365 410 381
-rect 152 199 182 352
-rect 356 331 366 365
-rect 400 331 410 365
-rect 356 315 410 331
-rect 452 365 928 385
-rect 452 355 884 365
-rect 356 225 386 315
-rect 452 271 482 355
-rect 874 331 884 355
-rect 918 331 928 365
-rect 874 313 928 331
-rect 428 241 482 271
-rect 524 297 578 313
-rect 524 263 534 297
-rect 568 263 578 297
-rect 524 247 578 263
-rect 428 225 458 241
-rect 548 225 578 247
-rect 620 297 736 307
-rect 620 263 652 297
-rect 686 263 736 297
-rect 620 253 736 263
-rect 620 225 650 253
-rect 706 225 736 253
-rect 778 297 832 313
-rect 778 263 788 297
-rect 822 263 832 297
-rect 778 247 832 263
-rect 778 225 808 247
-rect 898 225 928 313
-rect 970 375 1000 521
-rect 1056 490 1086 521
-rect 1056 474 1127 490
-rect 1056 460 1083 474
-rect 1067 440 1083 460
-rect 1117 440 1127 474
-rect 1067 424 1127 440
-rect 970 359 1024 375
-rect 970 325 980 359
-rect 1014 325 1024 359
-rect 970 309 1024 325
-rect 970 225 1000 309
-rect 1067 271 1097 424
-rect 1246 307 1276 605
-rect 1056 241 1097 271
-rect 1193 291 1276 307
-rect 1193 257 1203 291
-rect 1237 257 1276 291
-rect 1332 287 1362 605
-rect 1522 505 1552 605
-rect 1512 475 1552 505
-rect 1512 375 1542 475
-rect 1608 416 1638 605
-rect 1487 359 1542 375
-rect 1487 325 1497 359
-rect 1531 325 1542 359
-rect 1584 400 1638 416
-rect 1584 366 1594 400
-rect 1628 366 1638 400
-rect 1584 350 1638 366
-rect 1487 309 1542 325
-rect 1193 241 1276 257
-rect 1056 225 1086 241
-rect 1246 199 1276 241
-rect 1318 271 1415 287
-rect 1318 237 1371 271
-rect 1405 237 1415 271
-rect 1318 221 1415 237
-rect 1512 264 1542 309
-rect 1512 234 1552 264
-rect 1318 199 1348 221
-rect 1522 199 1552 234
-rect 1608 199 1638 350
-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 277 81 311
-rect 189 368 223 402
-rect 444 440 478 474
-rect 652 440 686 474
-rect 878 440 912 474
-rect 366 331 400 365
-rect 884 331 918 365
-rect 534 263 568 297
-rect 652 263 686 297
-rect 788 263 822 297
-rect 1083 440 1117 474
-rect 980 325 1014 359
-rect 1203 257 1237 291
-rect 1497 325 1531 359
-rect 1594 366 1628 400
-rect 1371 237 1405 271
-<< locali >>
-rect 0 867 1738 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1738 867
-rect 35 757 69 827
-rect 35 673 69 689
-rect 121 757 155 773
-rect 121 398 155 689
-rect 207 757 241 827
-rect 207 673 241 689
-rect 311 757 345 827
-rect 311 613 345 629
-rect 469 757 537 773
-rect 661 757 695 827
-rect 661 613 695 629
-rect 819 757 887 773
-rect 469 558 537 561
-rect 819 558 887 629
-rect 1011 757 1045 827
-rect 1011 579 1045 595
-rect 1097 757 1131 773
-rect 47 324 81 327
-rect 47 261 81 277
-rect 121 199 155 364
-rect 189 524 537 558
-rect 720 524 887 558
-rect 1201 757 1235 827
-rect 1201 673 1235 689
-rect 1287 757 1321 773
-rect 1097 558 1131 561
-rect 1097 524 1187 558
-rect 189 402 223 524
-rect 444 474 478 490
-rect 444 439 478 440
-rect 652 474 686 490
-rect 472 405 568 439
-rect 189 274 223 368
-rect 366 365 400 381
-rect 366 315 400 331
-rect 534 297 568 405
-rect 189 240 500 274
-rect 652 297 686 440
-rect 534 247 568 263
-rect 668 257 686 263
-rect 720 291 754 524
-rect 878 474 912 490
-rect 878 439 912 440
-rect 788 405 884 439
-rect 788 297 822 405
-rect 868 331 884 365
-rect 918 331 934 365
-rect 980 359 1014 479
-rect 1083 474 1117 490
-rect 1083 439 1117 440
-rect 1151 371 1187 524
-rect 1097 365 1187 371
-rect 1121 356 1187 365
-rect 1287 359 1321 689
-rect 1373 757 1407 827
-rect 1373 673 1407 689
-rect 1477 757 1511 773
-rect 1477 513 1511 617
-rect 1563 757 1597 827
-rect 1563 545 1597 617
-rect 1649 757 1683 773
-rect 1649 587 1683 617
-rect 1682 570 1683 587
-rect 1682 553 1706 570
-rect 1649 536 1706 553
-rect 1477 474 1511 479
-rect 1477 440 1628 474
-rect 1594 400 1628 440
-rect 1121 337 1183 356
-rect 1121 331 1131 337
-rect 980 309 1014 325
-rect 652 247 686 257
-rect 788 247 822 263
-rect 35 165 155 199
-rect 466 187 500 240
-rect 856 207 890 257
-rect 193 165 227 181
-rect 35 115 69 131
-rect 193 61 227 131
-rect 311 171 345 187
-rect 466 171 537 187
-rect 466 153 469 171
-rect 311 61 345 131
-rect 469 115 537 131
-rect 661 165 695 181
-rect 661 61 695 131
-rect 819 171 890 207
-rect 887 131 890 171
-rect 819 115 890 131
-rect 1011 171 1045 187
-rect 1011 61 1045 131
-rect 1097 171 1131 331
-rect 1287 325 1497 359
-rect 1531 325 1547 359
-rect 1187 257 1203 291
-rect 1237 257 1253 291
-rect 1287 199 1321 325
-rect 1594 291 1628 366
-rect 1371 271 1405 287
-rect 1355 223 1371 257
-rect 1477 257 1628 291
-rect 1405 223 1421 257
-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 257
-rect 1672 224 1706 536
-rect 1649 190 1706 224
-rect 1477 115 1511 131
-rect 1563 165 1597 181
-rect 1563 61 1597 131
-rect 1649 165 1683 190
-rect 1649 115 1683 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 121 364 155 398
-rect 47 311 81 324
-rect 47 290 81 311
-rect 438 405 472 439
-rect 366 331 400 365
-rect 634 263 652 291
-rect 652 263 668 291
-rect 634 257 668 263
-rect 980 479 1014 513
-rect 720 257 754 291
-rect 884 405 918 439
-rect 884 331 918 365
-rect 1083 405 1117 439
-rect 1087 331 1121 365
-rect 1648 553 1682 587
-rect 1477 479 1511 513
-rect 856 257 890 291
-rect 1497 325 1531 359
-rect 1203 257 1237 291
-rect 1371 237 1405 250
-rect 1371 216 1405 237
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 867 1738 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1738 867
-rect 0 827 1738 833
-rect 1636 587 1694 593
-rect 1614 553 1648 587
-rect 1682 553 1694 587
-rect 1636 547 1694 553
-rect 968 513 1026 519
-rect 1465 513 1523 519
-rect 968 479 980 513
-rect 1014 479 1192 513
-rect 1443 479 1477 513
-rect 1511 479 1523 513
-rect 968 473 1026 479
-rect 1157 478 1192 479
-rect 426 439 484 445
-rect 872 439 930 445
-rect 1071 439 1129 445
-rect 426 405 438 439
-rect 472 405 884 439
-rect 918 405 1083 439
-rect 1117 405 1129 439
-rect 109 398 167 404
-rect 426 399 484 405
-rect 872 399 930 405
-rect 1071 399 1129 405
-rect 109 364 121 398
-rect 155 364 167 398
-rect 109 358 167 364
-rect 354 365 412 371
-rect 872 365 930 371
-rect 1081 365 1133 371
-rect 35 324 93 330
-rect 35 290 47 324
-rect 81 290 93 324
-rect 35 283 93 290
-rect 121 291 155 358
-rect 354 331 366 365
-rect 400 331 434 365
-rect 872 331 884 365
-rect 918 331 1087 365
-rect 1121 331 1133 365
-rect 354 325 412 331
-rect 872 325 930 331
-rect 1081 325 1133 331
-rect 1161 359 1192 478
-rect 1465 473 1523 479
-rect 1485 359 1543 365
-rect 1161 325 1497 359
-rect 1531 325 1543 359
-rect 1485 319 1543 325
-rect 622 291 680 297
-rect 47 211 81 283
-rect 121 257 634 291
-rect 668 257 680 291
-rect 622 251 680 257
-rect 708 291 766 297
-rect 849 291 896 297
-rect 1191 291 1249 297
-rect 708 257 720 291
-rect 754 257 856 291
-rect 890 257 1203 291
-rect 1237 257 1249 291
-rect 708 251 766 257
-rect 849 251 896 257
-rect 1191 251 1249 257
-rect 1355 250 1417 256
-rect 1355 216 1371 250
-rect 1405 216 1417 250
-rect 1355 212 1417 216
-rect 281 211 1417 212
-rect 47 210 1417 211
-rect 47 183 1405 210
-rect 0 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 348 383 348 1 D
-port 1 n
-rlabel viali 1100 422 1100 422 1 CK
-port 2 n
-rlabel viali 1665 570 1665 570 1 Q
-port 4 n
-rlabel viali 1495 496 1495 496 1 QN
-port 3 n
-rlabel viali 64 307 64 307 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__dffsr_1.mag b/12T_hs/sky130_osu_sc_12T_hs__dffsr_1.mag
deleted file mode 100644
index 224222b..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__dffsr_1.mag
+++ /dev/null
@@ -1,939 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864450
-<< checkpaint >>
-rect -1210 -1243 3248 2131
-<< nwell >>
-rect -10 485 2090 897
-<< pmos >>
-rect 80 521 110 773
-rect 270 521 300 773
-rect 356 521 386 773
-rect 442 521 472 773
-rect 632 521 662 773
-rect 704 521 734 773
-rect 824 521 854 773
-rect 896 521 926 773
-rect 982 521 1012 773
-rect 1054 521 1084 773
-rect 1174 521 1204 773
-rect 1246 521 1276 773
-rect 1332 521 1362 773
-rect 1522 521 1552 773
-rect 1608 521 1638 773
-rect 1694 521 1724 773
-rect 1884 521 1914 773
-rect 1970 521 2000 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 272 115 302 199
-rect 370 115 400 225
-rect 442 115 472 225
-rect 632 115 662 225
-rect 704 115 734 225
-rect 824 115 854 225
-rect 896 115 926 225
-rect 982 115 1012 225
-rect 1054 115 1084 225
-rect 1174 115 1204 225
-rect 1246 115 1276 225
-rect 1332 115 1362 225
-rect 1522 115 1552 225
-rect 1594 115 1624 225
-rect 1692 115 1722 199
-rect 1884 115 1914 225
-rect 1970 115 2000 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 225
-rect 317 199 370 225
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-rect 219 165 272 199
-rect 219 131 227 165
-rect 261 131 272 165
-rect 219 115 272 131
-rect 302 171 370 199
-rect 302 131 325 171
-rect 359 131 370 171
-rect 302 115 370 131
-rect 400 115 442 225
-rect 472 171 525 225
-rect 472 131 483 171
-rect 517 131 525 171
-rect 472 115 525 131
-rect 579 171 632 225
-rect 579 131 587 171
-rect 621 131 632 171
-rect 579 115 632 131
-rect 662 115 704 225
-rect 734 171 824 225
-rect 734 131 745 171
-rect 813 131 824 171
-rect 734 115 824 131
-rect 854 115 896 225
-rect 926 165 982 225
-rect 926 131 937 165
-rect 971 131 982 165
-rect 926 115 982 131
-rect 1012 115 1054 225
-rect 1084 171 1174 225
-rect 1084 131 1095 171
-rect 1163 131 1174 171
-rect 1084 115 1174 131
-rect 1204 115 1246 225
-rect 1276 171 1332 225
-rect 1276 131 1287 171
-rect 1321 131 1332 171
-rect 1276 115 1332 131
-rect 1362 171 1415 225
-rect 1362 131 1373 171
-rect 1407 131 1415 171
-rect 1362 115 1415 131
-rect 1469 171 1522 225
-rect 1469 131 1477 171
-rect 1511 131 1522 171
-rect 1469 115 1522 131
-rect 1552 115 1594 225
-rect 1624 199 1677 225
-rect 1624 171 1692 199
-rect 1624 131 1635 171
-rect 1669 131 1692 171
-rect 1624 115 1692 131
-rect 1722 165 1775 199
-rect 1722 131 1733 165
-rect 1767 131 1775 165
-rect 1722 115 1775 131
-rect 1831 171 1884 225
-rect 1831 131 1839 171
-rect 1873 131 1884 171
-rect 1831 115 1884 131
-rect 1914 171 1970 225
-rect 1914 131 1925 171
-rect 1959 131 1970 171
-rect 1914 115 1970 131
-rect 2000 171 2053 225
-rect 2000 131 2011 171
-rect 2045 131 2053 171
-rect 2000 115 2053 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-rect 217 757 270 773
-rect 217 629 225 757
-rect 259 629 270 757
-rect 217 521 270 629
-rect 300 757 356 773
-rect 300 629 311 757
-rect 345 629 356 757
-rect 300 521 356 629
-rect 386 757 442 773
-rect 386 723 397 757
-rect 431 723 442 757
-rect 386 521 442 723
-rect 472 757 525 773
-rect 472 629 483 757
-rect 517 629 525 757
-rect 472 521 525 629
-rect 579 757 632 773
-rect 579 629 587 757
-rect 621 629 632 757
-rect 579 521 632 629
-rect 662 521 704 773
-rect 734 757 824 773
-rect 734 561 745 757
-rect 813 561 824 757
-rect 734 521 824 561
-rect 854 521 896 773
-rect 926 757 982 773
-rect 926 629 937 757
-rect 971 629 982 757
-rect 926 521 982 629
-rect 1012 521 1054 773
-rect 1084 757 1174 773
-rect 1084 629 1095 757
-rect 1163 629 1174 757
-rect 1084 521 1174 629
-rect 1204 521 1246 773
-rect 1276 757 1332 773
-rect 1276 595 1287 757
-rect 1321 595 1332 757
-rect 1276 521 1332 595
-rect 1362 757 1415 773
-rect 1362 561 1373 757
-rect 1407 561 1415 757
-rect 1362 521 1415 561
-rect 1469 757 1522 773
-rect 1469 629 1477 757
-rect 1511 629 1522 757
-rect 1469 521 1522 629
-rect 1552 757 1608 773
-rect 1552 723 1563 757
-rect 1597 723 1608 757
-rect 1552 521 1608 723
-rect 1638 757 1694 773
-rect 1638 629 1649 757
-rect 1683 629 1694 757
-rect 1638 521 1694 629
-rect 1724 757 1777 773
-rect 1724 629 1735 757
-rect 1769 629 1777 757
-rect 1724 521 1777 629
-rect 1831 757 1884 773
-rect 1831 561 1839 757
-rect 1873 561 1884 757
-rect 1831 521 1884 561
-rect 1914 757 1970 773
-rect 1914 561 1925 757
-rect 1959 561 1970 757
-rect 1914 521 1970 561
-rect 2000 757 2053 773
-rect 2000 561 2011 757
-rect 2045 561 2053 757
-rect 2000 521 2053 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 227 131 261 165
-rect 325 131 359 171
-rect 483 131 517 171
-rect 587 131 621 171
-rect 745 131 813 171
-rect 937 131 971 165
-rect 1095 131 1163 171
-rect 1287 131 1321 171
-rect 1373 131 1407 171
-rect 1477 131 1511 171
-rect 1635 131 1669 171
-rect 1733 131 1767 165
-rect 1839 131 1873 171
-rect 1925 131 1959 171
-rect 2011 131 2045 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 225 629 259 757
-rect 311 629 345 757
-rect 397 723 431 757
-rect 483 629 517 757
-rect 587 629 621 757
-rect 745 561 813 757
-rect 937 629 971 757
-rect 1095 629 1163 757
-rect 1287 595 1321 757
-rect 1373 561 1407 757
-rect 1477 629 1511 757
-rect 1563 723 1597 757
-rect 1649 629 1683 757
-rect 1735 629 1769 757
-rect 1839 561 1873 757
-rect 1925 561 1959 757
-rect 2011 561 2045 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-rect 1658 827 1682 861
-rect 1716 827 1740 861
-rect 1794 827 1818 861
-rect 1852 827 1876 861
-rect 1930 827 1954 861
-rect 1988 827 2012 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-rect 1682 827 1716 861
-rect 1818 827 1852 861
-rect 1954 827 1988 861
-<< poly >>
-rect 80 773 110 799
-rect 270 773 300 799
-rect 356 773 386 799
-rect 442 773 472 799
-rect 632 773 662 799
-rect 704 773 734 799
-rect 824 773 854 799
-rect 896 773 926 799
-rect 982 773 1012 799
-rect 1054 773 1084 799
-rect 1174 773 1204 799
-rect 1246 773 1276 799
-rect 1332 773 1362 799
-rect 1522 773 1552 799
-rect 1608 773 1638 799
-rect 1694 773 1724 799
-rect 1884 773 1914 799
-rect 1970 773 2000 799
-rect 80 398 110 521
-rect 270 494 300 521
-rect 243 464 300 494
-rect 79 382 133 398
-rect 79 348 89 382
-rect 123 348 133 382
-rect 79 332 133 348
-rect 79 331 110 332
-rect 80 225 110 331
-rect 243 287 273 464
-rect 356 423 386 521
-rect 442 490 472 521
-rect 432 474 486 490
-rect 432 440 442 474
-rect 476 440 486 474
-rect 432 424 486 440
-rect 315 407 386 423
-rect 315 373 325 407
-rect 359 393 386 407
-rect 359 373 400 393
-rect 315 357 400 373
-rect 219 271 273 287
-rect 219 237 229 271
-rect 263 253 273 271
-rect 356 259 400 357
-rect 263 237 302 253
-rect 219 221 302 237
-rect 370 225 400 259
-rect 442 225 472 424
-rect 632 381 662 521
-rect 704 490 734 521
-rect 704 474 770 490
-rect 704 440 720 474
-rect 754 440 770 474
-rect 704 430 770 440
-rect 824 385 854 521
-rect 896 484 926 521
-rect 982 484 1012 521
-rect 896 474 1012 484
-rect 896 440 928 474
-rect 962 440 1012 474
-rect 896 430 1012 440
-rect 1054 385 1084 521
-rect 1174 490 1204 521
-rect 1138 474 1204 490
-rect 1138 440 1154 474
-rect 1188 440 1204 474
-rect 1138 430 1204 440
-rect 632 365 686 381
-rect 632 331 642 365
-rect 676 331 686 365
-rect 632 315 686 331
-rect 728 362 1204 385
-rect 728 355 1160 362
-rect 632 225 662 315
-rect 728 271 758 355
-rect 1150 328 1160 355
-rect 1194 328 1204 362
-rect 704 241 758 271
-rect 800 297 854 313
-rect 800 263 810 297
-rect 844 263 854 297
-rect 800 247 854 263
-rect 704 225 734 241
-rect 824 225 854 247
-rect 896 297 1012 307
-rect 896 263 928 297
-rect 962 263 1012 297
-rect 896 253 1012 263
-rect 896 225 926 253
-rect 982 225 1012 253
-rect 1054 297 1108 313
-rect 1150 312 1204 328
-rect 1054 263 1064 297
-rect 1098 263 1108 297
-rect 1054 247 1108 263
-rect 1054 225 1084 247
-rect 1174 225 1204 312
-rect 1246 375 1276 521
-rect 1332 490 1362 521
-rect 1332 474 1403 490
-rect 1522 484 1552 521
-rect 1332 460 1359 474
-rect 1343 440 1359 460
-rect 1393 440 1403 474
-rect 1343 424 1403 440
-rect 1486 474 1552 484
-rect 1486 440 1502 474
-rect 1536 440 1552 474
-rect 1486 430 1552 440
-rect 1246 359 1300 375
-rect 1246 325 1256 359
-rect 1290 325 1300 359
-rect 1246 309 1300 325
-rect 1246 225 1276 309
-rect 1343 271 1373 424
-rect 1332 241 1373 271
-rect 1486 274 1516 430
-rect 1608 388 1638 521
-rect 1694 483 1724 521
-rect 1884 505 1914 521
-rect 1694 457 1751 483
-rect 1874 475 1914 505
-rect 1694 453 1775 457
-rect 1721 425 1775 453
-rect 1575 372 1638 388
-rect 1575 338 1587 372
-rect 1621 338 1638 372
-rect 1575 322 1638 338
-rect 1486 242 1552 274
-rect 1332 225 1362 241
-rect 1522 225 1552 242
-rect 1594 225 1624 322
-rect 1745 287 1775 425
-rect 1874 375 1904 475
-rect 1970 416 2000 521
-rect 1849 359 1904 375
-rect 1849 325 1859 359
-rect 1893 325 1904 359
-rect 1946 400 2000 416
-rect 1946 366 1956 400
-rect 1990 366 2000 400
-rect 1946 350 2000 366
-rect 1849 309 1904 325
-rect 1745 271 1799 287
-rect 1745 251 1755 271
-rect 1692 237 1755 251
-rect 1789 237 1799 271
-rect 1874 276 1904 309
-rect 1874 246 1914 276
-rect 272 199 302 221
-rect 1692 221 1799 237
-rect 1884 225 1914 246
-rect 1970 225 2000 350
-rect 1692 199 1722 221
-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 348 123 382
-rect 442 440 476 474
-rect 325 373 359 407
-rect 229 237 263 271
-rect 720 440 754 474
-rect 928 440 962 474
-rect 1154 440 1188 474
-rect 642 331 676 365
-rect 1160 328 1194 362
-rect 810 263 844 297
-rect 928 263 962 297
-rect 1064 263 1098 297
-rect 1359 440 1393 474
-rect 1502 440 1536 474
-rect 1256 325 1290 359
-rect 1587 338 1621 372
-rect 1859 325 1893 359
-rect 1956 366 1990 400
-rect 1755 237 1789 271
-<< locali >>
-rect 0 867 2090 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1682 867
-rect 1716 827 1818 867
-rect 1852 827 1954 867
-rect 1988 827 2090 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 398 81 553
-rect 121 469 155 561
-rect 225 757 259 773
-rect 121 435 191 469
-rect 47 382 123 398
-rect 47 348 89 382
-rect 89 332 123 348
-rect 157 291 191 435
-rect 225 339 259 629
-rect 311 757 345 773
-rect 397 757 431 827
-rect 397 707 431 723
-rect 483 757 517 773
-rect 345 629 483 655
-rect 311 621 517 629
-rect 311 613 345 621
-rect 483 613 517 621
-rect 587 757 621 827
-rect 587 613 621 629
-rect 745 757 813 773
-rect 325 553 394 563
-rect 937 757 971 827
-rect 937 613 971 629
-rect 1095 757 1163 773
-rect 813 561 816 579
-rect 325 524 428 553
-rect 537 558 571 559
-rect 745 558 816 561
-rect 1095 558 1163 629
-rect 1287 757 1321 827
-rect 1287 579 1321 595
-rect 1373 757 1407 773
-rect 537 524 816 558
-rect 996 524 1163 558
-rect 1477 757 1511 773
-rect 1563 757 1597 827
-rect 1563 707 1597 723
-rect 1649 757 1683 773
-rect 1511 629 1649 654
-rect 1477 620 1683 629
-rect 1477 613 1511 620
-rect 1649 613 1683 620
-rect 1735 757 1769 773
-rect 1373 558 1407 561
-rect 1373 524 1461 558
-rect 325 407 359 524
-rect 442 474 476 490
-rect 537 474 571 524
-rect 476 440 571 474
-rect 720 474 754 490
-rect 309 373 325 407
-rect 359 373 375 407
-rect 225 305 359 339
-rect 313 291 359 305
-rect 121 257 157 271
-rect 191 257 229 271
-rect 121 237 229 257
-rect 263 237 279 271
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 237
-rect 121 115 155 131
-rect 227 165 261 181
-rect 227 61 261 131
-rect 325 171 359 257
-rect 442 274 476 440
-rect 720 439 754 440
-rect 928 474 962 490
-rect 748 405 844 439
-rect 642 365 676 381
-rect 642 315 676 331
-rect 810 297 844 405
-rect 442 240 776 274
-rect 928 297 962 440
-rect 810 247 844 263
-rect 944 257 962 263
-rect 928 247 962 257
-rect 996 291 1030 524
-rect 1154 474 1188 490
-rect 1154 439 1188 440
-rect 996 247 1030 257
-rect 1064 405 1160 439
-rect 1064 297 1098 405
-rect 1144 328 1160 362
-rect 1194 328 1210 362
-rect 1256 359 1290 479
-rect 1359 474 1393 490
-rect 1359 439 1393 440
-rect 1427 362 1461 524
-rect 1256 309 1290 325
-rect 1407 328 1461 362
-rect 1373 325 1461 328
-rect 1502 474 1536 490
-rect 1064 247 1098 263
-rect 742 187 776 240
-rect 1132 207 1166 251
-rect 325 115 359 131
-rect 483 171 517 187
-rect 483 61 517 131
-rect 587 171 621 187
-rect 742 171 813 187
-rect 742 153 745 171
-rect 587 61 621 131
-rect 745 115 813 131
-rect 937 165 971 181
-rect 937 61 971 131
-rect 1095 171 1166 207
-rect 1163 131 1166 171
-rect 1095 115 1166 131
-rect 1287 171 1321 187
-rect 1287 61 1321 131
-rect 1373 171 1407 325
-rect 1502 291 1536 440
-rect 1570 479 1605 552
-rect 1570 388 1604 479
-rect 1570 372 1637 388
-rect 1570 338 1587 372
-rect 1621 338 1637 372
-rect 1735 359 1769 629
-rect 1839 757 1873 773
-rect 1839 513 1873 561
-rect 1925 757 1959 827
-rect 1925 545 1959 561
-rect 2011 757 2045 773
-rect 2011 539 2045 553
-rect 2011 505 2068 539
-rect 1839 474 1873 479
-rect 1839 440 1990 474
-rect 1956 400 1990 440
-rect 1671 325 1859 359
-rect 1893 325 1909 359
-rect 1671 303 1705 325
-rect 1635 269 1705 303
-rect 1956 291 1990 366
-rect 1373 115 1407 131
-rect 1477 171 1511 187
-rect 1477 61 1511 131
-rect 1635 171 1669 269
-rect 1739 237 1755 271
-rect 1789 237 1805 271
-rect 1839 257 1990 291
-rect 1635 115 1669 131
-rect 1733 165 1767 181
-rect 1733 61 1767 131
-rect 1839 171 1873 257
-rect 2034 224 2068 505
-rect 2011 190 2068 224
-rect 1839 115 1873 131
-rect 1925 171 1959 187
-rect 1925 61 1959 131
-rect 2011 171 2045 190
-rect 2011 115 2045 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 1682 861 1716 867
-rect 1682 833 1716 861
-rect 1818 861 1852 867
-rect 1818 833 1852 861
-rect 1954 861 1988 867
-rect 1954 833 1988 861
-rect 47 553 81 587
-rect 394 553 428 587
-rect 157 257 191 291
-rect 325 257 359 291
-rect 714 405 748 439
-rect 642 331 676 365
-rect 910 263 928 291
-rect 928 263 944 291
-rect 910 257 944 263
-rect 1256 479 1290 513
-rect 996 257 1030 291
-rect 1160 405 1194 439
-rect 1160 328 1194 362
-rect 1359 405 1393 439
-rect 1570 552 1605 586
-rect 1373 328 1407 362
-rect 1132 251 1166 285
-rect 2011 561 2045 587
-rect 2011 553 2045 561
-rect 1839 479 1873 513
-rect 1859 325 1893 359
-rect 1502 257 1536 291
-rect 1755 271 1789 291
-rect 1755 257 1789 271
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 867 2090 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1682 867
-rect 1716 833 1818 867
-rect 1852 833 1954 867
-rect 1988 833 2090 867
-rect 0 827 2090 833
-rect 35 587 93 593
-rect 380 587 439 593
-rect 1558 587 1617 592
-rect 1999 587 2057 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 380 553 394 587
-rect 428 586 1617 587
-rect 428 553 1570 586
-rect 35 547 93 553
-rect 380 547 439 553
-rect 1558 552 1570 553
-rect 1605 552 1617 586
-rect 1977 553 2011 587
-rect 2045 553 2057 587
-rect 1558 546 1617 552
-rect 1999 547 2057 553
-rect 1570 529 1605 546
-rect 1244 514 1303 519
-rect 1244 513 1475 514
-rect 1827 513 1885 519
-rect 1244 479 1256 513
-rect 1290 479 1475 513
-rect 1804 479 1839 513
-rect 1873 479 1885 513
-rect 1244 473 1303 479
-rect 1433 478 1475 479
-rect 702 439 760 445
-rect 1148 439 1206 445
-rect 1347 439 1405 445
-rect 702 405 714 439
-rect 748 405 1160 439
-rect 1194 405 1359 439
-rect 1393 405 1405 439
-rect 702 399 760 405
-rect 1148 399 1206 405
-rect 1347 399 1405 405
-rect 630 365 688 371
-rect 630 331 642 365
-rect 676 331 710 365
-rect 1143 362 1210 368
-rect 1367 362 1419 368
-rect 630 325 688 331
-rect 1143 328 1160 362
-rect 1194 328 1373 362
-rect 1407 328 1419 362
-rect 1143 322 1210 328
-rect 1367 322 1419 328
-rect 1447 359 1475 478
-rect 1827 473 1885 479
-rect 1847 359 1905 365
-rect 1447 325 1859 359
-rect 1893 325 1905 359
-rect 1847 319 1905 325
-rect 145 291 203 297
-rect 145 257 157 291
-rect 191 257 203 291
-rect 145 251 203 257
-rect 313 291 371 297
-rect 898 291 956 297
-rect 313 257 325 291
-rect 359 257 910 291
-rect 944 257 956 291
-rect 313 251 371 257
-rect 898 251 956 257
-rect 984 291 1042 297
-rect 1490 291 1548 297
-rect 984 257 996 291
-rect 1030 285 1502 291
-rect 1030 257 1132 285
-rect 984 251 1042 257
-rect 1120 251 1132 257
-rect 1166 257 1502 285
-rect 1536 257 1548 291
-rect 1166 251 1178 257
-rect 1490 251 1548 257
-rect 1743 291 1802 297
-rect 1743 257 1755 291
-rect 1789 257 1802 291
-rect 1743 251 1802 257
-rect 157 217 191 251
-rect 1126 245 1172 251
-rect 1755 217 1789 251
-rect 157 183 1789 217
-rect 0 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel viali 659 348 659 348 1 D
-port 1 n
-rlabel viali 1376 422 1376 422 1 CK
-port 2 n
-rlabel viali 1857 496 1857 496 1 QN
-port 3 n
-rlabel viali 65 570 65 570 1 RN
-port 5 n
-rlabel viali 2028 570 2028 570 1 Q
-port 6 n
-rlabel viali 1588 569 1588 569 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__dffsr_l.mag b/12T_hs/sky130_osu_sc_12T_hs__dffsr_l.mag
deleted file mode 100644
index b121d88..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__dffsr_l.mag
+++ /dev/null
@@ -1,942 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864450
-<< checkpaint >>
-rect -1210 -1243 3248 2131
-<< nwell >>
-rect -10 485 2090 897
-<< pmos >>
-rect 80 521 110 773
-rect 270 521 300 773
-rect 356 521 386 773
-rect 442 521 472 773
-rect 632 521 662 773
-rect 704 521 734 773
-rect 824 521 854 773
-rect 896 521 926 773
-rect 982 521 1012 773
-rect 1054 521 1084 773
-rect 1174 521 1204 773
-rect 1246 521 1276 773
-rect 1332 521 1362 773
-rect 1522 521 1552 773
-rect 1608 521 1638 773
-rect 1694 521 1724 773
-rect 1884 605 1914 773
-rect 1970 605 2000 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 272 115 302 199
-rect 370 115 400 225
-rect 442 115 472 225
-rect 632 115 662 225
-rect 704 115 734 225
-rect 824 115 854 225
-rect 896 115 926 225
-rect 982 115 1012 225
-rect 1054 115 1084 225
-rect 1174 115 1204 225
-rect 1246 115 1276 225
-rect 1332 115 1362 225
-rect 1522 115 1552 225
-rect 1594 115 1624 225
-rect 1692 115 1722 199
-rect 1884 115 1914 199
-rect 1970 115 2000 199
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 225
-rect 317 199 370 225
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-rect 219 165 272 199
-rect 219 131 227 165
-rect 261 131 272 165
-rect 219 115 272 131
-rect 302 171 370 199
-rect 302 131 325 171
-rect 359 131 370 171
-rect 302 115 370 131
-rect 400 115 442 225
-rect 472 171 525 225
-rect 472 131 483 171
-rect 517 131 525 171
-rect 472 115 525 131
-rect 579 171 632 225
-rect 579 131 587 171
-rect 621 131 632 171
-rect 579 115 632 131
-rect 662 115 704 225
-rect 734 171 824 225
-rect 734 131 745 171
-rect 813 131 824 171
-rect 734 115 824 131
-rect 854 115 896 225
-rect 926 165 982 225
-rect 926 131 937 165
-rect 971 131 982 165
-rect 926 115 982 131
-rect 1012 115 1054 225
-rect 1084 171 1174 225
-rect 1084 131 1095 171
-rect 1163 131 1174 171
-rect 1084 115 1174 131
-rect 1204 115 1246 225
-rect 1276 171 1332 225
-rect 1276 131 1287 171
-rect 1321 131 1332 171
-rect 1276 115 1332 131
-rect 1362 171 1415 225
-rect 1362 131 1373 171
-rect 1407 131 1415 171
-rect 1362 115 1415 131
-rect 1469 171 1522 225
-rect 1469 131 1477 171
-rect 1511 131 1522 171
-rect 1469 115 1522 131
-rect 1552 115 1594 225
-rect 1624 199 1677 225
-rect 1624 171 1692 199
-rect 1624 131 1635 171
-rect 1669 131 1692 171
-rect 1624 115 1692 131
-rect 1722 165 1775 199
-rect 1722 131 1733 165
-rect 1767 131 1775 165
-rect 1722 115 1775 131
-rect 1831 171 1884 199
-rect 1831 131 1839 171
-rect 1873 131 1884 171
-rect 1831 115 1884 131
-rect 1914 171 1970 199
-rect 1914 131 1925 171
-rect 1959 131 1970 171
-rect 1914 115 1970 131
-rect 2000 171 2053 199
-rect 2000 131 2011 171
-rect 2045 131 2053 171
-rect 2000 115 2053 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-rect 217 757 270 773
-rect 217 629 225 757
-rect 259 629 270 757
-rect 217 521 270 629
-rect 300 757 356 773
-rect 300 629 311 757
-rect 345 629 356 757
-rect 300 521 356 629
-rect 386 757 442 773
-rect 386 723 397 757
-rect 431 723 442 757
-rect 386 521 442 723
-rect 472 757 525 773
-rect 472 629 483 757
-rect 517 629 525 757
-rect 472 521 525 629
-rect 579 757 632 773
-rect 579 629 587 757
-rect 621 629 632 757
-rect 579 521 632 629
-rect 662 521 704 773
-rect 734 757 824 773
-rect 734 561 745 757
-rect 813 561 824 757
-rect 734 521 824 561
-rect 854 521 896 773
-rect 926 757 982 773
-rect 926 629 937 757
-rect 971 629 982 757
-rect 926 521 982 629
-rect 1012 521 1054 773
-rect 1084 757 1174 773
-rect 1084 629 1095 757
-rect 1163 629 1174 757
-rect 1084 521 1174 629
-rect 1204 521 1246 773
-rect 1276 757 1332 773
-rect 1276 595 1287 757
-rect 1321 595 1332 757
-rect 1276 521 1332 595
-rect 1362 757 1415 773
-rect 1362 561 1373 757
-rect 1407 561 1415 757
-rect 1362 521 1415 561
-rect 1469 757 1522 773
-rect 1469 629 1477 757
-rect 1511 629 1522 757
-rect 1469 521 1522 629
-rect 1552 757 1608 773
-rect 1552 723 1563 757
-rect 1597 723 1608 757
-rect 1552 521 1608 723
-rect 1638 757 1694 773
-rect 1638 629 1649 757
-rect 1683 629 1694 757
-rect 1638 521 1694 629
-rect 1724 757 1777 773
-rect 1724 629 1735 757
-rect 1769 629 1777 757
-rect 1724 521 1777 629
-rect 1831 757 1884 773
-rect 1831 617 1839 757
-rect 1873 617 1884 757
-rect 1831 605 1884 617
-rect 1914 757 1970 773
-rect 1914 617 1925 757
-rect 1959 617 1970 757
-rect 1914 605 1970 617
-rect 2000 757 2053 773
-rect 2000 617 2011 757
-rect 2045 617 2053 757
-rect 2000 605 2053 617
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 227 131 261 165
-rect 325 131 359 171
-rect 483 131 517 171
-rect 587 131 621 171
-rect 745 131 813 171
-rect 937 131 971 165
-rect 1095 131 1163 171
-rect 1287 131 1321 171
-rect 1373 131 1407 171
-rect 1477 131 1511 171
-rect 1635 131 1669 171
-rect 1733 131 1767 165
-rect 1839 131 1873 171
-rect 1925 131 1959 171
-rect 2011 131 2045 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 225 629 259 757
-rect 311 629 345 757
-rect 397 723 431 757
-rect 483 629 517 757
-rect 587 629 621 757
-rect 745 561 813 757
-rect 937 629 971 757
-rect 1095 629 1163 757
-rect 1287 595 1321 757
-rect 1373 561 1407 757
-rect 1477 629 1511 757
-rect 1563 723 1597 757
-rect 1649 629 1683 757
-rect 1735 629 1769 757
-rect 1839 617 1873 757
-rect 1925 617 1959 757
-rect 2011 617 2045 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-rect 1658 827 1682 861
-rect 1716 827 1740 861
-rect 1794 827 1818 861
-rect 1852 827 1876 861
-rect 1930 827 1954 861
-rect 1988 827 2012 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-rect 1682 827 1716 861
-rect 1818 827 1852 861
-rect 1954 827 1988 861
-<< poly >>
-rect 80 773 110 799
-rect 270 773 300 799
-rect 356 773 386 799
-rect 442 773 472 799
-rect 632 773 662 799
-rect 704 773 734 799
-rect 824 773 854 799
-rect 896 773 926 799
-rect 982 773 1012 799
-rect 1054 773 1084 799
-rect 1174 773 1204 799
-rect 1246 773 1276 799
-rect 1332 773 1362 799
-rect 1522 773 1552 799
-rect 1608 773 1638 799
-rect 1694 773 1724 799
-rect 1884 773 1914 799
-rect 1970 773 2000 799
-rect 80 398 110 521
-rect 270 495 300 521
-rect 243 465 300 495
-rect 79 382 133 398
-rect 79 348 89 382
-rect 123 348 133 382
-rect 79 332 133 348
-rect 79 331 110 332
-rect 80 225 110 331
-rect 243 287 273 465
-rect 356 423 386 521
-rect 442 490 472 521
-rect 432 474 486 490
-rect 432 440 442 474
-rect 476 440 486 474
-rect 432 424 486 440
-rect 315 407 386 423
-rect 315 373 325 407
-rect 359 393 386 407
-rect 359 373 400 393
-rect 315 357 400 373
-rect 219 271 273 287
-rect 219 237 229 271
-rect 263 253 273 271
-rect 356 259 400 357
-rect 263 237 302 253
-rect 219 221 302 237
-rect 370 225 400 259
-rect 442 225 472 424
-rect 632 381 662 521
-rect 704 490 734 521
-rect 704 474 770 490
-rect 704 440 720 474
-rect 754 440 770 474
-rect 704 430 770 440
-rect 824 385 854 521
-rect 896 484 926 521
-rect 982 484 1012 521
-rect 896 474 1012 484
-rect 896 440 928 474
-rect 962 440 1012 474
-rect 896 430 1012 440
-rect 1054 385 1084 521
-rect 1174 490 1204 521
-rect 1138 474 1204 490
-rect 1138 440 1154 474
-rect 1188 440 1204 474
-rect 1138 430 1204 440
-rect 632 365 686 381
-rect 632 331 642 365
-rect 676 331 686 365
-rect 632 315 686 331
-rect 728 362 1204 385
-rect 728 355 1160 362
-rect 632 225 662 315
-rect 728 271 758 355
-rect 1150 328 1160 355
-rect 1194 328 1204 362
-rect 704 241 758 271
-rect 800 297 854 313
-rect 800 263 810 297
-rect 844 263 854 297
-rect 800 247 854 263
-rect 704 225 734 241
-rect 824 225 854 247
-rect 896 297 1012 307
-rect 896 263 928 297
-rect 962 263 1012 297
-rect 896 253 1012 263
-rect 896 225 926 253
-rect 982 225 1012 253
-rect 1054 297 1108 313
-rect 1150 312 1204 328
-rect 1054 263 1064 297
-rect 1098 263 1108 297
-rect 1054 247 1108 263
-rect 1054 225 1084 247
-rect 1174 225 1204 312
-rect 1246 375 1276 521
-rect 1332 490 1362 521
-rect 1332 474 1403 490
-rect 1522 484 1552 521
-rect 1332 460 1359 474
-rect 1343 440 1359 460
-rect 1393 440 1403 474
-rect 1343 424 1403 440
-rect 1486 474 1552 484
-rect 1486 440 1502 474
-rect 1536 440 1552 474
-rect 1486 430 1552 440
-rect 1246 359 1300 375
-rect 1246 325 1256 359
-rect 1290 325 1300 359
-rect 1246 309 1300 325
-rect 1246 225 1276 309
-rect 1343 271 1373 424
-rect 1332 241 1373 271
-rect 1486 274 1516 430
-rect 1608 388 1638 521
-rect 1694 483 1724 521
-rect 1884 505 1914 605
-rect 1694 457 1751 483
-rect 1874 475 1914 505
-rect 1694 453 1775 457
-rect 1721 425 1775 453
-rect 1575 372 1638 388
-rect 1575 338 1587 372
-rect 1621 338 1638 372
-rect 1575 322 1638 338
-rect 1486 242 1552 274
-rect 1332 225 1362 241
-rect 1522 225 1552 242
-rect 1594 225 1624 322
-rect 1745 287 1775 425
-rect 1874 375 1904 475
-rect 1970 416 2000 605
-rect 1849 359 1904 375
-rect 1849 325 1859 359
-rect 1893 325 1904 359
-rect 1946 400 2000 416
-rect 1946 366 1956 400
-rect 1990 366 2000 400
-rect 1946 350 2000 366
-rect 1849 309 1904 325
-rect 1745 271 1799 287
-rect 1745 245 1755 271
-rect 1692 237 1755 245
-rect 1789 237 1799 271
-rect 272 199 302 221
-rect 1692 215 1799 237
-rect 1874 264 1904 309
-rect 1874 234 1914 264
-rect 1692 199 1722 215
-rect 1884 199 1914 234
-rect 1970 199 2000 350
-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 348 123 382
-rect 442 440 476 474
-rect 325 373 359 407
-rect 229 237 263 271
-rect 720 440 754 474
-rect 928 440 962 474
-rect 1154 440 1188 474
-rect 642 331 676 365
-rect 1160 328 1194 362
-rect 810 263 844 297
-rect 928 263 962 297
-rect 1064 263 1098 297
-rect 1359 440 1393 474
-rect 1502 440 1536 474
-rect 1256 325 1290 359
-rect 1587 338 1621 372
-rect 1859 325 1893 359
-rect 1956 366 1990 400
-rect 1755 237 1789 271
-<< locali >>
-rect 0 867 2090 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1682 867
-rect 1716 827 1818 867
-rect 1852 827 1954 867
-rect 1988 827 2090 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 398 81 553
-rect 121 469 155 561
-rect 225 757 259 773
-rect 121 435 191 469
-rect 47 382 123 398
-rect 47 348 89 382
-rect 89 332 123 348
-rect 157 291 191 435
-rect 225 339 259 629
-rect 311 757 345 773
-rect 397 757 431 827
-rect 397 707 431 723
-rect 483 757 517 773
-rect 345 629 483 655
-rect 311 621 517 629
-rect 311 613 345 621
-rect 483 613 517 621
-rect 587 757 621 827
-rect 587 613 621 629
-rect 745 757 813 773
-rect 325 553 394 563
-rect 937 757 971 827
-rect 937 613 971 629
-rect 1095 757 1163 773
-rect 813 561 816 579
-rect 325 524 428 553
-rect 537 558 571 559
-rect 745 558 816 561
-rect 1095 558 1163 629
-rect 1287 757 1321 827
-rect 1287 579 1321 595
-rect 1373 757 1407 773
-rect 537 524 816 558
-rect 996 524 1163 558
-rect 1477 757 1511 773
-rect 1563 757 1597 827
-rect 1563 707 1597 723
-rect 1649 757 1683 773
-rect 1511 629 1649 654
-rect 1477 620 1683 629
-rect 1477 613 1511 620
-rect 1649 613 1683 620
-rect 1735 757 1769 773
-rect 1373 558 1407 561
-rect 1373 524 1461 558
-rect 325 407 359 524
-rect 442 474 476 490
-rect 537 474 571 524
-rect 476 440 571 474
-rect 720 474 754 490
-rect 309 373 325 407
-rect 359 373 375 407
-rect 225 305 359 339
-rect 313 291 359 305
-rect 121 257 157 271
-rect 191 257 229 271
-rect 121 237 229 257
-rect 263 237 279 271
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 237
-rect 121 115 155 131
-rect 227 165 261 181
-rect 227 61 261 131
-rect 325 171 359 257
-rect 442 274 476 440
-rect 720 439 754 440
-rect 928 474 962 490
-rect 748 405 844 439
-rect 642 365 676 381
-rect 642 315 676 331
-rect 810 297 844 405
-rect 442 240 776 274
-rect 928 297 962 440
-rect 810 247 844 263
-rect 944 257 962 263
-rect 928 247 962 257
-rect 996 291 1030 524
-rect 1154 474 1188 490
-rect 1154 439 1188 440
-rect 996 247 1030 257
-rect 1064 405 1160 439
-rect 1064 297 1098 405
-rect 1144 328 1160 362
-rect 1194 328 1210 362
-rect 1256 359 1290 479
-rect 1359 474 1393 490
-rect 1359 439 1393 440
-rect 1427 362 1461 524
-rect 1256 309 1290 325
-rect 1407 328 1461 362
-rect 1373 325 1461 328
-rect 1502 474 1536 490
-rect 1064 247 1098 263
-rect 742 187 776 240
-rect 1132 207 1166 251
-rect 325 115 359 131
-rect 483 171 517 187
-rect 483 61 517 131
-rect 587 171 621 187
-rect 742 171 813 187
-rect 742 153 745 171
-rect 587 61 621 131
-rect 745 115 813 131
-rect 937 165 971 181
-rect 937 61 971 131
-rect 1095 171 1166 207
-rect 1163 131 1166 171
-rect 1095 115 1166 131
-rect 1287 171 1321 187
-rect 1287 61 1321 131
-rect 1373 171 1407 325
-rect 1502 291 1536 440
-rect 1570 479 1605 552
-rect 1570 388 1604 479
-rect 1570 372 1637 388
-rect 1570 338 1587 372
-rect 1621 338 1637 372
-rect 1735 359 1769 629
-rect 1839 757 1873 773
-rect 1839 513 1873 617
-rect 1925 757 1959 827
-rect 2011 757 2045 773
-rect 1925 601 1959 617
-rect 2010 617 2011 666
-rect 2010 539 2045 617
-rect 2010 521 2068 539
-rect 2011 505 2068 521
-rect 1839 474 1873 479
-rect 1839 440 1990 474
-rect 1956 400 1990 440
-rect 1671 325 1859 359
-rect 1893 325 1909 359
-rect 1671 303 1705 325
-rect 1635 269 1705 303
-rect 1956 291 1990 366
-rect 1373 115 1407 131
-rect 1477 171 1511 187
-rect 1477 61 1511 131
-rect 1635 171 1669 269
-rect 1739 237 1755 271
-rect 1789 237 1805 271
-rect 1839 257 1990 291
-rect 2034 439 2068 505
-rect 1635 115 1669 131
-rect 1733 165 1767 181
-rect 1733 61 1767 131
-rect 1839 171 1873 257
-rect 2034 224 2068 405
-rect 2011 190 2068 224
-rect 1839 115 1873 131
-rect 1925 171 1959 187
-rect 1925 61 1959 131
-rect 2011 171 2045 190
-rect 2011 115 2045 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 1682 861 1716 867
-rect 1682 833 1716 861
-rect 1818 861 1852 867
-rect 1818 833 1852 861
-rect 1954 861 1988 867
-rect 1954 833 1988 861
-rect 47 553 81 587
-rect 394 553 428 587
-rect 157 257 191 291
-rect 325 257 359 291
-rect 714 405 748 439
-rect 642 331 676 365
-rect 910 263 928 291
-rect 928 263 944 291
-rect 910 257 944 263
-rect 1256 479 1290 513
-rect 996 257 1030 291
-rect 1160 405 1194 439
-rect 1160 328 1194 362
-rect 1359 405 1393 439
-rect 1570 552 1605 586
-rect 1373 328 1407 362
-rect 1132 251 1166 285
-rect 1839 479 1873 513
-rect 1859 325 1893 359
-rect 1502 257 1536 291
-rect 1755 271 1789 291
-rect 1755 257 1789 271
-rect 2034 405 2068 439
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 867 2090 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1682 867
-rect 1716 833 1818 867
-rect 1852 833 1954 867
-rect 1988 833 2090 867
-rect 0 827 2090 833
-rect 35 587 93 593
-rect 380 587 439 593
-rect 1558 587 1617 592
-rect 35 553 47 587
-rect 81 553 127 587
-rect 380 553 394 587
-rect 428 586 1617 587
-rect 428 553 1570 586
-rect 35 547 93 553
-rect 380 547 439 553
-rect 1558 552 1570 553
-rect 1605 552 1617 586
-rect 1558 546 1617 552
-rect 1570 529 1605 546
-rect 1244 514 1303 519
-rect 1244 513 1475 514
-rect 1827 513 1885 519
-rect 1244 479 1256 513
-rect 1290 479 1475 513
-rect 1804 479 1839 513
-rect 1873 479 1885 513
-rect 1244 473 1303 479
-rect 1433 478 1475 479
-rect 702 439 760 445
-rect 1148 439 1206 445
-rect 1347 439 1405 445
-rect 702 405 714 439
-rect 748 405 1160 439
-rect 1194 405 1359 439
-rect 1393 405 1405 439
-rect 702 399 760 405
-rect 1148 399 1206 405
-rect 1347 399 1405 405
-rect 630 365 688 371
-rect 630 331 642 365
-rect 676 331 710 365
-rect 1143 362 1210 368
-rect 1367 362 1419 368
-rect 630 325 688 331
-rect 1143 328 1160 362
-rect 1194 328 1373 362
-rect 1407 328 1419 362
-rect 1143 322 1210 328
-rect 1367 322 1419 328
-rect 1447 359 1475 478
-rect 1827 473 1885 479
-rect 2022 439 2080 445
-rect 2022 438 2034 439
-rect 2000 405 2034 438
-rect 2068 405 2080 439
-rect 2000 404 2080 405
-rect 2022 399 2080 404
-rect 1847 359 1905 365
-rect 1447 325 1859 359
-rect 1893 325 1905 359
-rect 1847 319 1905 325
-rect 145 291 203 297
-rect 145 257 157 291
-rect 191 257 203 291
-rect 145 251 203 257
-rect 313 291 371 297
-rect 898 291 956 297
-rect 313 257 325 291
-rect 359 257 910 291
-rect 944 257 956 291
-rect 313 251 371 257
-rect 898 251 956 257
-rect 984 291 1042 297
-rect 1490 291 1548 297
-rect 984 257 996 291
-rect 1030 285 1502 291
-rect 1030 257 1132 285
-rect 984 251 1042 257
-rect 1120 251 1132 257
-rect 1166 257 1502 285
-rect 1536 257 1548 291
-rect 1166 251 1178 257
-rect 1490 251 1548 257
-rect 1743 291 1802 297
-rect 1743 257 1755 291
-rect 1789 257 1802 291
-rect 1743 251 1802 257
-rect 157 217 191 251
-rect 1126 245 1172 251
-rect 1755 217 1789 251
-rect 157 183 1789 217
-rect 0 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel viali 659 348 659 348 1 D
-port 1 n
-rlabel viali 1376 422 1376 422 1 CK
-port 2 n
-rlabel viali 1857 496 1857 496 1 QN
-port 3 n
-rlabel viali 65 570 65 570 1 RN
-port 5 n
-rlabel viali 2051 422 2051 422 1 Q
-rlabel viali 1588 570 1588 570 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__fill_1.mag b/12T_hs/sky130_osu_sc_12T_hs__fill_1.mag
deleted file mode 100644
index f230c46..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__fill_1.mag
+++ /dev/null
@@ -1,24 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095898
-<< 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 485 41 897
-<< locali >>
-rect 0 827 22 888
-rect 0 0 22 61
-<< metal1 >>
-rect 0 827 22 888
-rect 0 0 22 61
-<< labels >>
-rlabel metal1 11 855 11 855 1 vdd
-rlabel metal1 11 28 11 28 1 gnd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__fill_16.mag b/12T_hs/sky130_osu_sc_12T_hs__fill_16.mag
deleted file mode 100644
index 28a847c..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__fill_16.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095907
-<< checkpaint >>
-rect -1269 2461 1615 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1615 -1129
-<< nwell >>
-rect -9 485 355 897
-<< locali >>
-rect 0 827 352 888
-rect 0 0 352 61
-<< metal1 >>
-rect 0 827 352 888
-rect 0 0 352 61
-<< labels >>
-rlabel metal1 199 856 199 856 1 vdd
-rlabel metal1 196 30 196 30 1 gnd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__fill_2.mag b/12T_hs/sky130_osu_sc_12T_hs__fill_2.mag
deleted file mode 100644
index fbe08cb..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__fill_2.mag
+++ /dev/null
@@ -1,24 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095901
-<< 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 485 50 897
-<< locali >>
-rect 0 827 44 888
-rect 0 0 44 61
-<< metal1 >>
-rect 0 827 44 888
-rect 0 0 44 61
-<< labels >>
-rlabel metal1 22 856 22 856 1 vdd
-rlabel metal1 23 28 23 28 1 gnd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__fill_32.mag b/12T_hs/sky130_osu_sc_12T_hs__fill_32.mag
deleted file mode 100644
index c15fb7b..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__fill_32.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095910
-<< checkpaint >>
-rect -1269 2461 1967 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1967 -1129
-<< nwell >>
-rect -9 485 707 897
-<< locali >>
-rect 0 827 704 888
-rect 0 0 704 61
-<< metal1 >>
-rect 0 827 704 888
-rect 0 0 704 61
-<< labels >>
-rlabel metal1 374 854 374 854 1 vdd
-rlabel metal1 363 26 363 26 1 gnd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__fill_4.mag b/12T_hs/sky130_osu_sc_12T_hs__fill_4.mag
deleted file mode 100644
index 994a525..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__fill_4.mag
+++ /dev/null
@@ -1,22 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095903
-<< 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 485 96 897
-<< locali >>
-rect 0 827 88 888
-rect 0 0 88 61
-<< metal1 >>
-rect 0 827 88 888
-rect 0 0 88 61
-<< labels >>
-rlabel metal1 72 857 72 857 1 vdd
-rlabel metal1 71 28 71 28 1 gnd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__fill_8.mag b/12T_hs/sky130_osu_sc_12T_hs__fill_8.mag
deleted file mode 100644
index f77ad65..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__fill_8.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095905
-<< checkpaint >>
-rect -1269 2461 1439 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1439 -1129
-<< nwell >>
-rect -9 485 179 897
-<< locali >>
-rect 0 827 176 888
-rect 0 0 176 61
-<< metal1 >>
-rect 0 827 176 888
-rect 0 0 176 61
-<< labels >>
-rlabel metal1 111 859 111 859 1 vdd
-rlabel metal1 112 28 112 28 1 gnd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__inv_1.mag b/12T_hs/sky130_osu_sc_12T_hs__inv_1.mag
deleted file mode 100644
index df79ac7..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__inv_1.mag
+++ /dev/null
@@ -1,113 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864452
-<< checkpaint >>
-rect -1209 -1243 1345 2131
-<< nwell >>
-rect -9 485 199 897
-<< pmos >>
-rect 80 521 110 773
-<< nmoslvt >>
-rect 80 115 110 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 225
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 398 110 521
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 225 110 332
-rect 80 89 110 115
-<< polycont >>
-rect 90 348 124 382
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 121 183 155 217
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 167 513
-rect 109 473 167 479
-rect 121 223 155 473
-rect 109 217 167 223
-rect 109 183 121 217
-rect 155 183 167 217
-rect 109 177 167 183
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 151 345 151 345 1 Y
-port 1 n
-rlabel viali 64 570 64 570 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__inv_10.mag b/12T_hs/sky130_osu_sc_12T_hs__inv_10.mag
deleted file mode 100644
index 8c807e6..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__inv_10.mag
+++ /dev/null
@@ -1,418 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864452
-<< checkpaint >>
-rect -1209 -1243 2161 2131
-<< nwell >>
-rect -9 485 990 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-rect 768 521 798 773
-rect 854 521 884 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-rect 596 115 626 225
-rect 682 115 712 225
-rect 768 115 798 225
-rect 854 115 884 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 225
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 225
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 225
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 225
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 225
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 225
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 768 225
-rect 712 131 723 171
-rect 757 131 768 171
-rect 712 115 768 131
-rect 798 171 854 225
-rect 798 131 809 171
-rect 843 131 854 171
-rect 798 115 854 131
-rect 884 171 937 225
-rect 884 131 895 171
-rect 929 131 937 171
-rect 884 115 937 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 768 773
-rect 712 561 723 757
-rect 757 561 768 757
-rect 712 521 768 561
-rect 798 757 854 773
-rect 798 561 809 757
-rect 843 561 854 757
-rect 798 521 854 561
-rect 884 757 937 773
-rect 884 561 895 757
-rect 929 561 937 757
-rect 884 521 937 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-rect 809 131 843 171
-rect 895 131 929 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-rect 809 561 843 757
-rect 895 561 929 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 799
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 768 773 798 799
-rect 854 773 884 799
-rect 80 496 110 521
-rect 166 496 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 596 496 626 521
-rect 682 496 712 521
-rect 768 496 798 521
-rect 854 496 884 521
-rect 80 466 884 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 424 274 454 466
-rect 80 244 884 274
-rect 80 225 110 244
-rect 166 225 196 244
-rect 252 225 282 244
-rect 338 225 368 244
-rect 424 225 454 244
-rect 510 225 540 244
-rect 596 225 626 244
-rect 682 225 712 244
-rect 768 225 798 244
-rect 854 225 884 244
-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 348 124 382
-<< locali >>
-rect 0 867 990 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 990 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 293 757 327 773
-rect 293 513 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 513 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 637 757 671 773
-rect 637 513 671 561
-rect 723 757 757 827
-rect 723 545 757 561
-rect 809 757 843 773
-rect 809 513 843 561
-rect 895 757 929 827
-rect 895 545 929 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 637 171 671 183
-rect 637 115 671 131
-rect 723 171 757 187
-rect 723 61 757 131
-rect 809 171 843 183
-rect 809 115 843 131
-rect 895 171 929 187
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 293 479 327 513
-rect 465 479 499 513
-rect 637 479 671 513
-rect 809 479 843 513
-rect 121 183 155 217
-rect 293 183 327 217
-rect 465 183 499 217
-rect 637 183 671 217
-rect 809 183 843 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 867 990 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 990 867
-rect 0 827 990 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 281 513 339 519
-rect 453 513 511 519
-rect 625 513 683 519
-rect 797 513 855 519
-rect 109 479 121 513
-rect 155 479 293 513
-rect 327 479 465 513
-rect 499 479 637 513
-rect 671 479 809 513
-rect 843 479 855 513
-rect 109 473 167 479
-rect 281 473 339 479
-rect 453 473 511 479
-rect 625 473 683 479
-rect 797 473 855 479
-rect 121 223 155 473
-rect 293 223 327 473
-rect 465 223 499 473
-rect 637 223 671 473
-rect 809 223 843 473
-rect 109 217 167 223
-rect 281 217 339 223
-rect 453 217 511 223
-rect 625 217 683 223
-rect 797 217 855 223
-rect 109 183 121 217
-rect 155 183 293 217
-rect 327 183 465 217
-rect 499 183 637 217
-rect 671 183 809 217
-rect 843 183 855 217
-rect 109 177 167 183
-rect 281 177 339 183
-rect 453 177 511 183
-rect 625 177 683 183
-rect 797 177 855 183
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 152 344 152 344 1 Y
-port 1 n
-rlabel viali 64 569 64 569 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__inv_2.mag b/12T_hs/sky130_osu_sc_12T_hs__inv_2.mag
deleted file mode 100644
index 8120a84..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__inv_2.mag
+++ /dev/null
@@ -1,151 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864452
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 485 287 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 249 225
-rect 196 131 207 171
-rect 241 131 249 171
-rect 196 115 249 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 249 773
-rect 196 561 207 757
-rect 241 561 249 757
-rect 196 521 249 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 800
-rect 80 496 110 521
-rect 166 496 196 521
-rect 80 466 196 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 80 244 196 274
-rect 80 225 110 244
-rect 166 225 196 244
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 90 348 124 382
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 121 183 155 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 167 513
-rect 109 473 167 479
-rect 121 223 155 473
-rect 109 217 167 223
-rect 109 183 121 217
-rect 155 183 167 217
-rect 109 177 167 183
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 152 344 152 344 1 Y
-port 1 n
-rlabel viali 64 569 64 569 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__inv_3.mag b/12T_hs/sky130_osu_sc_12T_hs__inv_3.mag
deleted file mode 100644
index b3cbdbc..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__inv_3.mag
+++ /dev/null
@@ -1,180 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864452
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 485 375 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 225
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 335 225
-rect 282 131 293 171
-rect 327 131 335 171
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 335 773
-rect 282 561 293 757
-rect 327 561 335 757
-rect 282 521 335 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 496 110 521
-rect 166 496 196 521
-rect 252 496 282 521
-rect 80 466 282 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 80 244 282 274
-rect 80 225 110 244
-rect 166 225 196 244
-rect 252 225 282 244
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 90 348 124 382
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 293 757 327 773
-rect 293 513 327 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 293 479 327 513
-rect 121 183 155 217
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 281 513 339 519
-rect 109 479 121 513
-rect 155 479 293 513
-rect 327 479 339 513
-rect 109 473 167 479
-rect 281 473 339 479
-rect 121 223 155 473
-rect 293 223 327 473
-rect 109 217 167 223
-rect 281 217 339 223
-rect 109 183 121 217
-rect 155 183 293 217
-rect 327 183 339 217
-rect 109 177 167 183
-rect 281 177 339 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 152 344 152 344 1 Y
-port 1 n
-rlabel viali 64 569 64 569 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__inv_4.mag b/12T_hs/sky130_osu_sc_12T_hs__inv_4.mag
deleted file mode 100644
index cbe9f33..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__inv_4.mag
+++ /dev/null
@@ -1,214 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864452
-<< checkpaint >>
-rect -1209 -1243 1617 2131
-<< nwell >>
-rect -9 485 463 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 225
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 225
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 421 225
-rect 368 131 379 171
-rect 413 131 421 171
-rect 368 115 421 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 421 773
-rect 368 561 379 757
-rect 413 561 421 757
-rect 368 521 421 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 799
-rect 80 496 110 521
-rect 166 496 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 80 466 368 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 80 244 368 274
-rect 80 225 110 244
-rect 166 225 196 244
-rect 252 225 282 244
-rect 338 225 368 244
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 90 348 124 382
-<< locali >>
-rect 0 867 462 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 462 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 293 757 327 773
-rect 293 513 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 293 479 327 513
-rect 121 183 155 217
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 462 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 462 867
-rect 0 827 462 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 281 513 339 519
-rect 109 479 121 513
-rect 155 479 293 513
-rect 327 479 339 513
-rect 109 473 167 479
-rect 281 473 339 479
-rect 121 223 155 473
-rect 293 223 327 473
-rect 109 217 167 223
-rect 281 217 339 223
-rect 109 183 121 217
-rect 155 183 293 217
-rect 327 183 339 217
-rect 109 177 167 183
-rect 281 177 339 183
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 64 569 64 569 1 A
-port 1 n
-rlabel metal1 152 344 152 344 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__inv_6.mag b/12T_hs/sky130_osu_sc_12T_hs__inv_6.mag
deleted file mode 100644
index b898977..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__inv_6.mag
+++ /dev/null
@@ -1,278 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864453
-<< checkpaint >>
-rect -1209 -1243 1753 2131
-<< nwell >>
-rect -9 485 639 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 225
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 225
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 225
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 225
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 593 225
-rect 540 131 551 171
-rect 585 131 593 171
-rect 540 115 593 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 593 773
-rect 540 561 551 757
-rect 585 561 593 757
-rect 540 521 593 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 799
-rect 424 773 454 799
-rect 510 773 540 799
-rect 80 496 110 521
-rect 166 496 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 80 466 540 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 424 274 454 466
-rect 80 244 540 274
-rect 80 225 110 244
-rect 166 225 196 244
-rect 252 225 282 244
-rect 338 225 368 244
-rect 424 225 454 244
-rect 510 225 540 244
-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 348 124 382
-<< locali >>
-rect 0 867 638 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 638 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 293 757 327 773
-rect 293 513 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 513 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 293 479 327 513
-rect 465 479 499 513
-rect 121 183 155 217
-rect 293 183 327 217
-rect 465 183 499 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 638 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 638 867
-rect 0 827 638 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 281 513 339 519
-rect 453 513 511 519
-rect 109 479 121 513
-rect 155 479 293 513
-rect 327 479 465 513
-rect 499 479 511 513
-rect 109 473 167 479
-rect 281 473 339 479
-rect 453 473 511 479
-rect 121 223 155 473
-rect 293 223 327 473
-rect 465 223 499 473
-rect 109 217 167 223
-rect 281 217 339 223
-rect 453 217 511 223
-rect 109 183 121 217
-rect 155 183 293 217
-rect 327 183 465 217
-rect 499 183 511 217
-rect 109 177 167 183
-rect 281 177 339 183
-rect 453 177 511 183
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 64 569 64 569 1 A
-port 1 n
-rlabel metal1 152 344 152 344 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__inv_8.mag b/12T_hs/sky130_osu_sc_12T_hs__inv_8.mag
deleted file mode 100644
index cb952e6..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__inv_8.mag
+++ /dev/null
@@ -1,341 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864453
-<< checkpaint >>
-rect -1209 -1243 1889 2131
-<< nwell >>
-rect -9 485 814 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-rect 596 115 626 225
-rect 682 115 712 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 225
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 225
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 225
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 225
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 225
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 225
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 765 225
-rect 712 131 723 171
-rect 757 131 765 171
-rect 712 115 765 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 765 773
-rect 712 561 723 757
-rect 757 561 765 757
-rect 712 521 765 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 799
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 80 496 110 521
-rect 166 496 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 596 496 626 521
-rect 682 496 712 521
-rect 80 466 712 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 424 274 454 466
-rect 80 244 712 274
-rect 80 225 110 244
-rect 166 225 196 244
-rect 252 225 282 244
-rect 338 225 368 244
-rect 424 225 454 244
-rect 510 225 540 244
-rect 596 225 626 244
-rect 682 225 712 244
-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 348 124 382
-<< locali >>
-rect 0 867 814 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 814 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 293 757 327 773
-rect 293 513 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 513 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 637 757 671 773
-rect 637 513 671 561
-rect 723 757 757 827
-rect 723 545 757 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 637 171 671 183
-rect 637 115 671 131
-rect 723 171 757 187
-rect 723 61 757 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 814 61
-rect 0 0 814 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 293 479 327 513
-rect 465 479 499 513
-rect 637 479 671 513
-rect 121 183 155 217
-rect 293 183 327 217
-rect 465 183 499 217
-rect 637 183 671 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-<< metal1 >>
-rect 0 867 814 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 814 867
-rect 0 827 814 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 281 513 339 519
-rect 453 513 511 519
-rect 625 513 683 519
-rect 109 479 121 513
-rect 155 479 293 513
-rect 327 479 465 513
-rect 499 479 637 513
-rect 671 479 683 513
-rect 109 473 167 479
-rect 281 473 339 479
-rect 453 473 511 479
-rect 625 473 683 479
-rect 121 223 155 473
-rect 293 223 327 473
-rect 465 223 499 473
-rect 637 223 671 473
-rect 109 217 167 223
-rect 281 217 339 223
-rect 453 217 511 223
-rect 625 217 683 223
-rect 109 183 121 217
-rect 155 183 293 217
-rect 327 183 465 217
-rect 499 183 637 217
-rect 671 183 683 217
-rect 109 177 167 183
-rect 281 177 339 183
-rect 453 177 511 183
-rect 625 177 683 183
-rect 0 55 814 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 814 55
-rect 0 0 814 21
-<< labels >>
-rlabel metal1 152 344 152 344 1 Y
-port 1 n
-rlabel viali 64 569 64 569 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__inv_l.mag b/12T_hs/sky130_osu_sc_12T_hs__inv_l.mag
deleted file mode 100644
index 3e739be..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__inv_l.mag
+++ /dev/null
@@ -1,113 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864453
-<< checkpaint >>
-rect -1209 -1243 1345 2129
-<< nwell >>
-rect -9 485 199 895
-<< pmos >>
-rect 80 603 110 771
-<< nmoslvt >>
-rect 80 115 110 199
-<< ndiff >>
-rect 27 165 80 199
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 163 199
-rect 110 131 121 165
-rect 155 131 163 165
-rect 110 115 163 131
-<< pdiff >>
-rect 27 755 80 771
-rect 27 687 35 755
-rect 69 687 80 755
-rect 27 603 80 687
-rect 110 755 163 771
-rect 110 687 121 755
-rect 155 687 163 755
-rect 110 603 163 687
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-<< pdiffc >>
-rect 35 687 69 755
-rect 121 687 155 755
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 825 51 859
-rect 85 825 109 859
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 825 85 859
-<< poly >>
-rect 80 771 110 797
-rect 80 398 110 603
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 199 110 332
-rect 80 89 110 115
-<< polycont >>
-rect 90 348 124 382
-<< locali >>
-rect 0 865 198 886
-rect 0 825 51 865
-rect 85 825 198 865
-rect 35 755 69 825
-rect 35 671 69 687
-rect 121 755 155 771
-rect 47 382 81 553
-rect 121 513 155 687
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 165 69 181
-rect 35 61 69 131
-rect 121 165 155 257
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 859 85 865
-rect 51 831 85 859
-rect 47 553 81 587
-rect 121 479 155 513
-rect 121 257 155 291
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 865 198 886
-rect 0 831 51 865
-rect 85 831 198 865
-rect 0 825 198 831
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 167 513
-rect 109 473 167 479
-rect 121 297 155 473
-rect 109 291 167 297
-rect 109 257 121 291
-rect 155 257 167 291
-rect 109 251 167 257
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 570 64 570 1 A
-port 1 n
-rlabel metal1 151 345 151 345 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 838 68 838 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__mux2_1.mag b/12T_hs/sky130_osu_sc_12T_hs__mux2_1.mag
deleted file mode 100644
index 0056052..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__mux2_1.mag
+++ /dev/null
@@ -1,226 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864453
-<< checkpaint >>
-rect -801 1315 1753 2131
-rect -1209 -1243 1753 1315
-<< nwell >>
-rect -9 485 553 897
-<< pmos >>
-rect 80 521 110 773
-rect 270 521 300 773
-rect 356 521 386 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 270 115 300 225
-rect 356 115 386 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 225
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-rect 217 171 270 225
-rect 217 131 225 171
-rect 259 131 270 171
-rect 217 115 270 131
-rect 300 171 356 225
-rect 300 131 311 171
-rect 345 131 356 171
-rect 300 115 356 131
-rect 386 171 439 225
-rect 386 131 397 171
-rect 431 131 439 171
-rect 386 115 439 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-rect 217 757 270 773
-rect 217 561 225 757
-rect 259 561 270 757
-rect 217 521 270 561
-rect 300 757 356 773
-rect 300 561 311 757
-rect 345 561 356 757
-rect 300 521 356 561
-rect 386 757 439 773
-rect 386 561 397 757
-rect 431 561 439 757
-rect 386 521 439 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 225 131 259 171
-rect 311 131 345 171
-rect 397 131 431 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 225 561 259 757
-rect 311 561 345 757
-rect 397 561 431 757
-<< 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 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 459 827 493 861
-<< poly >>
-rect 80 788 300 818
-rect 80 773 110 788
-rect 270 773 300 788
-rect 356 773 386 799
-rect 80 398 110 521
-rect 270 495 300 521
-rect 152 465 218 475
-rect 152 431 168 465
-rect 202 451 218 465
-rect 356 451 386 521
-rect 202 431 386 451
-rect 152 421 386 431
-rect 27 382 110 398
-rect 27 348 37 382
-rect 71 379 110 382
-rect 71 349 386 379
-rect 71 348 110 349
-rect 27 332 110 348
-rect 80 225 110 332
-rect 152 297 218 307
-rect 152 263 168 297
-rect 202 283 218 297
-rect 202 263 300 283
-rect 152 253 300 263
-rect 270 225 300 253
-rect 356 225 386 349
-rect 80 89 110 115
-rect 270 89 300 115
-rect 356 89 386 115
-<< polycont >>
-rect 168 431 202 465
-rect 37 348 71 382
-rect 168 263 202 297
-<< locali >>
-rect 0 867 550 888
-rect 0 827 459 867
-rect 493 827 550 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 37 382 71 553
-rect 37 332 71 348
-rect 121 481 155 561
-rect 225 757 259 773
-rect 311 757 345 773
-rect 225 527 270 561
-rect 236 513 270 527
-rect 121 465 202 481
-rect 121 431 168 465
-rect 121 415 202 431
-rect 121 313 155 415
-rect 121 297 202 313
-rect 121 263 168 297
-rect 121 247 202 263
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 247
-rect 236 205 270 479
-rect 311 365 345 561
-rect 397 757 431 773
-rect 397 439 431 561
-rect 121 115 155 131
-rect 225 171 270 205
-rect 311 171 345 183
-rect 225 115 259 131
-rect 311 115 345 131
-rect 397 171 431 405
-rect 397 115 431 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 459 861 493 867
-rect 459 833 493 861
-rect 37 553 71 587
-rect 236 479 270 513
-rect 311 331 345 365
-rect 397 405 431 439
-rect 311 183 345 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 550 888
-rect 0 833 459 867
-rect 493 833 550 867
-rect 0 827 550 833
-rect 25 587 83 593
-rect 25 553 37 587
-rect 71 553 117 587
-rect 25 547 83 553
-rect 224 513 282 519
-rect 190 479 236 513
-rect 270 479 282 513
-rect 224 473 282 479
-rect 385 439 443 445
-rect 351 405 397 439
-rect 431 405 443 439
-rect 385 399 443 405
-rect 299 365 357 371
-rect 299 331 311 365
-rect 345 331 357 365
-rect 299 325 357 331
-rect 311 223 345 325
-rect 299 217 357 223
-rect 299 183 311 217
-rect 345 183 357 217
-rect 299 177 357 183
-rect 0 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel viali 54 570 54 570 1 S0
-port 1 n
-rlabel viali 328 348 328 348 1 Y
-port 2 n
-rlabel viali 253 496 253 496 1 A0
-port 3 n
-rlabel viali 414 422 414 422 1 A1
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 476 840 476 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__nand2_1.mag b/12T_hs/sky130_osu_sc_12T_hs__nand2_1.mag
deleted file mode 100644
index 99ccf49..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__nand2_1.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864453
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 485 286 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 152 115 182 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 225
-rect 182 171 235 225
-rect 182 131 193 171
-rect 227 131 235 171
-rect 182 115 235 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 249 773
-rect 196 629 207 757
-rect 241 629 249 757
-rect 196 521 249 629
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 629 241 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 80 474 110 521
-rect 37 458 110 474
-rect 37 424 47 458
-rect 81 424 110 458
-rect 37 408 110 424
-rect 80 225 110 408
-rect 166 381 196 521
-rect 152 365 210 381
-rect 152 331 166 365
-rect 200 331 210 365
-rect 152 315 210 331
-rect 152 225 182 315
-rect 80 89 110 115
-rect 152 89 182 115
-<< polycont >>
-rect 47 424 81 458
-rect 166 331 200 365
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 458 81 553
-rect 47 408 81 424
-rect 207 757 241 827
-rect 207 613 241 629
-rect 121 439 155 561
-rect 195 365 229 479
-rect 150 331 166 365
-rect 200 331 229 365
-rect 35 171 69 183
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 47 553 81 587
-rect 121 405 155 439
-rect 195 479 229 513
-rect 35 183 69 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 115 587
-rect 35 547 93 553
-rect 183 513 241 519
-rect 161 479 195 513
-rect 229 479 241 513
-rect 183 473 241 479
-rect 109 439 167 445
-rect 109 405 121 439
-rect 155 405 167 439
-rect 109 399 167 405
-rect 23 217 81 223
-rect 121 217 155 399
-rect 23 183 35 217
-rect 69 183 155 217
-rect 23 177 81 183
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 374 136 374 1 Y
-port 1 n
-rlabel viali 64 570 64 570 1 A
-port 2 n
-rlabel viali 212 496 212 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__nand2_l.mag b/12T_hs/sky130_osu_sc_12T_hs__nand2_l.mag
deleted file mode 100644
index 2a834d5..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__nand2_l.mag
+++ /dev/null
@@ -1,154 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864454
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 286 897
-<< pmos >>
-rect 80 605 110 773
-rect 166 605 196 773
-<< nmoslvt >>
-rect 80 115 110 199
-rect 152 115 182 199
-<< ndiff >>
-rect 27 165 80 199
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 115 152 199
-rect 182 165 235 199
-rect 182 131 193 165
-rect 227 131 235 165
-rect 182 115 235 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 689 35 757
-rect 69 689 80 757
-rect 27 605 80 689
-rect 110 757 166 773
-rect 110 689 121 757
-rect 155 689 166 757
-rect 110 605 166 689
-rect 196 757 249 773
-rect 196 689 207 757
-rect 241 689 249 757
-rect 196 605 249 689
-<< ndiffc >>
-rect 35 131 69 165
-rect 193 131 227 165
-<< pdiffc >>
-rect 35 689 69 757
-rect 121 689 155 757
-rect 207 689 241 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 80 548 110 605
-rect 37 532 110 548
-rect 37 498 47 532
-rect 81 498 110 532
-rect 37 482 110 498
-rect 80 199 110 482
-rect 166 398 196 605
-rect 152 382 210 398
-rect 152 348 166 382
-rect 200 348 210 382
-rect 152 332 210 348
-rect 152 199 182 332
-rect 80 89 110 115
-rect 152 89 182 115
-<< polycont >>
-rect 47 498 81 532
-rect 166 348 200 382
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 827
-rect 35 673 69 689
-rect 121 757 155 773
-rect 47 532 81 553
-rect 47 482 81 498
-rect 121 513 155 689
-rect 207 757 241 827
-rect 207 673 241 689
-rect 195 382 229 553
-rect 150 348 166 382
-rect 200 348 229 382
-rect 35 165 69 257
-rect 35 115 69 131
-rect 193 165 227 181
-rect 193 61 227 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 195 553 229 587
-rect 35 257 69 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 35 587 93 593
-rect 183 587 241 593
-rect 35 553 47 587
-rect 81 553 115 587
-rect 161 553 195 587
-rect 229 553 241 587
-rect 35 547 93 553
-rect 183 547 241 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 167 513
-rect 109 473 167 479
-rect 23 291 81 297
-rect 121 291 155 473
-rect 23 257 35 291
-rect 69 257 155 291
-rect 23 251 81 257
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 448 136 448 1 Y
-port 1 n
-rlabel viali 212 570 212 570 1 B
-port 2 n
-rlabel viali 64 570 64 570 1 A
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__nor2_1.mag b/12T_hs/sky130_osu_sc_12T_hs__nor2_1.mag
deleted file mode 100644
index 09408ed..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__nor2_1.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864454
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 485 286 897
-<< pmos >>
-rect 80 521 110 773
-rect 152 521 182 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 249 225
-rect 196 131 207 171
-rect 241 131 249 171
-rect 196 115 249 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 521 152 773
-rect 182 757 235 773
-rect 182 697 193 757
-rect 227 697 235 757
-rect 182 521 235 697
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 193 697 227 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 152 773 182 799
-rect 80 355 110 521
-rect 152 488 182 521
-rect 152 472 225 488
-rect 152 438 181 472
-rect 215 438 225 472
-rect 152 422 225 438
-rect 56 339 110 355
-rect 56 305 66 339
-rect 100 305 110 339
-rect 56 289 110 305
-rect 80 225 110 289
-rect 166 225 196 422
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 181 438 215 472
-rect 66 305 100 339
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 773
-rect 193 757 227 827
-rect 193 681 227 697
-rect 35 439 69 561
-rect 113 339 147 479
-rect 181 472 215 553
-rect 181 422 215 438
-rect 50 305 66 339
-rect 100 305 147 339
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 181 553 215 587
-rect 35 405 69 439
-rect 113 479 147 513
-rect 121 183 155 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 169 587 227 593
-rect 148 553 181 587
-rect 215 553 227 587
-rect 169 547 227 553
-rect 101 513 159 519
-rect 79 479 113 513
-rect 147 479 159 513
-rect 101 473 159 479
-rect 23 439 81 445
-rect 23 405 35 439
-rect 69 405 155 439
-rect 23 399 81 405
-rect 121 223 155 405
-rect 109 217 167 223
-rect 109 183 121 217
-rect 155 183 167 217
-rect 109 177 167 183
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 137 297 137 297 1 Y
-port 1 n
-rlabel viali 130 496 130 496 1 B
-port 2 n
-rlabel viali 198 570 198 570 1 A
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__nor2_l.mag b/12T_hs/sky130_osu_sc_12T_hs__nor2_l.mag
deleted file mode 100644
index d5d3c54..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__nor2_l.mag
+++ /dev/null
@@ -1,154 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864454
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 286 897
-<< pmos >>
-rect 80 605 110 773
-rect 152 605 182 773
-<< nmoslvt >>
-rect 80 115 110 199
-rect 166 115 196 199
-<< ndiff >>
-rect 27 165 80 199
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 166 199
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 165 249 199
-rect 196 131 207 165
-rect 241 131 249 165
-rect 196 115 249 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 605 80 621
-rect 110 605 152 773
-rect 182 757 235 773
-rect 182 621 193 757
-rect 227 621 235 757
-rect 182 605 235 621
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-rect 207 131 241 165
-<< pdiffc >>
-rect 35 621 69 757
-rect 193 621 227 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 152 773 182 799
-rect 80 429 110 605
-rect 152 562 182 605
-rect 152 546 225 562
-rect 152 512 181 546
-rect 215 512 225 546
-rect 152 496 225 512
-rect 56 413 110 429
-rect 56 379 66 413
-rect 100 379 110 413
-rect 56 363 110 379
-rect 80 199 110 363
-rect 166 199 196 496
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 181 512 215 546
-rect 66 379 100 413
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 773
-rect 35 513 69 621
-rect 193 757 227 827
-rect 193 605 227 621
-rect 113 413 147 553
-rect 181 546 215 562
-rect 50 379 66 413
-rect 100 379 147 413
-rect 35 165 69 181
-rect 35 61 69 131
-rect 121 165 155 257
-rect 121 115 155 131
-rect 207 165 241 181
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 35 479 69 513
-rect 113 553 147 587
-rect 181 512 215 513
-rect 181 479 215 512
-rect 121 257 155 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 101 587 159 593
-rect 79 553 113 587
-rect 147 553 159 587
-rect 101 547 159 553
-rect 23 513 81 519
-rect 168 513 227 519
-rect 23 479 35 513
-rect 69 479 81 513
-rect 146 479 181 513
-rect 215 479 227 513
-rect 23 473 81 479
-rect 168 473 227 479
-rect 34 291 69 473
-rect 109 291 167 297
-rect 34 257 121 291
-rect 155 257 167 291
-rect 34 256 167 257
-rect 109 251 167 256
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel viali 130 570 130 570 1 B
-port 3 n
-rlabel metal1 48 337 48 337 1 Y
-rlabel viali 198 496 198 496 1 A
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__oai21_l.mag b/12T_hs/sky130_osu_sc_12T_hs__oai21_l.mag
deleted file mode 100644
index 91bd407..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__oai21_l.mag
+++ /dev/null
@@ -1,194 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864454
-<< checkpaint >>
-rect -1209 -1244 1481 2131
-<< nwell >>
-rect -9 485 374 897
-<< pmos >>
-rect 80 521 110 773
-rect 152 521 182 773
-rect 250 605 280 773
-<< nmoslvt >>
-rect 80 114 110 224
-rect 166 114 196 224
-rect 252 114 282 224
-<< ndiff >>
-rect 27 170 80 224
-rect 27 130 35 170
-rect 69 130 80 170
-rect 27 114 80 130
-rect 110 164 166 224
-rect 110 130 121 164
-rect 155 130 166 164
-rect 110 114 166 130
-rect 196 170 252 224
-rect 196 130 207 170
-rect 241 130 252 170
-rect 196 114 252 130
-rect 282 189 335 224
-rect 282 130 293 189
-rect 327 130 335 189
-rect 282 114 335 130
-<< pdiff >>
-rect 27 757 80 773
-rect 27 696 35 757
-rect 69 696 80 757
-rect 27 521 80 696
-rect 110 521 152 773
-rect 182 757 250 773
-rect 182 705 193 757
-rect 227 705 250 757
-rect 182 605 250 705
-rect 280 757 333 773
-rect 280 621 291 757
-rect 325 621 333 757
-rect 280 605 333 621
-rect 182 521 235 605
-<< ndiffc >>
-rect 35 130 69 170
-rect 121 130 155 164
-rect 207 130 241 170
-rect 293 130 327 189
-<< pdiffc >>
-rect 35 696 69 757
-rect 193 705 227 757
-rect 291 621 325 757
-<< psubdiff >>
-rect 27 26 51 60
-rect 85 26 109 60
-rect 163 26 187 60
-rect 221 26 245 60
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 266 861
-<< psubdiffcont >>
-rect 51 26 85 60
-rect 187 26 221 60
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 152 773 182 799
-rect 250 773 280 799
-rect 80 489 110 521
-rect 56 473 110 489
-rect 56 439 66 473
-rect 100 439 110 473
-rect 56 423 110 439
-rect 56 274 86 423
-rect 152 375 182 521
-rect 136 365 202 375
-rect 136 331 152 365
-rect 186 331 202 365
-rect 136 321 202 331
-rect 250 333 280 605
-rect 56 243 110 274
-rect 80 224 110 243
-rect 166 224 196 321
-rect 250 317 306 333
-rect 252 283 262 317
-rect 296 283 306 317
-rect 252 267 306 283
-rect 252 224 282 267
-rect 80 88 110 114
-rect 166 88 196 114
-rect 252 88 282 114
-<< polycont >>
-rect 66 439 100 473
-rect 152 331 186 365
-rect 262 283 296 317
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 35 655 69 696
-rect 193 757 227 827
-rect 193 689 227 705
-rect 291 757 325 773
-rect 35 621 291 655
-rect 66 473 100 553
-rect 291 513 325 621
-rect 66 423 100 439
-rect 152 479 162 513
-rect 152 365 186 479
-rect 152 315 186 331
-rect 223 317 257 405
-rect 223 283 262 317
-rect 296 283 312 317
-rect 35 214 241 248
-rect 35 170 69 214
-rect 35 114 69 130
-rect 121 164 155 180
-rect 121 60 155 130
-rect 207 170 241 214
-rect 207 114 241 130
-rect 293 114 327 130
-rect 0 20 51 60
-rect 85 20 187 60
-rect 221 20 374 60
-rect 0 0 374 20
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 66 553 100 587
-rect 162 479 196 513
-rect 291 479 325 513
-rect 223 405 257 439
-rect 293 189 327 217
-rect 293 183 327 189
-rect 51 26 85 54
-rect 51 20 85 26
-rect 187 26 221 54
-rect 187 20 221 26
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 54 587 112 593
-rect 54 553 66 587
-rect 100 553 134 587
-rect 54 547 112 553
-rect 150 513 208 519
-rect 279 513 338 519
-rect 150 479 162 513
-rect 196 479 230 513
-rect 279 479 291 513
-rect 325 479 338 513
-rect 150 473 208 479
-rect 279 473 338 479
-rect 211 439 269 445
-rect 189 405 223 439
-rect 257 405 269 439
-rect 211 399 269 405
-rect 297 224 327 473
-rect 281 217 339 224
-rect 281 183 293 217
-rect 327 183 339 217
-rect 281 177 339 183
-rect 0 54 374 60
-rect 0 20 51 54
-rect 85 20 187 54
-rect 221 20 374 54
-rect 0 0 374 20
-<< labels >>
-rlabel viali 83 570 83 570 1 A0
-port 1 n
-rlabel viali 179 496 179 496 1 A1
-port 2 n
-rlabel viali 240 422 240 422 1 B0
-port 4 n
-rlabel viali 308 496 308 496 1 Y
-rlabel viali 68 47 68 47 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__oai22_l.mag b/12T_hs/sky130_osu_sc_12T_hs__oai22_l.mag
deleted file mode 100644
index 2908903..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__oai22_l.mag
+++ /dev/null
@@ -1,234 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864454
-<< checkpaint >>
-rect -1209 -1243 1617 2131
-<< nwell >>
-rect -9 483 462 897
-<< pmos >>
-rect 80 521 110 773
-rect 152 521 182 773
-rect 252 521 282 773
-rect 324 521 354 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-<< ndiff >>
-rect 27 199 80 225
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 165 166 225
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 199 252 225
-rect 196 131 207 199
-rect 241 131 252 199
-rect 196 115 252 131
-rect 282 211 338 225
-rect 282 177 293 211
-rect 327 177 338 211
-rect 282 115 338 177
-rect 368 165 421 225
-rect 368 131 379 165
-rect 413 131 421 165
-rect 368 115 421 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 651 35 757
-rect 69 651 80 757
-rect 27 521 80 651
-rect 110 521 152 773
-rect 182 757 252 773
-rect 182 583 200 757
-rect 234 583 252 757
-rect 182 521 252 583
-rect 282 521 324 773
-rect 354 757 407 773
-rect 354 651 365 757
-rect 399 651 407 757
-rect 354 521 407 651
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 165
-rect 207 131 241 199
-rect 293 177 327 211
-rect 379 131 413 165
-<< pdiffc >>
-rect 35 651 69 757
-rect 200 583 234 757
-rect 365 651 399 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 152 773 182 799
-rect 252 773 282 799
-rect 324 773 354 799
-rect 80 489 110 521
-rect 42 472 110 489
-rect 42 438 52 472
-rect 86 459 110 472
-rect 86 438 96 459
-rect 42 417 96 438
-rect 52 277 86 417
-rect 152 375 182 521
-rect 252 403 282 521
-rect 324 504 354 521
-rect 324 478 368 504
-rect 338 456 368 478
-rect 338 440 430 456
-rect 338 406 384 440
-rect 418 406 430 440
-rect 238 387 292 403
-rect 130 365 196 375
-rect 130 331 146 365
-rect 180 331 196 365
-rect 238 353 248 387
-rect 282 353 292 387
-rect 238 337 292 353
-rect 338 390 430 406
-rect 130 321 196 331
-rect 52 246 110 277
-rect 80 225 110 246
-rect 166 225 196 321
-rect 252 225 282 337
-rect 338 225 368 390
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 52 438 86 472
-rect 384 406 418 440
-rect 146 331 180 365
-rect 248 353 282 387
-<< locali >>
-rect 0 867 462 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 462 867
-rect 35 757 69 827
-rect 35 635 69 651
-rect 200 757 234 773
-rect 365 757 399 827
-rect 365 635 399 651
-rect 200 549 350 583
-rect 52 472 86 489
-rect 52 389 86 405
-rect 223 403 257 479
-rect 223 387 282 403
-rect 146 365 180 381
-rect 223 353 248 387
-rect 223 337 282 353
-rect 316 365 350 549
-rect 384 440 418 456
-rect 384 390 418 406
-rect 146 315 180 331
-rect 35 215 241 249
-rect 316 247 350 331
-rect 35 199 69 215
-rect 207 199 241 215
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 277 213 350 247
-rect 277 211 343 213
-rect 277 177 293 211
-rect 327 177 343 211
-rect 379 165 413 181
-rect 241 131 379 143
-rect 207 109 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 52 438 86 439
-rect 52 405 86 438
-rect 223 479 257 513
-rect 146 331 180 365
-rect 384 406 418 440
-rect 316 331 350 365
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 462 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 462 867
-rect 0 827 462 833
-rect 211 513 269 519
-rect 189 479 223 513
-rect 257 479 269 513
-rect 211 473 269 479
-rect 40 439 98 445
-rect 372 440 430 446
-rect 40 405 52 439
-rect 86 405 120 439
-rect 350 406 384 440
-rect 418 406 430 440
-rect 40 399 98 405
-rect 372 400 430 406
-rect 134 365 192 371
-rect 304 365 362 371
-rect 134 331 146 365
-rect 180 331 214 365
-rect 282 331 316 365
-rect 350 331 362 365
-rect 134 325 192 331
-rect 304 325 362 331
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 240 496 240 496 1 B0
-port 4 n
-rlabel viali 333 348 333 348 1 Y
-port 3 n
-rlabel viali 401 423 401 423 1 B1
-rlabel viali 163 348 163 348 1 A1
-rlabel viali 69 422 69 422 1 A0
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__or2_1.mag b/12T_hs/sky130_osu_sc_12T_hs__or2_1.mag
deleted file mode 100644
index ca939f9..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__or2_1.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864455
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 485 374 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 225
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 335 225
-rect 282 131 293 171
-rect 327 131 335 171
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 521 166 773
-rect 196 757 252 773
-rect 196 697 207 757
-rect 241 697 252 757
-rect 196 521 252 697
-rect 282 757 335 773
-rect 282 561 293 757
-rect 327 561 335 757
-rect 282 521 335 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 207 697 241 757
-rect 293 561 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 472 110 521
-rect 27 456 110 472
-rect 27 422 37 456
-rect 71 422 110 456
-rect 27 406 110 422
-rect 166 414 196 521
-rect 252 496 282 521
-rect 252 466 289 496
-rect 80 225 110 406
-rect 163 398 217 414
-rect 163 364 173 398
-rect 207 364 217 398
-rect 163 348 217 364
-rect 166 225 196 348
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 274 313 308
-rect 252 258 313 274
-rect 252 225 282 258
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 422 71 456
-rect 173 364 207 398
-rect 269 274 303 308
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 207 757 241 827
-rect 207 681 241 697
-rect 293 757 327 773
-rect 69 629 139 647
-rect 35 613 139 629
-rect 37 456 71 479
-rect 37 406 71 422
-rect 105 308 139 613
-rect 173 398 207 553
-rect 293 439 327 561
-rect 173 348 207 364
-rect 105 274 269 308
-rect 303 274 319 308
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 274
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 37 479 71 513
-rect 173 553 207 587
-rect 293 405 327 439
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 161 587 219 593
-rect 140 553 173 587
-rect 207 553 219 587
-rect 161 547 219 553
-rect 25 513 83 519
-rect 25 479 37 513
-rect 71 479 105 513
-rect 25 473 83 479
-rect 281 439 339 445
-rect 281 405 293 439
-rect 327 405 339 439
-rect 281 399 339 405
-rect 293 223 327 399
-rect 281 217 339 223
-rect 281 183 293 217
-rect 327 183 339 217
-rect 281 177 339 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 190 570 190 570 1 A
-port 2 n
-rlabel viali 54 496 54 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__or2_2.mag b/12T_hs/sky130_osu_sc_12T_hs__or2_2.mag
deleted file mode 100644
index 346b5a9..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__or2_2.mag
+++ /dev/null
@@ -1,221 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864455
-<< checkpaint >>
-rect -1209 -1243 1617 2131
-<< nwell >>
-rect -9 485 462 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 225
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 225
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 421 225
-rect 368 131 379 171
-rect 413 131 421 171
-rect 368 115 421 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 521 166 773
-rect 196 757 252 773
-rect 196 697 207 757
-rect 241 697 252 757
-rect 196 521 252 697
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 421 773
-rect 368 561 379 757
-rect 413 561 421 757
-rect 368 521 421 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 207 697 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 80 472 110 521
-rect 27 456 110 472
-rect 27 422 37 456
-rect 71 422 110 456
-rect 27 406 110 422
-rect 166 414 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 252 466 368 496
-rect 80 225 110 406
-rect 163 398 217 414
-rect 163 364 173 398
-rect 207 364 217 398
-rect 163 348 217 364
-rect 166 225 196 348
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 303 274 368 288
-rect 252 258 368 274
-rect 252 225 282 258
-rect 338 225 368 258
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 37 422 71 456
-rect 173 364 207 398
-rect 269 274 303 308
-<< locali >>
-rect 0 867 462 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 462 867
-rect 35 757 69 773
-rect 207 757 241 827
-rect 207 681 241 697
-rect 293 757 327 773
-rect 69 629 139 647
-rect 35 613 139 629
-rect 37 456 71 479
-rect 37 406 71 422
-rect 105 308 139 613
-rect 173 398 207 553
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 173 348 207 364
-rect 105 274 269 308
-rect 303 274 319 308
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 274
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 37 479 71 513
-rect 173 553 207 587
-rect 293 405 327 439
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 462 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 462 867
-rect 0 827 462 833
-rect 161 587 219 593
-rect 140 553 173 587
-rect 207 553 219 587
-rect 161 547 219 553
-rect 25 513 83 519
-rect 25 479 37 513
-rect 71 479 105 513
-rect 25 473 83 479
-rect 281 439 339 445
-rect 281 405 293 439
-rect 327 405 339 439
-rect 281 399 339 405
-rect 293 223 327 399
-rect 281 217 339 223
-rect 281 183 293 217
-rect 327 183 339 217
-rect 281 177 339 183
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 190 570 190 570 1 A
-port 2 n
-rlabel viali 54 496 54 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__or2_4.mag b/12T_hs/sky130_osu_sc_12T_hs__or2_4.mag
deleted file mode 100644
index e48c486..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__or2_4.mag
+++ /dev/null
@@ -1,284 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864455
-<< checkpaint >>
-rect -1209 -1243 1753 2131
-<< nwell >>
-rect -9 485 638 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 225
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 225
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 225
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 225
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 593 225
-rect 540 131 551 171
-rect 585 131 593 171
-rect 540 115 593 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 521 166 773
-rect 196 757 252 773
-rect 196 697 207 757
-rect 241 697 252 757
-rect 196 521 252 697
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 593 773
-rect 540 561 551 757
-rect 585 561 593 757
-rect 540 521 593 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 207 697 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 424 773 454 799
-rect 510 773 540 799
-rect 80 472 110 521
-rect 27 456 110 472
-rect 27 422 37 456
-rect 71 422 110 456
-rect 27 406 110 422
-rect 166 414 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 252 466 540 496
-rect 80 225 110 406
-rect 163 398 217 414
-rect 163 364 173 398
-rect 207 364 217 398
-rect 163 348 217 364
-rect 166 225 196 348
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 303 274 540 288
-rect 252 258 540 274
-rect 252 225 282 258
-rect 338 225 368 258
-rect 424 225 454 258
-rect 510 225 540 258
-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 422 71 456
-rect 173 364 207 398
-rect 269 274 303 308
-<< locali >>
-rect 0 867 638 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 638 867
-rect 35 757 69 773
-rect 207 757 241 827
-rect 207 681 241 697
-rect 293 757 327 773
-rect 69 629 139 647
-rect 35 613 139 629
-rect 37 456 71 479
-rect 37 406 71 422
-rect 105 308 139 613
-rect 173 398 207 553
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 439 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 173 348 207 364
-rect 105 274 269 308
-rect 303 274 319 308
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 274
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 37 479 71 513
-rect 173 553 207 587
-rect 293 405 327 439
-rect 465 405 499 439
-rect 293 183 327 217
-rect 465 183 499 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 638 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 638 867
-rect 0 827 638 833
-rect 161 587 219 593
-rect 140 553 173 587
-rect 207 553 219 587
-rect 161 547 219 553
-rect 25 513 83 519
-rect 25 479 37 513
-rect 71 479 105 513
-rect 25 473 83 479
-rect 281 439 339 445
-rect 453 439 511 445
-rect 281 405 293 439
-rect 327 405 465 439
-rect 499 405 511 439
-rect 281 399 339 405
-rect 453 399 511 405
-rect 293 223 327 399
-rect 465 223 499 399
-rect 281 217 339 223
-rect 453 217 511 223
-rect 281 183 293 217
-rect 327 183 465 217
-rect 499 183 511 217
-rect 281 177 339 183
-rect 453 177 511 183
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 190 570 190 570 1 A
-port 2 n
-rlabel viali 54 496 54 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__or2_8.mag b/12T_hs/sky130_osu_sc_12T_hs__or2_8.mag
deleted file mode 100644
index 11e3bb5..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__or2_8.mag
+++ /dev/null
@@ -1,426 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864455
-<< checkpaint >>
-rect -1209 -1243 2161 2131
-<< nwell >>
-rect -9 485 990 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-rect 768 521 798 773
-rect 854 521 884 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-rect 596 115 626 225
-rect 682 115 712 225
-rect 768 115 798 225
-rect 854 115 884 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 225
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 225
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 225
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 225
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 225
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 225
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 768 225
-rect 712 131 723 171
-rect 757 131 768 171
-rect 712 115 768 131
-rect 798 171 854 225
-rect 798 131 809 171
-rect 843 131 854 171
-rect 798 115 854 131
-rect 884 171 937 225
-rect 884 131 895 171
-rect 929 131 937 171
-rect 884 115 937 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 521 166 773
-rect 196 757 252 773
-rect 196 697 207 757
-rect 241 697 252 757
-rect 196 521 252 697
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 768 773
-rect 712 561 723 757
-rect 757 561 768 757
-rect 712 521 768 561
-rect 798 757 854 773
-rect 798 561 809 757
-rect 843 561 854 757
-rect 798 521 854 561
-rect 884 757 937 773
-rect 884 561 895 757
-rect 929 561 937 757
-rect 884 521 937 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-rect 809 131 843 171
-rect 895 131 929 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 207 697 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-rect 809 561 843 757
-rect 895 561 929 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 768 773 798 799
-rect 854 773 884 799
-rect 80 472 110 521
-rect 27 456 110 472
-rect 27 422 37 456
-rect 71 422 110 456
-rect 27 406 110 422
-rect 166 414 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 596 496 626 521
-rect 682 496 712 521
-rect 768 496 798 521
-rect 854 496 884 521
-rect 252 466 884 496
-rect 80 225 110 406
-rect 163 398 217 414
-rect 163 364 173 398
-rect 207 364 217 398
-rect 163 348 217 364
-rect 166 225 196 348
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 596 288 626 466
-rect 303 274 884 288
-rect 252 258 884 274
-rect 252 225 282 258
-rect 338 225 368 258
-rect 424 225 454 258
-rect 510 225 540 258
-rect 596 225 626 258
-rect 682 225 712 258
-rect 768 225 798 258
-rect 854 225 884 258
-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 422 71 456
-rect 173 364 207 398
-rect 269 274 303 308
-<< locali >>
-rect 0 867 990 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 990 867
-rect 35 757 69 773
-rect 207 757 241 827
-rect 207 681 241 697
-rect 293 757 327 773
-rect 69 629 139 647
-rect 35 613 139 629
-rect 37 456 71 479
-rect 37 406 71 422
-rect 105 308 139 613
-rect 173 398 207 553
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 439 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 637 757 671 773
-rect 637 439 671 561
-rect 723 757 757 827
-rect 723 545 757 561
-rect 809 757 843 773
-rect 809 439 843 561
-rect 895 757 929 827
-rect 895 545 929 561
-rect 173 348 207 364
-rect 105 274 269 308
-rect 303 274 319 308
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 274
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 637 171 671 183
-rect 637 115 671 131
-rect 723 171 757 187
-rect 723 61 757 131
-rect 809 171 843 183
-rect 809 115 843 131
-rect 895 171 929 187
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 37 479 71 513
-rect 173 553 207 587
-rect 293 405 327 439
-rect 465 405 499 439
-rect 637 405 671 439
-rect 809 405 843 439
-rect 293 183 327 217
-rect 465 183 499 217
-rect 637 183 671 217
-rect 809 183 843 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 867 990 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 990 867
-rect 0 827 990 833
-rect 161 587 219 593
-rect 140 553 173 587
-rect 207 553 219 587
-rect 161 547 219 553
-rect 25 513 83 519
-rect 25 479 37 513
-rect 71 479 105 513
-rect 25 473 83 479
-rect 281 439 339 445
-rect 453 439 511 445
-rect 625 439 683 445
-rect 797 439 855 445
-rect 281 405 293 439
-rect 327 405 465 439
-rect 499 405 637 439
-rect 671 405 809 439
-rect 843 405 855 439
-rect 281 399 339 405
-rect 453 399 511 405
-rect 625 399 683 405
-rect 797 399 855 405
-rect 293 223 327 399
-rect 465 223 499 399
-rect 637 223 671 399
-rect 809 223 843 399
-rect 281 217 339 223
-rect 453 217 511 223
-rect 625 217 683 223
-rect 797 217 855 223
-rect 281 183 293 217
-rect 327 183 465 217
-rect 499 183 637 217
-rect 671 183 683 217
-rect 712 183 809 217
-rect 843 183 855 217
-rect 281 177 339 183
-rect 453 177 511 183
-rect 625 177 683 183
-rect 797 177 855 183
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 190 570 190 570 1 A
-port 2 n
-rlabel viali 54 496 54 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__or2_l.mag b/12T_hs/sky130_osu_sc_12T_hs__or2_l.mag
deleted file mode 100644
index 97fb07c..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__or2_l.mag
+++ /dev/null
@@ -1,184 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864455
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 374 897
-<< pmos >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 252 605 282 773
-<< nmoslvt >>
-rect 80 115 110 199
-rect 166 115 196 199
-rect 252 115 282 199
-<< ndiff >>
-rect 27 165 80 199
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 166 199
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 165 252 199
-rect 196 131 207 165
-rect 241 131 252 165
-rect 196 115 252 131
-rect 282 165 335 199
-rect 282 131 293 165
-rect 327 131 335 165
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 689 35 757
-rect 69 689 80 757
-rect 27 605 80 689
-rect 110 605 166 773
-rect 196 757 252 773
-rect 196 689 207 757
-rect 241 689 252 757
-rect 196 605 252 689
-rect 282 757 335 773
-rect 282 689 293 757
-rect 327 689 335 757
-rect 282 605 335 689
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-rect 207 131 241 165
-rect 293 131 327 165
-<< pdiffc >>
-rect 35 689 69 757
-rect 207 689 241 757
-rect 293 689 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 546 110 605
-rect 27 530 110 546
-rect 27 496 37 530
-rect 71 496 110 530
-rect 27 480 110 496
-rect 166 488 196 605
-rect 252 567 282 605
-rect 252 540 289 567
-rect 80 199 110 480
-rect 163 472 217 488
-rect 163 438 173 472
-rect 207 438 217 472
-rect 163 422 217 438
-rect 166 199 196 422
-rect 259 398 289 540
-rect 259 382 313 398
-rect 259 362 269 382
-rect 252 348 269 362
-rect 303 348 313 382
-rect 252 332 313 348
-rect 252 199 282 332
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 496 71 530
-rect 173 438 207 472
-rect 269 348 303 382
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 35 621 69 689
-rect 207 757 241 827
-rect 207 673 241 689
-rect 293 757 327 773
-rect 35 587 139 621
-rect 37 530 71 546
-rect 105 382 139 587
-rect 293 513 327 689
-rect 173 472 207 479
-rect 173 422 207 438
-rect 105 348 269 382
-rect 303 348 319 382
-rect 35 165 69 181
-rect 35 61 69 131
-rect 121 165 155 348
-rect 121 115 155 131
-rect 207 165 241 181
-rect 207 61 241 131
-rect 293 165 327 257
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 37 496 71 513
-rect 37 479 71 496
-rect 173 479 207 513
-rect 293 479 327 513
-rect 293 257 327 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 25 513 83 519
-rect 161 513 219 519
-rect 281 513 339 519
-rect 25 479 37 513
-rect 71 479 105 513
-rect 161 479 173 513
-rect 207 479 240 513
-rect 281 479 293 513
-rect 327 479 339 513
-rect 25 473 83 479
-rect 161 473 219 479
-rect 281 473 339 479
-rect 293 297 327 473
-rect 281 291 339 297
-rect 281 257 293 291
-rect 327 257 339 291
-rect 281 251 339 257
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 422 311 422 1 Y
-port 1 n
-rlabel viali 190 496 190 496 1 A
-rlabel viali 54 496 54 496 1 B
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__tbufi_1.mag b/12T_hs/sky130_osu_sc_12T_hs__tbufi_1.mag
deleted file mode 100644
index 3a765d2..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__tbufi_1.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864456
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 485 375 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 238 521 268 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 238 115 268 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 115 238 225
-rect 268 171 321 225
-rect 268 131 279 171
-rect 313 131 321 171
-rect 268 115 321 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 521 238 773
-rect 268 757 321 773
-rect 268 561 279 757
-rect 313 561 321 757
-rect 268 521 321 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 279 131 313 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 629 155 757
-rect 279 561 313 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 80 506 110 521
-rect 39 476 110 506
-rect 39 270 69 476
-rect 166 433 196 521
-rect 133 417 196 433
-rect 133 383 143 417
-rect 177 383 196 417
-rect 133 367 196 383
-rect 238 355 268 521
-rect 238 339 292 355
-rect 111 297 165 313
-rect 111 270 121 297
-rect 39 263 121 270
-rect 155 270 165 297
-rect 238 305 248 339
-rect 282 305 292 339
-rect 238 289 292 305
-rect 155 263 196 270
-rect 39 240 196 263
-rect 80 225 110 240
-rect 166 225 196 240
-rect 238 225 268 289
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 143 383 177 417
-rect 121 263 155 297
-rect 248 305 282 339
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 613 155 629
-rect 279 757 313 773
-rect 35 417 69 561
-rect 143 417 177 433
-rect 35 383 143 417
-rect 35 171 69 383
-rect 143 367 177 383
-rect 211 339 245 553
-rect 279 439 313 561
-rect 211 305 248 339
-rect 282 305 298 339
-rect 103 263 121 297
-rect 155 263 171 297
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 279 171 313 183
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 211 553 245 587
-rect 279 405 313 439
-rect 121 263 155 291
-rect 121 257 155 263
-rect 279 183 313 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 199 587 257 593
-rect 177 553 211 587
-rect 245 553 257 587
-rect 199 547 257 553
-rect 109 513 167 519
-rect 109 479 189 513
-rect 109 473 167 479
-rect 121 297 155 473
-rect 267 439 325 445
-rect 267 405 279 439
-rect 313 405 325 439
-rect 267 399 325 405
-rect 109 291 167 297
-rect 109 257 121 291
-rect 155 257 167 291
-rect 109 251 167 257
-rect 279 223 313 399
-rect 267 217 325 223
-rect 267 183 279 217
-rect 313 183 325 217
-rect 267 177 325 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 268 305 268 1 Y
-port 1 n
-rlabel viali 228 570 228 570 1 A
-port 2 n
-rlabel metal1 138 496 138 496 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__tbufi_l.mag b/12T_hs/sky130_osu_sc_12T_hs__tbufi_l.mag
deleted file mode 100644
index 0cab9c3..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__tbufi_l.mag
+++ /dev/null
@@ -1,183 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864456
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 375 897
-<< pmos >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 238 605 268 773
-<< nmoslvt >>
-rect 80 115 110 199
-rect 166 115 196 199
-rect 238 115 268 199
-<< ndiff >>
-rect 27 165 80 199
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 166 199
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 115 238 199
-rect 268 165 321 199
-rect 268 131 279 165
-rect 313 131 321 165
-rect 268 115 321 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 605 80 621
-rect 110 757 166 773
-rect 110 621 121 757
-rect 155 621 166 757
-rect 110 605 166 621
-rect 196 605 238 773
-rect 268 757 321 773
-rect 268 621 279 757
-rect 313 621 321 757
-rect 268 605 321 621
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-rect 279 131 313 165
-<< pdiffc >>
-rect 35 621 69 757
-rect 121 621 155 757
-rect 279 621 313 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 80 580 110 605
-rect 39 550 110 580
-rect 39 338 69 550
-rect 166 507 196 605
-rect 133 491 196 507
-rect 133 457 143 491
-rect 177 457 196 491
-rect 133 441 196 457
-rect 238 429 268 605
-rect 238 413 292 429
-rect 111 365 165 381
-rect 111 338 121 365
-rect 39 331 121 338
-rect 155 338 165 365
-rect 238 379 248 413
-rect 282 379 292 413
-rect 238 363 292 379
-rect 155 331 196 338
-rect 39 308 196 331
-rect 80 199 110 308
-rect 166 199 196 308
-rect 238 199 268 363
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 143 457 177 491
-rect 121 331 155 365
-rect 248 379 282 413
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 35 491 69 621
-rect 121 757 155 827
-rect 121 605 155 621
-rect 279 757 313 773
-rect 143 491 177 507
-rect 35 457 143 491
-rect 35 165 69 457
-rect 143 441 177 457
-rect 211 413 245 553
-rect 279 513 313 621
-rect 211 379 248 413
-rect 282 379 298 413
-rect 103 331 121 365
-rect 155 331 171 365
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 279 165 313 257
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 211 553 245 587
-rect 279 479 313 513
-rect 121 331 155 365
-rect 279 257 313 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 199 587 257 593
-rect 177 553 211 587
-rect 245 553 257 587
-rect 199 547 257 553
-rect 109 513 167 519
-rect 267 513 325 519
-rect 109 479 189 513
-rect 267 479 279 513
-rect 313 479 325 513
-rect 109 473 167 479
-rect 267 473 325 479
-rect 121 371 155 473
-rect 109 365 167 371
-rect 109 331 121 365
-rect 155 331 167 365
-rect 109 325 167 331
-rect 279 297 313 473
-rect 267 291 325 297
-rect 267 257 279 291
-rect 313 257 325 291
-rect 267 251 325 257
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 342 305 342 1 Y
-port 1 n
-rlabel metal1 138 496 138 496 1 OE
-rlabel viali 228 570 228 570 1 A
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__tiehi.mag b/12T_hs/sky130_osu_sc_12T_hs__tiehi.mag
deleted file mode 100644
index 35ad16b..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__tiehi.mag
+++ /dev/null
@@ -1,99 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864456
-<< checkpaint >>
-rect -1209 -1243 1345 2131
-<< nwell >>
-rect -9 485 199 897
-<< pmos >>
-rect 80 521 110 773
-<< nmoslvt >>
-rect 80 115 110 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 225
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 561 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 337 110 521
-rect 80 321 134 337
-rect 80 287 90 321
-rect 124 287 134 321
-rect 80 271 134 287
-rect 80 225 110 271
-rect 80 89 110 115
-<< polycont >>
-rect 90 287 124 321
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 827
-rect 35 545 69 561
-rect 121 757 155 773
-rect 121 513 155 561
-rect 74 287 90 321
-rect 124 287 155 321
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 287
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 121 479 155 513
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 94 513 167 519
-rect 94 479 121 513
-rect 155 479 167 513
-rect 94 473 167 479
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 138 496 138 496 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__tielo.mag b/12T_hs/sky130_osu_sc_12T_hs__tielo.mag
deleted file mode 100644
index 8584fe8..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__tielo.mag
+++ /dev/null
@@ -1,99 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864456
-<< checkpaint >>
-rect -1209 -1243 1345 2131
-<< nwell >>
-rect -9 485 199 897
-<< pmos >>
-rect 80 521 110 773
-<< nmoslvt >>
-rect 80 115 110 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 225
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 561 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 469 110 521
-rect 80 453 134 469
-rect 80 419 90 453
-rect 124 419 134 453
-rect 80 403 134 419
-rect 80 225 110 403
-rect 80 89 110 115
-<< polycont >>
-rect 90 419 124 453
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 827
-rect 35 545 69 561
-rect 121 757 155 773
-rect 121 453 155 561
-rect 74 419 90 453
-rect 124 419 155 453
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 257
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 121 257 155 291
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 94 291 167 297
-rect 94 257 121 291
-rect 155 257 167 291
-rect 94 251 167 257
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 138 274 138 274 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__tnbufi_1.mag b/12T_hs/sky130_osu_sc_12T_hs__tnbufi_1.mag
deleted file mode 100644
index 002c16a..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__tnbufi_1.mag
+++ /dev/null
@@ -1,180 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864456
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 485 375 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 238 521 268 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 238 115 268 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 115 238 225
-rect 268 171 321 225
-rect 268 131 279 171
-rect 313 131 321 171
-rect 268 115 321 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 521 238 773
-rect 268 757 321 773
-rect 268 561 279 757
-rect 313 561 321 757
-rect 268 521 321 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 279 131 313 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 629 155 757
-rect 279 561 313 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 80 506 110 521
-rect 166 506 196 521
-rect 39 476 196 506
-rect 39 270 69 476
-rect 111 474 165 476
-rect 111 440 121 474
-rect 155 440 165 474
-rect 111 424 165 440
-rect 111 362 196 378
-rect 111 328 121 362
-rect 155 328 196 362
-rect 111 312 196 328
-rect 39 240 110 270
-rect 80 225 110 240
-rect 166 225 196 312
-rect 238 355 268 521
-rect 238 339 292 355
-rect 238 305 248 339
-rect 282 305 292 339
-rect 238 289 292 305
-rect 238 225 268 289
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 121 440 155 474
-rect 121 328 155 362
-rect 248 305 282 339
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 613 155 629
-rect 279 757 313 773
-rect 35 362 69 561
-rect 121 474 155 479
-rect 121 424 155 440
-rect 121 362 155 378
-rect 35 328 121 362
-rect 35 171 69 328
-rect 121 312 155 328
-rect 211 339 245 553
-rect 279 439 313 561
-rect 211 305 248 339
-rect 282 305 298 339
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 279 171 313 183
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 211 553 245 587
-rect 121 479 155 513
-rect 279 405 313 439
-rect 279 183 313 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 199 587 257 593
-rect 177 553 211 587
-rect 245 553 257 587
-rect 199 547 257 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 189 513
-rect 109 473 167 479
-rect 267 439 325 445
-rect 267 405 279 439
-rect 313 405 325 439
-rect 267 399 325 405
-rect 279 223 313 399
-rect 267 217 325 223
-rect 267 183 279 217
-rect 313 183 325 217
-rect 267 177 325 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 268 305 268 1 Y
-port 1 n
-rlabel viali 228 570 228 570 1 A
-port 2 n
-rlabel viali 138 496 138 496 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__tnbufi_l.mag b/12T_hs/sky130_osu_sc_12T_hs__tnbufi_l.mag
deleted file mode 100644
index b3a9a0e..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__tnbufi_l.mag
+++ /dev/null
@@ -1,182 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864457
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 375 897
-<< pmos >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 238 605 268 773
-<< nmoslvt >>
-rect 80 115 110 199
-rect 166 115 196 199
-rect 238 115 268 199
-<< ndiff >>
-rect 27 165 80 199
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 166 199
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 115 238 199
-rect 268 165 321 199
-rect 268 131 279 165
-rect 313 131 321 165
-rect 268 115 321 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 605 80 621
-rect 110 757 166 773
-rect 110 621 121 757
-rect 155 621 166 757
-rect 110 605 166 621
-rect 196 605 238 773
-rect 268 757 321 773
-rect 268 621 279 757
-rect 313 621 321 757
-rect 268 605 321 621
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-rect 279 131 313 165
-<< pdiffc >>
-rect 35 621 69 757
-rect 121 621 155 757
-rect 279 621 313 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 80 580 110 605
-rect 166 580 196 605
-rect 39 550 196 580
-rect 39 337 69 550
-rect 111 548 165 550
-rect 111 514 121 548
-rect 155 514 165 548
-rect 111 498 165 514
-rect 111 429 196 445
-rect 111 395 121 429
-rect 155 395 196 429
-rect 111 379 196 395
-rect 39 308 110 337
-rect 40 307 110 308
-rect 80 199 110 307
-rect 166 199 196 379
-rect 238 429 268 605
-rect 238 413 292 429
-rect 238 379 248 413
-rect 282 379 292 413
-rect 238 363 292 379
-rect 238 199 268 363
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 121 514 155 548
-rect 121 395 155 429
-rect 248 379 282 413
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 35 430 69 621
-rect 121 757 155 827
-rect 121 605 155 621
-rect 279 757 313 773
-rect 279 587 313 621
-rect 121 548 155 564
-rect 121 513 155 514
-rect 121 430 155 445
-rect 35 429 155 430
-rect 35 395 121 429
-rect 35 165 69 395
-rect 121 379 155 395
-rect 245 405 248 413
-rect 211 379 248 405
-rect 282 379 298 413
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 279 165 313 257
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 279 553 313 587
-rect 121 479 155 513
-rect 211 405 245 439
-rect 279 257 313 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 266 587 325 593
-rect 266 553 279 587
-rect 313 553 325 587
-rect 266 547 325 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 189 513
-rect 109 473 167 479
-rect 199 439 257 445
-rect 199 438 211 439
-rect 177 405 211 438
-rect 245 405 257 439
-rect 177 404 257 405
-rect 199 399 257 404
-rect 285 297 319 547
-rect 267 291 325 297
-rect 267 257 279 291
-rect 313 257 325 291
-rect 267 251 325 257
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 342 305 342 1 Y
-port 1 n
-rlabel viali 228 423 228 423 1 A
-rlabel viali 138 497 138 497 1 OE
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__xnor2_l.mag b/12T_hs/sky130_osu_sc_12T_hs__xnor2_l.mag
deleted file mode 100644
index d55ec42..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__xnor2_l.mag
+++ /dev/null
@@ -1,296 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864457
-<< checkpaint >>
-rect -1209 -1243 1753 2131
-<< nwell >>
-rect -9 485 638 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 238 521 268 773
-rect 358 521 388 773
-rect 430 521 460 773
-rect 516 521 546 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 238 115 268 225
-rect 358 115 388 225
-rect 430 115 460 225
-rect 516 115 546 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 165 166 225
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 115 238 225
-rect 268 171 358 225
-rect 268 131 279 171
-rect 347 131 358 171
-rect 268 115 358 131
-rect 388 115 430 225
-rect 460 165 516 225
-rect 460 131 471 165
-rect 505 131 516 165
-rect 460 115 516 131
-rect 546 171 599 225
-rect 546 131 557 171
-rect 591 131 599 171
-rect 546 115 599 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 521 238 773
-rect 268 757 358 773
-rect 268 561 279 757
-rect 347 561 358 757
-rect 268 521 358 561
-rect 388 521 430 773
-rect 460 757 516 773
-rect 460 561 471 757
-rect 505 561 516 757
-rect 460 521 516 561
-rect 546 757 599 773
-rect 546 562 557 757
-rect 591 562 599 757
-rect 546 521 599 562
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 165
-rect 279 131 347 171
-rect 471 131 505 165
-rect 557 131 591 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 561 155 757
-rect 279 561 347 757
-rect 471 561 505 757
-rect 557 562 591 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 358 773 388 799
-rect 430 773 460 799
-rect 516 773 546 799
-rect 80 506 110 521
-rect 70 476 110 506
-rect 70 270 100 476
-rect 166 421 196 521
-rect 142 405 196 421
-rect 142 371 152 405
-rect 186 371 196 405
-rect 142 355 196 371
-rect 238 490 268 521
-rect 238 474 292 490
-rect 238 440 248 474
-rect 282 440 292 474
-rect 238 424 292 440
-rect 142 297 196 313
-rect 142 270 152 297
-rect 70 263 152 270
-rect 186 263 196 297
-rect 70 240 196 263
-rect 80 225 110 240
-rect 166 225 196 240
-rect 238 225 268 424
-rect 358 421 388 521
-rect 430 506 460 521
-rect 516 506 546 521
-rect 430 476 546 506
-rect 358 405 472 421
-rect 358 391 428 405
-rect 418 371 428 391
-rect 462 371 472 405
-rect 418 355 472 371
-rect 516 313 546 476
-rect 326 297 380 313
-rect 326 263 336 297
-rect 370 270 380 297
-rect 479 297 546 313
-rect 479 270 489 297
-rect 370 263 388 270
-rect 326 247 388 263
-rect 358 225 388 247
-rect 430 263 489 270
-rect 523 263 546 297
-rect 430 240 546 263
-rect 430 225 460 240
-rect 516 225 546 240
-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 371 186 405
-rect 248 440 282 474
-rect 152 263 186 297
-rect 428 371 462 405
-rect 336 263 370 297
-rect 489 263 523 297
-<< locali >>
-rect 0 867 638 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 638 867
-rect 35 757 69 773
-rect 35 405 69 561
-rect 121 757 155 827
-rect 279 757 347 773
-rect 121 545 155 561
-rect 268 587 279 593
-rect 302 553 347 561
-rect 279 545 347 553
-rect 471 757 505 827
-rect 471 545 505 561
-rect 557 757 591 773
-rect 557 474 591 562
-rect 232 440 248 474
-rect 282 440 591 474
-rect 35 371 152 405
-rect 186 371 370 405
-rect 35 171 69 371
-rect 152 297 186 313
-rect 336 297 370 371
-rect 404 371 428 405
-rect 462 371 478 405
-rect 404 365 438 371
-rect 152 247 186 257
-rect 268 187 302 257
-rect 336 247 370 263
-rect 489 297 523 313
-rect 489 247 523 257
-rect 35 115 69 131
-rect 121 165 155 181
-rect 268 171 347 187
-rect 268 153 279 171
-rect 121 61 155 131
-rect 279 115 347 131
-rect 471 165 505 181
-rect 471 61 505 131
-rect 557 171 591 440
-rect 557 115 591 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 268 561 279 587
-rect 279 561 302 587
-rect 268 553 302 561
-rect 404 331 438 365
-rect 152 263 186 291
-rect 152 257 186 263
-rect 268 257 302 291
-rect 489 263 523 291
-rect 489 257 523 263
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 638 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 638 867
-rect 0 827 638 833
-rect 256 587 314 593
-rect 256 553 268 587
-rect 302 553 314 587
-rect 256 547 314 553
-rect 268 297 302 547
-rect 392 365 451 371
-rect 392 331 404 365
-rect 438 331 451 365
-rect 392 325 451 331
-rect 140 291 198 297
-rect 140 257 152 291
-rect 186 257 198 291
-rect 140 251 198 257
-rect 256 291 314 297
-rect 256 257 268 291
-rect 302 257 314 291
-rect 256 251 314 257
-rect 152 217 186 251
-rect 404 217 438 325
-rect 477 291 535 297
-rect 477 257 489 291
-rect 523 257 557 291
-rect 477 251 535 257
-rect 152 183 438 217
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 284 331 284 331 1 Y
-port 3 n
-rlabel viali 169 274 169 274 1 A
-rlabel viali 506 280 506 280 1 B
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_hs/sky130_osu_sc_12T_hs__xor2_l.mag b/12T_hs/sky130_osu_sc_12T_hs__xor2_l.mag
deleted file mode 100644
index 6df589d..0000000
--- a/12T_hs/sky130_osu_sc_12T_hs__xor2_l.mag
+++ /dev/null
@@ -1,290 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864457
-<< checkpaint >>
-rect -1209 -1243 1753 2131
-<< nwell >>
-rect -9 485 638 897
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 238 521 268 773
-rect 358 521 388 773
-rect 430 521 460 773
-rect 516 521 546 773
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 238 115 268 225
-rect 358 115 388 225
-rect 430 115 460 225
-rect 516 115 546 225
-<< ndiff >>
-rect 27 171 80 225
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 225
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 115 238 225
-rect 268 171 358 225
-rect 268 131 279 171
-rect 347 131 358 171
-rect 268 115 358 131
-rect 388 115 430 225
-rect 460 171 516 225
-rect 460 131 471 171
-rect 505 131 516 171
-rect 460 115 516 131
-rect 546 171 599 225
-rect 546 131 557 171
-rect 591 131 599 171
-rect 546 115 599 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 521 238 773
-rect 268 757 358 773
-rect 268 561 279 757
-rect 347 561 358 757
-rect 268 521 358 561
-rect 388 521 430 773
-rect 460 757 516 773
-rect 460 697 471 757
-rect 505 697 516 757
-rect 460 521 516 697
-rect 546 757 599 773
-rect 546 562 557 757
-rect 591 562 599 757
-rect 546 521 599 562
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 279 131 347 171
-rect 471 131 505 171
-rect 557 131 591 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 279 561 347 757
-rect 471 697 505 757
-rect 557 562 591 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 358 773 388 799
-rect 430 773 460 799
-rect 516 773 546 799
-rect 80 506 110 521
-rect 166 506 196 521
-rect 70 476 196 506
-rect 70 265 100 476
-rect 142 474 196 476
-rect 142 440 152 474
-rect 186 440 196 474
-rect 142 424 196 440
-rect 142 366 196 382
-rect 142 332 152 366
-rect 186 332 196 366
-rect 142 316 196 332
-rect 70 240 110 265
-rect 80 225 110 240
-rect 166 225 196 316
-rect 238 313 268 521
-rect 358 490 388 521
-rect 334 474 388 490
-rect 430 506 460 521
-rect 516 506 546 521
-rect 430 476 546 506
-rect 334 440 344 474
-rect 378 440 388 474
-rect 334 424 388 440
-rect 479 474 546 476
-rect 479 440 489 474
-rect 523 440 546 474
-rect 479 424 546 440
-rect 420 365 474 381
-rect 420 342 430 365
-rect 358 331 430 342
-rect 464 331 474 365
-rect 238 297 292 313
-rect 238 263 248 297
-rect 282 263 292 297
-rect 238 247 292 263
-rect 358 312 474 331
-rect 238 225 268 247
-rect 358 225 388 312
-rect 516 270 546 424
-rect 430 240 546 270
-rect 430 225 460 240
-rect 516 225 546 240
-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 440 186 474
-rect 152 332 186 366
-rect 344 440 378 474
-rect 489 440 523 474
-rect 430 331 464 365
-rect 248 263 282 297
-<< locali >>
-rect 0 867 638 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 638 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 279 757 347 773
-rect 35 366 69 561
-rect 152 553 200 587
-rect 268 561 279 579
-rect 471 757 505 827
-rect 471 681 505 697
-rect 557 757 591 773
-rect 152 474 186 553
-rect 268 545 347 561
-rect 136 440 152 474
-rect 186 440 202 474
-rect 268 439 302 545
-rect 344 474 378 490
-rect 344 366 378 440
-rect 35 332 152 366
-rect 186 332 378 366
-rect 412 365 446 553
-rect 489 474 523 479
-rect 489 424 523 440
-rect 35 171 69 332
-rect 412 331 430 365
-rect 464 331 480 365
-rect 557 297 591 562
-rect 232 263 248 297
-rect 282 263 591 297
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 279 183 296 187
-rect 330 183 347 187
-rect 279 171 347 183
-rect 279 115 347 131
-rect 471 171 505 187
-rect 471 61 505 131
-rect 557 171 591 263
-rect 557 115 591 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 200 553 234 587
-rect 412 553 446 587
-rect 268 405 302 439
-rect 489 479 523 513
-rect 296 183 330 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 638 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 638 867
-rect 0 827 638 833
-rect 188 587 246 593
-rect 400 587 458 593
-rect 188 553 200 587
-rect 234 553 412 587
-rect 446 553 458 587
-rect 188 547 246 553
-rect 400 547 458 553
-rect 477 513 535 519
-rect 455 479 489 513
-rect 523 479 535 513
-rect 477 473 535 479
-rect 256 439 314 445
-rect 256 405 268 439
-rect 302 405 314 439
-rect 256 399 314 405
-rect 268 223 302 399
-rect 268 217 342 223
-rect 268 183 296 217
-rect 330 183 342 217
-rect 284 177 342 183
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 218 570 218 570 1 A
-port 1 n
-rlabel metal1 285 390 285 390 1 Y
-port 2 n
-rlabel viali 506 496 506 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/.magicrc b/12T_ls/.magicrc
deleted file mode 100755
index 79cac60..0000000
--- a/12T_ls/.magicrc
+++ /dev/null
@@ -1,105 +0,0 @@
-puts stdout "Sourcing design .magicrc for technology EFS8A ..."
-
-# Put grid on 0.005 pitch. This is important, as some commands don't
-# rescale the grid automatically (such as lef read?).
-
-set scalefac [tech lambda]
-if {[lindex $scalefac 1] < 2} {
- scalegrid 1 2
-}
-
-# drc off
-drc euclidean on
-
-#set PDKPATH "~/projects/efabless/tech/SkyWater/EFS8A"
-
-# loading technology
-#tech load $PDKPATH/libs.tech/magic/EFS8A.tech
-tech load ../../char/techfiles/sky130A.tech
-
-# load device generator
-#source $PDKPATH/libs.tech/magic/EFS8A.tcl
-
-# load bind keys (optional)
-# source $PDKPATH/libs.tech/magic/EFS8A-BindKeys
-
-# set units to lambda grid
-snap internal
-
-# add path to reference cells
-#set MAGPATH "${PDKPATH}/libs.ref/mag"
-#addpath ${MAGPATH}/primdev
-#addpath ${MAGPATH}/s8fmlt
-#addpath ${MAGPATH}/s8iom0
-#addpath ${MAGPATH}/scs8hd
-#addpath ${MAGPATH}/scs8hdll
-#addpath ${MAGPATH}/scs8hvl
-#addpath ${MAGPATH}/scs8hs
-#addpath ${MAGPATH}/scs8ms
-#addpath ${MAGPATH}/scs8ls
-#addpath ${MAGPATH}/scs8lp
-
-# add path to GDS cells
-
-# add path to IP from catalog. This procedure defined in the PDK script.
-catch {magic::query_mylib_ip}
-# add path to local IP from user design space. Defined in the PDK script.
-catch {magic::query_my_projects}
-
-macro Shift_G "grid 74"
-macro XK_Left "scroll l .1 w"
-macro Shift_XK_Left "scroll l 1 w"
-macro Control_XK_Left "box grow w 1"
-macro Control_Shift_XK_Left "box shrink e 1"
-macro XK_Right "scroll r .1 w"
-macro Shift_XK_Right "scroll r 1 w"
-macro Control_XK_Right "box grow e 1"
-macro Control_Shift_XK_Right "box shrink w 1"
-macro XK_Up "scroll u .1 w"
-macro Shift_XK_Up "scroll u 1 w"
-macro Control_XK_Up "box grow n 1"
-macro Control_Shift_XK_Up "box shrink s 1"
-macro XK_Down "scroll d .1 w"
-macro Shift_XK_Down "scroll d 1 w"
-macro Control_XK_Down "box grow s 1"
-macro Control_Shift_XK_Down "box shrink n 1"
-
-macro XK_Pointer_Button4 "scroll u .05 w"
-macro XK_Pointer_Button5 "scroll d .05 w"
-macro . "history redo -1"
-
-macro XK_L "select less area {ndif pdif nwell poly}"
-macro XK_K "select less area nwell"
-macro XK_J "select less area {m1 lic}"
-macro XK_H "select less area li1"
-macro Control_Shift_XK_X "rotate"
-macro Shift_XK_Pointer_Button4 "stretch N 74"
-macro Shift_XK_Pointer_Button5 "stretch S 74"
-macro Control_XK_Pointer_Button4 "stretch N 34"
-macro Control_XK_Pointer_Button5 "stretch S 34"
-macro Control_Shift_XK_Q "stretch W 88"
-macro Control_Shift_XK_R "stretch E 88"
-macro Control_Shift_XK_W "stretch N 28"
-macro Control_Shift_XK_E "stretch N 4"
-macro XK_Y "stretch N 6"
-#macro Control_Shift_XK_W "stretch S 6"
-#macro Control_Shift_XK_E "stretch S 8"
-
-macro Control_Shift_XK_Pointer_Button4 "stretch N 17"
-macro Control_Shift_XK_Pointer_Button5 "stretch S 17"
-macro Control_Shift_XK_G "select area {m1 lic}"
-macro Control_Shift_XK_F "select area {poly polycont}"
-macro Control_Shift_XK_D "select area {ndc li1}"
-macro Control_Shift_XK_S "select area ntrans"
-
-macro Shift_D "select clear; move S 10; paint m1c"
-macro Shift_F "select clear; move N 10; paint m1c"
-
-
-macro Shift_B "box height 1.0um; move S 1.655um; select area; erase; select clear; move N 1um; select area; move S 1um; select clear; box height 0.26um; move S 4.35um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.26um; select clear; box height 20um; select area; move S 0.26um"
-
-
-macro Shift_N "box height 1.74um; move S 2.395um; select area; erase; select clear; move N 1.74um; select area; move S 1.74um; select clear; box height 0.48um; move S 3.61um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.48um; select clear; box height 20um; select area; move S 0.48um"
-
-
-macro Shift_M "box height 1.02um; move S 2.015um; select area; erase; select clear; move N 1.02um; box height 1.20um; select area; move S 1.02um; select clear; box height 0.12um; move S 0.56um; select area; erase; select clear; box height 5.00um; select area; move S 0.12um; select clear; move N 0.12um; box height 0.21um; move S 2.98um; select area;erase; select clear; box height 1.105um; move S 1.105um; select area; move N 0.21um; select clear; box height 0.17um; move N 0.825um; select area; erase; move S 0.825um; box height 0.825um; select area; move N 0.17um"
diff --git a/12T_ls/sky130_osu_sc_12T_ls__addf_1.mag b/12T_ls/sky130_osu_sc_12T_ls__addf_1.mag
deleted file mode 100644
index 1b1811f..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__addf_1.mag
+++ /dev/null
@@ -1,651 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864413
-<< checkpaint >>
-rect -1209 -1243 2569 2131
-<< nwell >>
-rect -9 485 1435 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 410 115 440 219
-rect 496 115 526 219
-rect 582 115 612 219
-rect 668 115 698 219
-rect 754 115 784 219
-rect 840 115 870 219
-rect 922 115 952 219
-rect 1004 115 1034 219
-rect 1102 115 1132 219
-rect 1292 115 1322 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 410 521 440 773
-rect 496 521 526 773
-rect 582 521 612 773
-rect 668 521 698 773
-rect 754 521 784 773
-rect 840 521 870 773
-rect 922 521 952 773
-rect 1004 521 1034 773
-rect 1102 521 1132 773
-rect 1292 521 1322 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-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 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 115 410 219
-rect 440 171 496 219
-rect 440 131 451 171
-rect 485 131 496 171
-rect 440 115 496 131
-rect 526 171 582 219
-rect 526 131 537 171
-rect 571 131 582 171
-rect 526 115 582 131
-rect 612 157 668 219
-rect 612 123 623 157
-rect 657 123 668 157
-rect 612 115 668 123
-rect 698 171 754 219
-rect 698 131 709 171
-rect 743 131 754 171
-rect 698 115 754 131
-rect 784 165 840 219
-rect 784 131 795 165
-rect 829 131 840 165
-rect 784 115 840 131
-rect 870 115 922 219
-rect 952 115 1004 219
-rect 1034 171 1102 219
-rect 1034 131 1045 171
-rect 1079 131 1102 171
-rect 1034 115 1102 131
-rect 1132 171 1185 219
-rect 1132 131 1143 171
-rect 1177 131 1185 171
-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 171 1375 219
-rect 1322 131 1333 171
-rect 1367 131 1375 171
-rect 1322 115 1375 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 629 293 757
-rect 327 629 338 757
-rect 282 521 338 629
-rect 368 521 410 773
-rect 440 757 496 773
-rect 440 629 451 757
-rect 485 629 496 757
-rect 440 521 496 629
-rect 526 757 582 773
-rect 526 629 537 757
-rect 571 629 582 757
-rect 526 521 582 629
-rect 612 757 668 773
-rect 612 723 623 757
-rect 657 723 668 757
-rect 612 521 668 723
-rect 698 757 754 773
-rect 698 663 709 757
-rect 743 663 754 757
-rect 698 521 754 663
-rect 784 757 840 773
-rect 784 629 795 757
-rect 829 629 840 757
-rect 784 521 840 629
-rect 870 521 922 773
-rect 952 521 1004 773
-rect 1034 757 1102 773
-rect 1034 697 1045 757
-rect 1079 697 1102 757
-rect 1034 521 1102 697
-rect 1132 757 1185 773
-rect 1132 629 1143 757
-rect 1177 629 1185 757
-rect 1132 521 1185 629
-rect 1239 757 1292 773
-rect 1239 561 1247 757
-rect 1281 561 1292 757
-rect 1239 521 1292 561
-rect 1322 757 1375 773
-rect 1322 561 1333 757
-rect 1367 561 1375 757
-rect 1322 521 1375 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 165
-rect 207 131 241 171
-rect 293 131 327 171
-rect 451 131 485 171
-rect 537 131 571 171
-rect 623 123 657 157
-rect 709 131 743 171
-rect 795 131 829 165
-rect 1045 131 1079 171
-rect 1143 131 1177 171
-rect 1247 131 1281 165
-rect 1333 131 1367 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 121 697 155 757
-rect 207 629 241 757
-rect 293 629 327 757
-rect 451 629 485 757
-rect 537 629 571 757
-rect 623 723 657 757
-rect 709 663 743 757
-rect 795 629 829 757
-rect 1045 697 1079 757
-rect 1143 629 1177 757
-rect 1247 561 1281 757
-rect 1333 561 1367 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-rect 979 827 1003 861
-rect 1037 827 1061 861
-rect 1115 827 1139 861
-rect 1173 827 1197 861
-rect 1251 827 1275 861
-rect 1309 827 1333 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-rect 1003 827 1037 861
-rect 1139 827 1173 861
-rect 1275 827 1309 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 801
-rect 338 773 368 801
-rect 410 773 440 799
-rect 496 773 526 799
-rect 582 773 612 801
-rect 668 773 698 801
-rect 754 773 784 801
-rect 840 773 870 801
-rect 922 773 952 801
-rect 1004 773 1034 801
-rect 1102 773 1132 801
-rect 1292 773 1322 801
-rect 80 381 110 521
-rect 166 489 196 521
-rect 152 473 206 489
-rect 152 439 162 473
-rect 196 439 206 473
-rect 152 423 206 439
-rect 70 365 124 381
-rect 70 331 80 365
-rect 114 331 124 365
-rect 70 315 124 331
-rect 80 219 110 315
-rect 166 219 196 423
-rect 252 381 282 521
-rect 338 423 368 521
-rect 410 496 440 521
-rect 496 496 526 521
-rect 410 466 526 496
-rect 338 407 430 423
-rect 238 365 292 381
-rect 238 331 248 365
-rect 282 331 292 365
-rect 238 315 292 331
-rect 338 373 386 407
-rect 420 373 430 407
-rect 338 357 430 373
-rect 472 363 502 466
-rect 582 364 612 521
-rect 668 455 698 521
-rect 656 439 710 455
-rect 656 405 666 439
-rect 700 405 710 439
-rect 656 389 710 405
-rect 252 219 282 315
-rect 338 219 368 357
-rect 472 347 526 363
-rect 472 313 482 347
-rect 516 313 526 347
-rect 472 271 526 313
-rect 568 348 622 364
-rect 568 314 578 348
-rect 612 314 622 348
-rect 568 298 622 314
-rect 410 241 526 271
-rect 410 219 440 241
-rect 496 219 526 241
-rect 582 219 612 298
-rect 668 219 698 389
-rect 754 324 784 521
-rect 840 460 870 521
-rect 826 444 880 460
-rect 826 410 836 444
-rect 870 410 880 444
-rect 826 394 880 410
-rect 922 417 952 521
-rect 1004 489 1034 521
-rect 1004 459 1048 489
-rect 1102 488 1132 521
-rect 922 401 976 417
-rect 742 308 796 324
-rect 742 274 752 308
-rect 786 274 796 308
-rect 742 258 796 274
-rect 754 219 784 258
-rect 840 219 870 394
-rect 922 367 932 401
-rect 966 367 976 401
-rect 922 351 976 367
-rect 922 219 952 351
-rect 1018 307 1048 459
-rect 1090 472 1144 488
-rect 1292 485 1322 521
-rect 1090 438 1100 472
-rect 1134 438 1144 472
-rect 1090 422 1144 438
-rect 1255 469 1322 485
-rect 1255 435 1265 469
-rect 1299 435 1322 469
-rect 1004 291 1058 307
-rect 1004 257 1014 291
-rect 1048 257 1058 291
-rect 1004 241 1058 257
-rect 1004 219 1034 241
-rect 1102 219 1132 422
-rect 1255 419 1322 435
-rect 1292 219 1322 419
-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 439 196 473
-rect 80 331 114 365
-rect 248 331 282 365
-rect 386 373 420 407
-rect 666 405 700 439
-rect 482 313 516 347
-rect 578 314 612 348
-rect 836 410 870 444
-rect 752 274 786 308
-rect 932 367 966 401
-rect 1100 438 1134 472
-rect 1265 435 1299 469
-rect 1014 257 1048 291
-<< locali >>
-rect 0 867 1408 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 1003 867
-rect 1037 827 1139 867
-rect 1173 827 1275 867
-rect 1309 827 1408 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 613 69 629
-rect 207 613 241 629
-rect 35 579 241 613
-rect 293 757 327 773
-rect 293 546 327 629
-rect 451 757 485 827
-rect 451 613 485 629
-rect 537 757 571 773
-rect 623 757 657 827
-rect 623 707 657 723
-rect 709 757 743 773
-rect 571 629 743 663
-rect 795 757 829 773
-rect 1045 757 1079 827
-rect 1045 681 1079 697
-rect 1143 757 1177 773
-rect 537 613 571 629
-rect 795 588 829 629
-rect 1143 588 1177 629
-rect 752 554 1100 588
-rect 752 553 812 554
-rect 293 509 350 546
-rect 80 473 114 479
-rect 80 439 162 473
-rect 196 439 212 473
-rect 248 365 282 405
-rect 64 331 80 365
-rect 114 331 130 365
-rect 248 315 282 331
-rect 316 291 350 509
-rect 386 479 444 513
-rect 386 407 420 479
-rect 386 357 420 373
-rect 578 348 612 479
-rect 752 510 787 553
-rect 650 405 666 439
-rect 700 405 716 439
-rect 466 313 482 347
-rect 516 313 532 347
-rect 752 376 786 510
-rect 836 444 870 479
-rect 1066 488 1100 554
-rect 1247 757 1281 827
-rect 1177 554 1202 571
-rect 1143 537 1202 554
-rect 1247 545 1281 561
-rect 1333 757 1367 773
-rect 1066 472 1134 488
-rect 820 410 836 444
-rect 870 410 886 444
-rect 1066 441 1100 472
-rect 1089 438 1100 441
-rect 1100 422 1134 438
-rect 932 401 966 405
-rect 752 342 879 376
-rect 932 351 966 367
-rect 1168 365 1202 537
-rect 1333 513 1367 561
-rect 578 298 612 314
-rect 736 274 752 308
-rect 786 291 810 308
-rect 35 215 241 249
-rect 35 189 70 215
-rect 35 171 69 189
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 207 171 241 215
-rect 207 114 241 131
-rect 293 223 350 257
-rect 293 171 327 223
-rect 537 206 743 240
-rect 293 114 327 131
-rect 451 171 485 187
-rect 451 61 485 131
-rect 537 171 571 206
-rect 709 171 743 206
-rect 845 190 879 342
-rect 1014 291 1048 331
-rect 1143 331 1202 365
-rect 1265 469 1299 485
-rect 998 257 1014 291
-rect 1048 257 1064 291
-rect 1014 256 1048 257
-rect 537 114 571 131
-rect 607 123 623 157
-rect 657 123 673 157
-rect 623 61 657 123
-rect 709 114 743 131
-rect 795 165 879 190
-rect 829 156 879 165
-rect 1045 171 1079 187
-rect 795 114 829 131
-rect 1045 61 1079 131
-rect 1143 171 1177 331
-rect 1265 291 1299 435
-rect 1245 257 1299 291
-rect 1143 115 1177 131
-rect 1247 165 1281 181
-rect 1247 61 1281 131
-rect 1333 171 1367 479
-rect 1333 115 1367 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 1003 861 1037 867
-rect 1003 833 1037 861
-rect 1139 861 1173 867
-rect 1139 833 1173 861
-rect 1275 861 1309 867
-rect 1275 833 1309 861
-rect 80 479 114 513
-rect 248 405 282 439
-rect 80 331 114 365
-rect 444 479 478 513
-rect 578 479 612 513
-rect 482 347 516 365
-rect 666 405 700 439
-rect 482 331 516 347
-rect 836 479 870 513
-rect 1143 554 1177 588
-rect 932 405 966 439
-rect 316 257 350 291
-rect 777 274 786 291
-rect 786 274 811 291
-rect 777 257 811 274
-rect 1014 331 1048 365
-rect 1211 257 1245 291
-rect 1333 479 1367 513
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 867 1408 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 1003 867
-rect 1037 833 1139 867
-rect 1173 833 1275 867
-rect 1309 833 1408 867
-rect 0 827 1408 833
-rect 1131 588 1189 594
-rect 1109 554 1143 588
-rect 1177 554 1189 588
-rect 1131 548 1189 554
-rect 68 513 126 519
-rect 432 513 490 519
-rect 566 513 624 519
-rect 824 513 882 520
-rect 1321 513 1379 519
-rect 68 479 80 513
-rect 114 479 444 513
-rect 478 479 578 513
-rect 612 479 836 513
-rect 870 479 882 513
-rect 1299 479 1333 513
-rect 1367 479 1379 513
-rect 68 473 126 479
-rect 432 473 490 479
-rect 566 473 624 479
-rect 824 472 882 479
-rect 1321 473 1379 479
-rect 236 439 296 445
-rect 650 439 717 445
-rect 920 439 978 445
-rect 236 405 248 439
-rect 282 405 666 439
-rect 700 405 932 439
-rect 966 405 978 439
-rect 236 399 296 405
-rect 650 399 717 405
-rect 920 399 978 405
-rect 68 365 126 371
-rect 470 365 528 371
-rect 1002 365 1060 371
-rect 68 331 80 365
-rect 114 331 482 365
-rect 516 331 1014 365
-rect 1048 331 1060 365
-rect 68 325 126 331
-rect 470 325 528 331
-rect 1002 325 1060 331
-rect 304 291 362 297
-rect 771 291 820 297
-rect 1199 291 1257 297
-rect 304 257 316 291
-rect 350 257 777 291
-rect 811 257 1211 291
-rect 1245 257 1257 291
-rect 304 251 362 257
-rect 771 251 820 257
-rect 1199 251 1257 257
-rect 0 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel viali 1160 571 1160 571 1 S
-port 5 n
-rlabel viali 1350 496 1350 496 1 CO
-port 6 n
-rlabel metal1 129 496 129 496 1 B
-rlabel viali 265 422 265 422 1 CI
-rlabel viali 97 348 97 348 1 A
-port 1 n
-rlabel viali 1228 274 1228 274 1 CON
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__addf_l.mag b/12T_ls/sky130_osu_sc_12T_ls__addf_l.mag
deleted file mode 100644
index fea3086..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__addf_l.mag
+++ /dev/null
@@ -1,651 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864413
-<< checkpaint >>
-rect -1209 -1243 2569 2131
-<< nwell >>
-rect -9 485 1435 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 410 115 440 219
-rect 496 115 526 219
-rect 582 115 612 219
-rect 668 115 698 219
-rect 754 115 784 219
-rect 840 115 870 219
-rect 922 115 952 219
-rect 1004 115 1034 219
-rect 1102 115 1132 219
-rect 1292 115 1322 187
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 410 521 440 773
-rect 496 521 526 773
-rect 582 521 612 773
-rect 668 521 698 773
-rect 754 521 784 773
-rect 840 521 870 773
-rect 922 521 952 773
-rect 1004 521 1034 773
-rect 1102 521 1132 773
-rect 1292 605 1322 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-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 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 115 410 219
-rect 440 171 496 219
-rect 440 131 451 171
-rect 485 131 496 171
-rect 440 115 496 131
-rect 526 171 582 219
-rect 526 131 537 171
-rect 571 131 582 171
-rect 526 115 582 131
-rect 612 157 668 219
-rect 612 123 623 157
-rect 657 123 668 157
-rect 612 115 668 123
-rect 698 171 754 219
-rect 698 131 709 171
-rect 743 131 754 171
-rect 698 115 754 131
-rect 784 165 840 219
-rect 784 131 795 165
-rect 829 131 840 165
-rect 784 115 840 131
-rect 870 115 922 219
-rect 952 115 1004 219
-rect 1034 171 1102 219
-rect 1034 131 1045 171
-rect 1079 131 1102 171
-rect 1034 115 1102 131
-rect 1132 171 1185 219
-rect 1132 131 1143 171
-rect 1177 131 1185 171
-rect 1132 115 1185 131
-rect 1239 165 1292 187
-rect 1239 131 1247 165
-rect 1281 131 1292 165
-rect 1239 115 1292 131
-rect 1322 171 1375 187
-rect 1322 131 1333 171
-rect 1367 131 1375 171
-rect 1322 115 1375 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 629 293 757
-rect 327 629 338 757
-rect 282 521 338 629
-rect 368 521 410 773
-rect 440 757 496 773
-rect 440 629 451 757
-rect 485 629 496 757
-rect 440 521 496 629
-rect 526 757 582 773
-rect 526 629 537 757
-rect 571 629 582 757
-rect 526 521 582 629
-rect 612 757 668 773
-rect 612 723 623 757
-rect 657 723 668 757
-rect 612 521 668 723
-rect 698 757 754 773
-rect 698 663 709 757
-rect 743 663 754 757
-rect 698 521 754 663
-rect 784 757 840 773
-rect 784 629 795 757
-rect 829 629 840 757
-rect 784 521 840 629
-rect 870 521 922 773
-rect 952 521 1004 773
-rect 1034 757 1102 773
-rect 1034 697 1045 757
-rect 1079 697 1102 757
-rect 1034 521 1102 697
-rect 1132 757 1185 773
-rect 1132 629 1143 757
-rect 1177 629 1185 757
-rect 1132 521 1185 629
-rect 1239 757 1292 773
-rect 1239 617 1247 757
-rect 1281 617 1292 757
-rect 1239 605 1292 617
-rect 1322 757 1375 773
-rect 1322 617 1333 757
-rect 1367 617 1375 757
-rect 1322 605 1375 617
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 165
-rect 207 131 241 171
-rect 293 131 327 171
-rect 451 131 485 171
-rect 537 131 571 171
-rect 623 123 657 157
-rect 709 131 743 171
-rect 795 131 829 165
-rect 1045 131 1079 171
-rect 1143 131 1177 171
-rect 1247 131 1281 165
-rect 1333 131 1367 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 121 697 155 757
-rect 207 629 241 757
-rect 293 629 327 757
-rect 451 629 485 757
-rect 537 629 571 757
-rect 623 723 657 757
-rect 709 663 743 757
-rect 795 629 829 757
-rect 1045 697 1079 757
-rect 1143 629 1177 757
-rect 1247 617 1281 757
-rect 1333 617 1367 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-rect 979 827 1003 861
-rect 1037 827 1061 861
-rect 1115 827 1139 861
-rect 1173 827 1197 861
-rect 1251 827 1275 861
-rect 1309 827 1333 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-rect 1003 827 1037 861
-rect 1139 827 1173 861
-rect 1275 827 1309 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 801
-rect 338 773 368 801
-rect 410 773 440 799
-rect 496 773 526 799
-rect 582 773 612 801
-rect 668 773 698 801
-rect 754 773 784 801
-rect 840 773 870 801
-rect 922 773 952 801
-rect 1004 773 1034 801
-rect 1102 773 1132 801
-rect 1292 773 1322 801
-rect 80 381 110 521
-rect 166 489 196 521
-rect 152 473 206 489
-rect 152 439 162 473
-rect 196 439 206 473
-rect 152 423 206 439
-rect 70 365 124 381
-rect 70 331 80 365
-rect 114 331 124 365
-rect 70 315 124 331
-rect 80 219 110 315
-rect 166 219 196 423
-rect 252 381 282 521
-rect 338 423 368 521
-rect 410 496 440 521
-rect 496 496 526 521
-rect 410 466 526 496
-rect 338 407 430 423
-rect 238 365 292 381
-rect 238 331 248 365
-rect 282 331 292 365
-rect 238 315 292 331
-rect 338 373 386 407
-rect 420 373 430 407
-rect 338 357 430 373
-rect 472 363 502 466
-rect 582 364 612 521
-rect 668 455 698 521
-rect 656 439 710 455
-rect 656 405 666 439
-rect 700 405 710 439
-rect 656 389 710 405
-rect 252 219 282 315
-rect 338 219 368 357
-rect 472 347 526 363
-rect 472 313 482 347
-rect 516 313 526 347
-rect 472 271 526 313
-rect 568 348 622 364
-rect 568 314 578 348
-rect 612 314 622 348
-rect 568 298 622 314
-rect 410 241 526 271
-rect 410 219 440 241
-rect 496 219 526 241
-rect 582 219 612 298
-rect 668 219 698 389
-rect 754 324 784 521
-rect 840 460 870 521
-rect 826 444 880 460
-rect 826 410 836 444
-rect 870 410 880 444
-rect 826 394 880 410
-rect 922 417 952 521
-rect 1004 489 1034 521
-rect 1004 459 1048 489
-rect 1102 488 1132 521
-rect 922 401 976 417
-rect 742 308 796 324
-rect 742 274 752 308
-rect 786 274 796 308
-rect 742 258 796 274
-rect 754 219 784 258
-rect 840 219 870 394
-rect 922 367 932 401
-rect 966 367 976 401
-rect 922 351 976 367
-rect 922 219 952 351
-rect 1018 307 1048 459
-rect 1090 472 1144 488
-rect 1292 485 1322 605
-rect 1090 438 1100 472
-rect 1134 438 1144 472
-rect 1090 422 1144 438
-rect 1255 469 1322 485
-rect 1255 435 1265 469
-rect 1299 435 1322 469
-rect 1004 291 1058 307
-rect 1004 257 1014 291
-rect 1048 257 1058 291
-rect 1004 241 1058 257
-rect 1004 219 1034 241
-rect 1102 219 1132 422
-rect 1255 419 1322 435
-rect 1292 187 1322 419
-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 439 196 473
-rect 80 331 114 365
-rect 248 331 282 365
-rect 386 373 420 407
-rect 666 405 700 439
-rect 482 313 516 347
-rect 578 314 612 348
-rect 836 410 870 444
-rect 752 274 786 308
-rect 932 367 966 401
-rect 1100 438 1134 472
-rect 1265 435 1299 469
-rect 1014 257 1048 291
-<< locali >>
-rect 0 867 1408 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 1003 867
-rect 1037 827 1139 867
-rect 1173 827 1275 867
-rect 1309 827 1408 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 613 69 629
-rect 207 613 241 629
-rect 35 579 241 613
-rect 293 757 327 773
-rect 293 546 327 629
-rect 451 757 485 827
-rect 451 613 485 629
-rect 537 757 571 773
-rect 623 757 657 827
-rect 623 707 657 723
-rect 709 757 743 773
-rect 571 629 743 663
-rect 795 757 829 773
-rect 1045 757 1079 827
-rect 1045 681 1079 697
-rect 1143 757 1177 773
-rect 537 613 571 629
-rect 795 588 829 629
-rect 1143 588 1177 629
-rect 752 554 1100 588
-rect 752 553 812 554
-rect 293 509 350 546
-rect 80 473 114 479
-rect 80 439 162 473
-rect 196 439 212 473
-rect 248 365 282 405
-rect 64 331 80 365
-rect 114 331 130 365
-rect 248 315 282 331
-rect 316 291 350 509
-rect 386 479 444 513
-rect 386 407 420 479
-rect 386 357 420 373
-rect 578 348 612 479
-rect 752 510 787 553
-rect 650 405 666 439
-rect 700 405 716 439
-rect 466 313 482 347
-rect 516 313 532 347
-rect 752 376 786 510
-rect 836 444 870 479
-rect 1066 488 1100 554
-rect 1247 757 1281 827
-rect 1177 554 1202 571
-rect 1143 537 1202 554
-rect 1247 545 1281 617
-rect 1333 757 1367 773
-rect 1066 472 1134 488
-rect 820 410 836 444
-rect 870 410 886 444
-rect 1066 441 1100 472
-rect 1089 438 1100 441
-rect 1100 422 1134 438
-rect 932 401 966 405
-rect 752 342 879 376
-rect 932 351 966 367
-rect 1168 365 1202 537
-rect 1333 513 1367 617
-rect 578 298 612 314
-rect 736 274 752 308
-rect 786 291 810 308
-rect 35 215 241 249
-rect 35 189 70 215
-rect 35 171 69 189
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 207 171 241 215
-rect 207 114 241 131
-rect 293 223 350 257
-rect 293 171 327 223
-rect 537 206 743 240
-rect 293 114 327 131
-rect 451 171 485 187
-rect 451 61 485 131
-rect 537 171 571 206
-rect 709 171 743 206
-rect 845 190 879 342
-rect 1014 291 1048 331
-rect 1143 331 1202 365
-rect 1265 469 1299 485
-rect 998 257 1014 291
-rect 1048 257 1064 291
-rect 1014 256 1048 257
-rect 537 114 571 131
-rect 607 123 623 157
-rect 657 123 673 157
-rect 623 61 657 123
-rect 709 114 743 131
-rect 795 165 879 190
-rect 829 156 879 165
-rect 1045 171 1079 187
-rect 795 114 829 131
-rect 1045 61 1079 131
-rect 1143 171 1177 331
-rect 1265 291 1299 435
-rect 1245 257 1299 291
-rect 1143 115 1177 131
-rect 1247 165 1281 181
-rect 1247 61 1281 131
-rect 1333 171 1367 479
-rect 1333 115 1367 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 1003 861 1037 867
-rect 1003 833 1037 861
-rect 1139 861 1173 867
-rect 1139 833 1173 861
-rect 1275 861 1309 867
-rect 1275 833 1309 861
-rect 80 479 114 513
-rect 248 405 282 439
-rect 80 331 114 365
-rect 444 479 478 513
-rect 578 479 612 513
-rect 482 347 516 365
-rect 666 405 700 439
-rect 482 331 516 347
-rect 836 479 870 513
-rect 1143 554 1177 588
-rect 932 405 966 439
-rect 316 257 350 291
-rect 777 274 786 291
-rect 786 274 811 291
-rect 777 257 811 274
-rect 1014 331 1048 365
-rect 1211 257 1245 291
-rect 1333 479 1367 513
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 867 1408 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 1003 867
-rect 1037 833 1139 867
-rect 1173 833 1275 867
-rect 1309 833 1408 867
-rect 0 827 1408 833
-rect 1131 588 1189 594
-rect 1109 554 1143 588
-rect 1177 554 1189 588
-rect 1131 548 1189 554
-rect 68 513 126 519
-rect 432 513 490 519
-rect 566 513 624 519
-rect 824 513 882 520
-rect 1321 513 1379 519
-rect 68 479 80 513
-rect 114 479 444 513
-rect 478 479 578 513
-rect 612 479 836 513
-rect 870 479 882 513
-rect 1299 479 1333 513
-rect 1367 479 1379 513
-rect 68 473 126 479
-rect 432 473 490 479
-rect 566 473 624 479
-rect 824 472 882 479
-rect 1321 473 1379 479
-rect 236 439 296 445
-rect 650 439 717 445
-rect 920 439 978 445
-rect 236 405 248 439
-rect 282 405 666 439
-rect 700 405 932 439
-rect 966 405 978 439
-rect 236 399 296 405
-rect 650 399 717 405
-rect 920 399 978 405
-rect 68 365 126 371
-rect 470 365 528 371
-rect 1002 365 1060 371
-rect 68 331 80 365
-rect 114 331 482 365
-rect 516 331 1014 365
-rect 1048 331 1060 365
-rect 68 325 126 331
-rect 470 325 528 331
-rect 1002 325 1060 331
-rect 304 291 362 297
-rect 771 291 820 297
-rect 1199 291 1257 297
-rect 304 257 316 291
-rect 350 257 777 291
-rect 811 257 1211 291
-rect 1245 257 1257 291
-rect 304 251 362 257
-rect 771 251 820 257
-rect 1199 251 1257 257
-rect 0 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel viali 1160 571 1160 571 1 S
-port 5 n
-rlabel viali 1350 496 1350 496 1 CO
-port 6 n
-rlabel metal1 129 496 129 496 1 B
-rlabel viali 265 422 265 422 1 CI
-rlabel viali 97 348 97 348 1 A
-port 1 n
-rlabel viali 1228 274 1228 274 1 CON
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__addh_1.mag b/12T_ls/sky130_osu_sc_12T_ls__addh_1.mag
deleted file mode 100644
index a2b3f47..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__addh_1.mag
+++ /dev/null
@@ -1,393 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864413
-<< checkpaint >>
-rect -1209 -1243 2025 2131
-<< nwell >>
-rect -9 485 837 897
-<< nmos >>
-rect 80 115 110 219
-rect 178 115 208 219
-rect 250 115 280 219
-rect 442 115 472 219
-rect 540 115 570 219
-rect 626 115 656 219
-rect 712 115 742 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 178 521 208 773
-rect 264 521 294 773
-rect 362 521 392 773
-rect 552 521 582 773
-rect 638 521 668 773
-rect 710 521 740 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 178 219
-rect 110 131 133 171
-rect 167 131 178 171
-rect 110 115 178 131
-rect 208 115 250 219
-rect 280 171 333 219
-rect 280 131 291 171
-rect 325 131 333 171
-rect 280 115 333 131
-rect 389 171 442 219
-rect 389 131 397 171
-rect 431 131 442 171
-rect 389 115 442 131
-rect 472 171 540 219
-rect 472 131 495 171
-rect 529 131 540 171
-rect 472 115 540 131
-rect 570 171 626 219
-rect 570 131 581 171
-rect 615 131 626 171
-rect 570 115 626 131
-rect 656 171 712 219
-rect 656 131 667 171
-rect 701 131 712 171
-rect 656 115 712 131
-rect 742 171 795 219
-rect 742 131 753 171
-rect 787 131 795 171
-rect 742 115 795 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 178 773
-rect 110 561 133 757
-rect 167 561 178 757
-rect 110 521 178 561
-rect 208 757 264 773
-rect 208 629 219 757
-rect 253 629 264 757
-rect 208 521 264 629
-rect 294 757 362 773
-rect 294 629 305 757
-rect 339 629 362 757
-rect 294 521 362 629
-rect 392 757 445 773
-rect 392 561 403 757
-rect 437 561 445 757
-rect 392 521 445 561
-rect 499 757 552 773
-rect 499 561 507 757
-rect 541 561 552 757
-rect 499 521 552 561
-rect 582 757 638 773
-rect 582 561 593 757
-rect 627 561 638 757
-rect 582 521 638 561
-rect 668 521 710 773
-rect 740 757 796 773
-rect 740 561 751 757
-rect 785 561 796 757
-rect 740 521 796 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 133 131 167 171
-rect 291 131 325 171
-rect 397 131 431 171
-rect 495 131 529 171
-rect 581 131 615 171
-rect 667 131 701 171
-rect 753 131 787 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 133 561 167 757
-rect 219 629 253 757
-rect 305 629 339 757
-rect 403 561 437 757
-rect 507 561 541 757
-rect 593 561 627 757
-rect 751 561 785 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-<< poly >>
-rect 80 773 110 799
-rect 178 773 208 799
-rect 264 773 294 799
-rect 362 773 392 799
-rect 552 773 582 799
-rect 638 773 668 799
-rect 710 773 740 799
-rect 80 307 110 521
-rect 178 381 208 521
-rect 264 455 294 521
-rect 154 365 208 381
-rect 154 331 164 365
-rect 198 331 208 365
-rect 154 315 208 331
-rect 43 291 110 307
-rect 43 257 53 291
-rect 87 257 110 291
-rect 43 241 110 257
-rect 80 219 110 241
-rect 178 219 208 315
-rect 250 439 304 455
-rect 250 405 260 439
-rect 294 405 304 439
-rect 250 389 304 405
-rect 362 453 392 521
-rect 552 453 582 521
-rect 362 423 582 453
-rect 250 219 280 389
-rect 362 328 392 423
-rect 638 381 668 521
-rect 710 455 740 521
-rect 710 439 764 455
-rect 710 405 720 439
-rect 754 405 764 439
-rect 710 389 764 405
-rect 338 312 392 328
-rect 614 365 668 381
-rect 614 331 624 365
-rect 658 331 668 365
-rect 614 315 668 331
-rect 338 278 348 312
-rect 382 279 392 312
-rect 382 278 570 279
-rect 338 249 570 278
-rect 442 219 472 249
-rect 540 219 570 249
-rect 626 219 656 315
-rect 712 219 742 389
-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 331 198 365
-rect 53 257 87 291
-rect 260 405 294 439
-rect 720 405 754 439
-rect 624 331 658 365
-rect 348 278 382 312
-<< locali >>
-rect 0 867 836 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 836 867
-rect 35 757 69 773
-rect 35 527 69 553
-rect 133 757 167 827
-rect 133 545 167 561
-rect 219 757 253 773
-rect 219 523 253 629
-rect 305 757 339 827
-rect 305 613 339 629
-rect 403 757 437 773
-rect 219 489 362 523
-rect 260 439 294 455
-rect 260 389 294 405
-rect 148 331 164 365
-rect 198 331 214 365
-rect 328 328 362 489
-rect 403 513 437 561
-rect 507 757 541 773
-rect 403 479 418 513
-rect 328 312 382 328
-rect 328 296 348 312
-rect 37 257 53 291
-rect 87 257 110 291
-rect 291 278 348 296
-rect 291 262 382 278
-rect 35 171 69 182
-rect 35 115 69 131
-rect 133 171 167 187
-rect 133 61 167 131
-rect 291 171 325 262
-rect 418 216 452 479
-rect 507 511 541 561
-rect 593 757 627 827
-rect 593 545 627 561
-rect 751 757 785 773
-rect 751 511 785 561
-rect 507 477 785 511
-rect 507 291 541 477
-rect 704 405 720 439
-rect 754 405 770 439
-rect 608 331 624 365
-rect 658 331 674 365
-rect 541 257 667 291
-rect 291 115 325 131
-rect 397 181 452 216
-rect 397 171 431 181
-rect 397 115 431 131
-rect 495 171 529 187
-rect 495 61 529 131
-rect 581 171 615 187
-rect 667 171 701 257
-rect 615 131 667 144
-rect 753 171 787 187
-rect 701 131 753 144
-rect 581 110 787 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 35 561 69 587
-rect 35 553 69 561
-rect 260 405 294 439
-rect 164 331 198 365
-rect 418 479 452 513
-rect 110 257 144 291
-rect 35 182 69 216
-rect 720 405 754 439
-rect 624 331 658 365
-rect 507 257 541 291
-rect 667 257 701 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 867 836 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 836 867
-rect 0 827 836 833
-rect 23 587 81 593
-rect 23 553 35 587
-rect 69 553 81 587
-rect 23 547 81 553
-rect 35 222 69 547
-rect 406 513 464 519
-rect 406 479 418 513
-rect 452 479 486 513
-rect 406 473 464 479
-rect 248 439 306 445
-rect 708 439 766 445
-rect 248 405 260 439
-rect 294 405 720 439
-rect 754 405 766 439
-rect 248 404 766 405
-rect 248 399 306 404
-rect 708 399 766 404
-rect 152 366 210 371
-rect 612 366 670 371
-rect 152 365 670 366
-rect 152 331 164 365
-rect 198 331 624 365
-rect 658 331 670 365
-rect 152 325 210 331
-rect 612 325 670 331
-rect 98 291 156 297
-rect 495 291 553 297
-rect 655 291 713 297
-rect 98 257 110 291
-rect 144 257 507 291
-rect 541 257 553 291
-rect 633 257 667 291
-rect 701 257 713 291
-rect 98 251 156 257
-rect 495 251 553 257
-rect 655 251 713 257
-rect 23 216 81 222
-rect 23 182 35 216
-rect 69 182 81 216
-rect 23 176 81 182
-rect 0 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 381 50 381 1 S
-port 1 n
-rlabel viali 737 422 737 422 1 A
-port 2 n
-rlabel viali 642 348 642 348 1 B
-port 3 n
-rlabel viali 435 496 435 496 1 CO
-port 4 n
-rlabel viali 684 274 684 274 1 CON
-port 5 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__addh_l.mag b/12T_ls/sky130_osu_sc_12T_ls__addh_l.mag
deleted file mode 100644
index 6bd8dd5..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__addh_l.mag
+++ /dev/null
@@ -1,396 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864414
-<< checkpaint >>
-rect -1209 -1243 2025 2131
-<< nwell >>
-rect -9 485 837 897
-<< nmos >>
-rect 80 115 110 187
-rect 178 115 208 219
-rect 250 115 280 219
-rect 442 115 472 187
-rect 540 115 570 219
-rect 626 115 656 219
-rect 712 115 742 219
-<< pmoshvt >>
-rect 80 606 110 773
-rect 178 521 208 773
-rect 264 521 294 773
-rect 362 605 392 773
-rect 552 521 582 773
-rect 638 521 668 773
-rect 710 521 740 773
-<< ndiff >>
-rect 125 187 178 219
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 171 178 187
-rect 110 131 133 171
-rect 167 131 178 171
-rect 110 115 178 131
-rect 208 115 250 219
-rect 280 171 333 219
-rect 487 187 540 219
-rect 280 131 291 171
-rect 325 131 333 171
-rect 280 115 333 131
-rect 389 165 442 187
-rect 389 131 397 165
-rect 431 131 442 165
-rect 389 115 442 131
-rect 472 171 540 187
-rect 472 131 495 171
-rect 529 131 540 171
-rect 472 115 540 131
-rect 570 171 626 219
-rect 570 131 581 171
-rect 615 131 626 171
-rect 570 115 626 131
-rect 656 171 712 219
-rect 656 131 667 171
-rect 701 131 712 171
-rect 656 115 712 131
-rect 742 171 795 219
-rect 742 131 753 171
-rect 787 131 795 171
-rect 742 115 795 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 606 80 621
-rect 110 757 178 773
-rect 110 606 133 757
-rect 125 561 133 606
-rect 167 561 178 757
-rect 125 521 178 561
-rect 208 757 264 773
-rect 208 629 219 757
-rect 253 629 264 757
-rect 208 521 264 629
-rect 294 757 362 773
-rect 294 629 305 757
-rect 339 629 362 757
-rect 294 605 362 629
-rect 392 757 445 773
-rect 392 621 403 757
-rect 437 621 445 757
-rect 392 605 445 621
-rect 499 757 552 773
-rect 294 521 347 605
-rect 499 561 507 757
-rect 541 561 552 757
-rect 499 521 552 561
-rect 582 757 638 773
-rect 582 561 593 757
-rect 627 561 638 757
-rect 582 521 638 561
-rect 668 521 710 773
-rect 740 757 796 773
-rect 740 561 751 757
-rect 785 561 796 757
-rect 740 521 796 561
-<< ndiffc >>
-rect 35 131 69 165
-rect 133 131 167 171
-rect 291 131 325 171
-rect 397 131 431 165
-rect 495 131 529 171
-rect 581 131 615 171
-rect 667 131 701 171
-rect 753 131 787 171
-<< pdiffc >>
-rect 35 621 69 757
-rect 133 561 167 757
-rect 219 629 253 757
-rect 305 629 339 757
-rect 403 621 437 757
-rect 507 561 541 757
-rect 593 561 627 757
-rect 751 561 785 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-<< poly >>
-rect 80 773 110 799
-rect 178 773 208 799
-rect 264 773 294 799
-rect 362 773 392 799
-rect 552 773 582 799
-rect 638 773 668 799
-rect 710 773 740 799
-rect 80 307 110 606
-rect 178 381 208 521
-rect 264 455 294 521
-rect 154 365 208 381
-rect 154 331 164 365
-rect 198 331 208 365
-rect 154 315 208 331
-rect 43 291 110 307
-rect 43 257 53 291
-rect 87 257 110 291
-rect 43 241 110 257
-rect 80 187 110 241
-rect 178 219 208 315
-rect 250 439 304 455
-rect 250 405 260 439
-rect 294 405 304 439
-rect 250 389 304 405
-rect 362 453 392 605
-rect 552 453 582 521
-rect 362 423 582 453
-rect 250 219 280 389
-rect 362 328 392 423
-rect 638 381 668 521
-rect 710 455 740 521
-rect 710 439 764 455
-rect 710 405 720 439
-rect 754 405 764 439
-rect 710 389 764 405
-rect 338 312 392 328
-rect 614 365 668 381
-rect 614 331 624 365
-rect 658 331 668 365
-rect 614 315 668 331
-rect 338 278 348 312
-rect 382 279 392 312
-rect 382 278 570 279
-rect 338 249 570 278
-rect 442 187 472 249
-rect 540 219 570 249
-rect 626 219 656 315
-rect 712 219 742 389
-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 331 198 365
-rect 53 257 87 291
-rect 260 405 294 439
-rect 720 405 754 439
-rect 624 331 658 365
-rect 348 278 382 312
-<< locali >>
-rect 0 867 836 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 836 867
-rect 35 757 69 773
-rect 35 587 69 621
-rect 133 757 167 827
-rect 133 545 167 561
-rect 219 757 253 773
-rect 219 523 253 629
-rect 305 757 339 827
-rect 305 613 339 629
-rect 403 757 437 773
-rect 219 489 362 523
-rect 260 439 294 455
-rect 260 389 294 405
-rect 148 331 164 365
-rect 198 331 214 365
-rect 328 328 362 489
-rect 403 513 437 621
-rect 507 757 541 773
-rect 403 479 418 513
-rect 328 312 382 328
-rect 328 296 348 312
-rect 37 257 53 291
-rect 87 257 110 291
-rect 291 278 348 296
-rect 291 262 382 278
-rect 35 165 69 182
-rect 35 115 69 131
-rect 133 171 167 187
-rect 133 61 167 131
-rect 291 171 325 262
-rect 418 216 452 479
-rect 507 511 541 561
-rect 593 757 627 827
-rect 593 545 627 561
-rect 751 757 785 773
-rect 751 511 785 561
-rect 507 477 785 511
-rect 507 291 541 477
-rect 704 405 720 439
-rect 754 405 770 439
-rect 608 331 624 365
-rect 658 331 674 365
-rect 541 257 667 291
-rect 291 115 325 131
-rect 397 181 452 216
-rect 397 165 431 181
-rect 397 115 431 131
-rect 495 171 529 187
-rect 495 61 529 131
-rect 581 171 615 187
-rect 667 171 701 257
-rect 615 131 667 144
-rect 753 171 787 187
-rect 701 131 753 144
-rect 581 110 787 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 35 553 69 587
-rect 260 405 294 439
-rect 164 331 198 365
-rect 418 479 452 513
-rect 110 257 144 291
-rect 35 182 69 216
-rect 720 405 754 439
-rect 624 331 658 365
-rect 507 257 541 291
-rect 667 257 701 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 867 836 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 836 867
-rect 0 827 836 833
-rect 23 587 81 593
-rect 23 553 35 587
-rect 69 553 81 587
-rect 23 547 81 553
-rect 35 222 69 547
-rect 406 513 464 519
-rect 406 479 418 513
-rect 452 479 486 513
-rect 406 473 464 479
-rect 248 439 306 445
-rect 708 439 766 445
-rect 248 405 260 439
-rect 294 405 720 439
-rect 754 405 766 439
-rect 248 404 766 405
-rect 248 399 306 404
-rect 708 399 766 404
-rect 152 366 210 371
-rect 612 366 670 371
-rect 152 365 670 366
-rect 152 331 164 365
-rect 198 331 624 365
-rect 658 331 670 365
-rect 152 325 210 331
-rect 612 325 670 331
-rect 98 291 156 297
-rect 495 291 553 297
-rect 655 291 713 297
-rect 98 257 110 291
-rect 144 257 507 291
-rect 541 257 553 291
-rect 633 257 667 291
-rect 701 257 713 291
-rect 98 251 156 257
-rect 495 251 553 257
-rect 655 251 713 257
-rect 23 216 81 222
-rect 23 182 35 216
-rect 69 182 81 216
-rect 23 176 81 182
-rect 0 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 381 50 381 1 S
-port 1 n
-rlabel viali 737 422 737 422 1 A
-port 2 n
-rlabel viali 642 348 642 348 1 B
-port 3 n
-rlabel viali 435 496 435 496 1 CO
-port 4 n
-rlabel viali 684 274 684 274 1 CON
-port 5 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__and2_1.mag b/12T_ls/sky130_osu_sc_12T_ls__and2_1.mag
deleted file mode 100644
index cbd75ff..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__and2_1.mag
+++ /dev/null
@@ -1,188 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864414
-<< checkpaint >>
-rect -1269 2461 1634 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1634 -1129
-<< nwell >>
-rect -9 485 374 897
-<< nmos >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 252 115 282 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 219
-rect 182 171 252 219
-rect 182 131 193 171
-rect 227 131 252 171
-rect 182 115 252 131
-rect 282 171 335 219
-rect 282 131 293 171
-rect 327 131 335 171
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 335 773
-rect 282 561 293 757
-rect 327 561 335 757
-rect 282 521 335 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-rect 293 131 327 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 629 155 757
-rect 207 629 241 757
-rect 293 561 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 490 110 521
-rect 27 474 110 490
-rect 27 440 37 474
-rect 71 440 110 474
-rect 27 424 110 440
-rect 80 219 110 424
-rect 166 422 196 521
-rect 252 496 282 521
-rect 252 466 289 496
-rect 152 406 217 422
-rect 152 372 173 406
-rect 207 372 217 406
-rect 152 356 217 372
-rect 152 219 182 356
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 274 313 308
-rect 252 258 313 274
-rect 252 219 282 258
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 440 71 474
-rect 173 372 207 406
-rect 269 274 303 308
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 105 629 121 647
-rect 105 613 155 629
-rect 207 757 241 827
-rect 207 613 241 629
-rect 293 757 327 773
-rect 37 474 71 553
-rect 37 424 71 440
-rect 105 308 139 613
-rect 173 406 207 479
-rect 293 439 327 561
-rect 173 356 207 372
-rect 35 274 269 308
-rect 303 274 319 308
-rect 35 171 69 274
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 37 553 71 587
-rect 173 479 207 513
-rect 293 405 327 439
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 25 587 83 593
-rect 25 553 37 587
-rect 71 553 105 587
-rect 25 547 83 553
-rect 161 513 219 519
-rect 140 479 173 513
-rect 207 479 219 513
-rect 161 473 219 479
-rect 281 439 339 445
-rect 281 405 293 439
-rect 327 405 339 439
-rect 281 399 339 405
-rect 293 223 327 399
-rect 281 217 339 223
-rect 281 183 293 217
-rect 327 183 339 217
-rect 281 177 339 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 55 570 55 570 1 A
-port 2 n
-rlabel viali 191 496 191 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__and2_2.mag b/12T_ls/sky130_osu_sc_12T_ls__and2_2.mag
deleted file mode 100644
index c218102..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__and2_2.mag
+++ /dev/null
@@ -1,223 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864414
-<< checkpaint >>
-rect -1269 2461 1722 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1722 -1129
-<< nwell >>
-rect -9 485 462 897
-<< nmos >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 252 115 282 219
-rect 338 115 368 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 219
-rect 182 171 252 219
-rect 182 131 193 171
-rect 227 131 252 171
-rect 182 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 421 219
-rect 368 131 379 171
-rect 413 131 421 171
-rect 368 115 421 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 421 773
-rect 368 561 379 757
-rect 413 561 421 757
-rect 368 521 421 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-rect 293 131 327 171
-rect 379 131 413 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 629 155 757
-rect 207 629 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 80 490 110 521
-rect 27 474 110 490
-rect 27 440 37 474
-rect 71 440 110 474
-rect 27 424 110 440
-rect 80 219 110 424
-rect 166 422 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 252 466 368 496
-rect 152 406 217 422
-rect 152 372 173 406
-rect 207 372 217 406
-rect 152 356 217 372
-rect 152 219 182 356
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 303 274 368 288
-rect 252 258 368 274
-rect 252 219 282 258
-rect 338 219 368 258
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 37 440 71 474
-rect 173 372 207 406
-rect 269 274 303 308
-<< locali >>
-rect 0 867 462 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 462 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 105 629 121 647
-rect 105 613 155 629
-rect 207 757 241 827
-rect 207 613 241 629
-rect 293 757 327 773
-rect 37 474 71 553
-rect 37 424 71 440
-rect 105 308 139 613
-rect 173 406 207 479
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 173 356 207 372
-rect 35 274 269 308
-rect 303 274 319 308
-rect 35 171 69 274
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 37 553 71 587
-rect 173 479 207 513
-rect 293 405 327 439
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 462 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 462 867
-rect 0 827 462 833
-rect 25 587 83 593
-rect 25 553 37 587
-rect 71 553 105 587
-rect 25 547 83 553
-rect 161 513 219 519
-rect 140 479 173 513
-rect 207 479 219 513
-rect 161 473 219 479
-rect 281 439 339 445
-rect 281 405 293 439
-rect 327 405 339 439
-rect 281 399 339 405
-rect 293 223 327 399
-rect 281 217 339 223
-rect 281 183 293 217
-rect 327 183 339 217
-rect 281 177 339 183
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 191 496 191 496 1 B
-port 1 n
-rlabel viali 55 570 55 570 1 A
-port 2 n
-rlabel metal1 311 348 311 348 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__and2_4.mag b/12T_ls/sky130_osu_sc_12T_ls__and2_4.mag
deleted file mode 100644
index f65fb05..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__and2_4.mag
+++ /dev/null
@@ -1,286 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864414
-<< checkpaint >>
-rect -1269 2461 1898 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1898 -1129
-<< nwell >>
-rect -9 485 638 897
-<< nmos >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 219
-rect 182 171 252 219
-rect 182 131 193 171
-rect 227 131 252 171
-rect 182 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 593 219
-rect 540 131 551 171
-rect 585 131 593 171
-rect 540 115 593 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 593 773
-rect 540 561 551 757
-rect 585 561 593 757
-rect 540 521 593 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 629 155 757
-rect 207 629 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 424 773 454 799
-rect 510 773 540 799
-rect 80 490 110 521
-rect 27 474 110 490
-rect 27 440 37 474
-rect 71 440 110 474
-rect 27 424 110 440
-rect 80 219 110 424
-rect 166 422 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 252 466 540 496
-rect 152 406 217 422
-rect 152 372 173 406
-rect 207 372 217 406
-rect 152 356 217 372
-rect 152 219 182 356
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 303 274 540 288
-rect 252 258 540 274
-rect 252 219 282 258
-rect 338 219 368 258
-rect 424 219 454 258
-rect 510 219 540 258
-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 440 71 474
-rect 173 372 207 406
-rect 269 274 303 308
-<< locali >>
-rect 0 867 638 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 638 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 105 629 121 647
-rect 105 613 155 629
-rect 207 757 241 827
-rect 207 613 241 629
-rect 293 757 327 773
-rect 37 474 71 553
-rect 37 424 71 440
-rect 105 308 139 613
-rect 173 406 207 479
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 439 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 173 356 207 372
-rect 35 274 269 308
-rect 303 274 319 308
-rect 35 171 69 274
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 37 553 71 587
-rect 173 479 207 513
-rect 293 405 327 439
-rect 465 405 499 439
-rect 293 183 327 217
-rect 465 183 499 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 638 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 638 867
-rect 0 827 638 833
-rect 25 587 83 593
-rect 25 553 37 587
-rect 71 553 105 587
-rect 25 547 83 553
-rect 161 513 219 519
-rect 140 479 173 513
-rect 207 479 219 513
-rect 161 473 219 479
-rect 281 439 339 445
-rect 453 439 511 445
-rect 281 405 293 439
-rect 327 405 465 439
-rect 499 405 511 439
-rect 281 399 339 405
-rect 453 399 511 405
-rect 293 223 327 399
-rect 465 223 499 399
-rect 281 217 339 223
-rect 453 217 511 223
-rect 281 183 293 217
-rect 327 183 465 217
-rect 499 183 511 217
-rect 281 177 339 183
-rect 453 177 511 183
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 55 570 55 570 1 A
-port 2 n
-rlabel viali 191 496 191 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__and2_6.mag b/12T_ls/sky130_osu_sc_12T_ls__and2_6.mag
deleted file mode 100644
index 31b2f35..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__and2_6.mag
+++ /dev/null
@@ -1,315 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604092967
-<< checkpaint >>
-rect -1269 2461 2074 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2074 -1129
-<< nwell >>
-rect -9 485 814 897
-<< nmos >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-rect 596 115 626 219
-rect 682 115 712 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 219
-rect 182 171 252 219
-rect 182 131 193 171
-rect 227 131 252 171
-rect 182 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 219
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 219
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 765 219
-rect 712 131 723 171
-rect 757 131 765 171
-rect 712 115 765 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 765 773
-rect 712 561 723 757
-rect 757 561 765 757
-rect 712 521 765 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 629 155 757
-rect 207 629 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 80 490 110 521
-rect 20 474 110 490
-rect 20 440 30 474
-rect 64 440 110 474
-rect 20 424 110 440
-rect 80 219 110 424
-rect 166 423 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 596 496 626 521
-rect 682 496 712 521
-rect 252 466 712 496
-rect 152 406 210 423
-rect 152 372 166 406
-rect 200 372 210 406
-rect 152 356 210 372
-rect 152 219 182 356
-rect 252 324 282 466
-rect 252 308 306 324
-rect 252 274 262 308
-rect 296 288 306 308
-rect 596 288 626 466
-rect 296 274 712 288
-rect 252 258 712 274
-rect 252 219 282 258
-rect 338 219 368 258
-rect 424 219 454 258
-rect 510 219 540 258
-rect 596 219 626 258
-rect 682 219 712 258
-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 440 64 474
-rect 166 372 200 406
-rect 262 274 296 308
-<< locali >>
-rect 0 861 814 888
-rect 0 827 51 861
-rect 85 827 187 861
-rect 221 827 323 861
-rect 357 827 459 861
-rect 493 827 595 861
-rect 629 827 814 861
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 98 629 121 647
-rect 98 613 155 629
-rect 207 757 241 827
-rect 207 613 241 629
-rect 293 757 327 773
-rect 30 474 64 553
-rect 30 424 64 440
-rect 98 308 132 613
-rect 166 406 200 479
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 439 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 637 757 671 773
-rect 637 439 671 561
-rect 723 757 757 827
-rect 723 545 757 561
-rect 166 356 200 372
-rect 35 274 262 308
-rect 296 274 312 308
-rect 35 171 69 274
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 637 171 671 183
-rect 637 115 671 131
-rect 723 171 757 187
-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 553 64 587
-rect 166 479 200 513
-rect 293 405 327 439
-rect 465 405 499 439
-rect 637 405 671 439
-rect 293 183 327 217
-rect 465 183 499 217
-rect 637 183 671 217
-<< metal1 >>
-rect 0 827 814 888
-rect 18 587 76 593
-rect 18 553 30 587
-rect 64 553 98 587
-rect 18 547 76 553
-rect 154 513 212 519
-rect 132 479 166 513
-rect 200 479 212 513
-rect 154 473 212 479
-rect 281 439 339 445
-rect 453 439 511 445
-rect 625 439 683 445
-rect 281 405 293 439
-rect 327 405 465 439
-rect 499 405 637 439
-rect 671 405 683 439
-rect 281 399 339 405
-rect 453 399 511 405
-rect 625 399 683 405
-rect 293 223 327 399
-rect 465 223 499 399
-rect 637 223 671 399
-rect 281 217 339 223
-rect 453 217 511 223
-rect 625 217 683 223
-rect 281 183 293 217
-rect 327 183 465 217
-rect 499 183 637 217
-rect 671 183 683 217
-rect 281 177 339 183
-rect 453 177 511 183
-rect 625 177 683 183
-rect 0 0 814 61
-<< labels >>
-rlabel viali 184 496 184 496 1 B
-port 1 n
-rlabel viali 48 570 48 570 1 A
-port 2 n
-rlabel metal1 311 348 311 348 1 Y
-port 3 n
-rlabel metal1 68 844 68 844 1 vdd
-rlabel metal1 68 44 68 44 1 gnd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__and2_8.mag b/12T_ls/sky130_osu_sc_12T_ls__and2_8.mag
deleted file mode 100644
index 8c04b12..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__and2_8.mag
+++ /dev/null
@@ -1,428 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864414
-<< checkpaint >>
-rect -1269 2461 2250 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2250 -1129
-<< nwell >>
-rect -9 485 990 897
-<< nmos >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-rect 596 115 626 219
-rect 682 115 712 219
-rect 768 115 798 219
-rect 854 115 884 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-rect 768 521 798 773
-rect 854 521 884 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 219
-rect 182 171 252 219
-rect 182 131 193 171
-rect 227 131 252 171
-rect 182 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 219
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 219
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 768 219
-rect 712 131 723 171
-rect 757 131 768 171
-rect 712 115 768 131
-rect 798 171 854 219
-rect 798 131 809 171
-rect 843 131 854 171
-rect 798 115 854 131
-rect 884 171 937 219
-rect 884 131 895 171
-rect 929 131 937 171
-rect 884 115 937 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 768 773
-rect 712 561 723 757
-rect 757 561 768 757
-rect 712 521 768 561
-rect 798 757 854 773
-rect 798 561 809 757
-rect 843 561 854 757
-rect 798 521 854 561
-rect 884 757 937 773
-rect 884 561 895 757
-rect 929 561 937 757
-rect 884 521 937 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-rect 809 131 843 171
-rect 895 131 929 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 629 155 757
-rect 207 629 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-rect 809 561 843 757
-rect 895 561 929 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 768 773 798 799
-rect 854 773 884 799
-rect 80 490 110 521
-rect 27 474 110 490
-rect 27 440 37 474
-rect 71 440 110 474
-rect 27 424 110 440
-rect 80 219 110 424
-rect 166 422 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 596 496 626 521
-rect 682 496 712 521
-rect 768 496 798 521
-rect 854 496 884 521
-rect 252 466 884 496
-rect 152 406 217 422
-rect 152 372 173 406
-rect 207 372 217 406
-rect 152 356 217 372
-rect 152 219 182 356
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 596 288 626 466
-rect 303 274 884 288
-rect 252 258 884 274
-rect 252 219 282 258
-rect 338 219 368 258
-rect 424 219 454 258
-rect 510 219 540 258
-rect 596 219 626 258
-rect 682 219 712 258
-rect 768 219 798 258
-rect 854 219 884 258
-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 440 71 474
-rect 173 372 207 406
-rect 269 274 303 308
-<< locali >>
-rect 0 867 990 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 990 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 105 629 121 647
-rect 105 613 155 629
-rect 207 757 241 827
-rect 207 613 241 629
-rect 293 757 327 773
-rect 37 474 71 553
-rect 37 424 71 440
-rect 105 308 139 613
-rect 173 406 207 479
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 439 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 637 757 671 773
-rect 637 439 671 561
-rect 723 757 757 827
-rect 723 545 757 561
-rect 809 757 843 773
-rect 809 439 843 561
-rect 895 757 929 827
-rect 895 545 929 561
-rect 173 356 207 372
-rect 35 274 269 308
-rect 303 274 319 308
-rect 35 171 69 274
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 637 171 671 183
-rect 637 115 671 131
-rect 723 171 757 187
-rect 723 61 757 131
-rect 809 171 843 183
-rect 809 115 843 131
-rect 895 171 929 187
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 37 553 71 587
-rect 173 479 207 513
-rect 293 405 327 439
-rect 465 405 499 439
-rect 637 405 671 439
-rect 809 405 843 439
-rect 293 183 327 217
-rect 465 183 499 217
-rect 637 183 671 217
-rect 809 183 843 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 867 990 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 990 867
-rect 0 827 990 833
-rect 25 587 83 593
-rect 25 553 37 587
-rect 71 553 105 587
-rect 25 547 83 553
-rect 161 513 219 519
-rect 140 479 173 513
-rect 207 479 219 513
-rect 161 473 219 479
-rect 281 439 339 445
-rect 453 439 511 445
-rect 625 439 683 445
-rect 797 439 855 445
-rect 281 405 293 439
-rect 327 405 465 439
-rect 499 405 637 439
-rect 671 405 809 439
-rect 843 405 855 439
-rect 281 399 339 405
-rect 453 399 511 405
-rect 625 399 683 405
-rect 797 399 855 405
-rect 293 223 327 399
-rect 465 223 499 399
-rect 637 223 671 399
-rect 809 223 843 399
-rect 281 217 339 223
-rect 453 217 511 223
-rect 625 217 683 223
-rect 797 217 855 223
-rect 281 183 293 217
-rect 327 183 465 217
-rect 499 183 637 217
-rect 671 183 683 217
-rect 712 183 809 217
-rect 843 183 855 217
-rect 281 177 339 183
-rect 453 177 511 183
-rect 625 177 683 183
-rect 797 177 855 183
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel viali 191 496 191 496 1 B
-port 1 n
-rlabel viali 55 570 55 570 1 A
-port 2 n
-rlabel metal1 311 348 311 348 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__and2_l.mag b/12T_ls/sky130_osu_sc_12T_ls__and2_l.mag
deleted file mode 100644
index 5b4a134..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__and2_l.mag
+++ /dev/null
@@ -1,183 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864415
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 374 897
-<< nmos >>
-rect 80 115 110 187
-rect 152 115 182 187
-rect 252 115 282 187
-<< pmoshvt >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 252 605 282 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 115 152 187
-rect 182 165 252 187
-rect 182 131 193 165
-rect 227 131 252 165
-rect 182 115 252 131
-rect 282 165 335 187
-rect 282 131 293 165
-rect 327 131 335 165
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 605 80 621
-rect 110 757 166 773
-rect 110 621 121 757
-rect 155 621 166 757
-rect 110 605 166 621
-rect 196 757 252 773
-rect 196 621 207 757
-rect 241 621 252 757
-rect 196 605 252 621
-rect 282 757 335 773
-rect 282 621 293 757
-rect 327 621 335 757
-rect 282 605 335 621
-<< ndiffc >>
-rect 35 131 69 165
-rect 193 131 227 165
-rect 293 131 327 165
-<< pdiffc >>
-rect 35 621 69 757
-rect 121 621 155 757
-rect 207 621 241 757
-rect 293 621 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 565 110 605
-rect 27 549 110 565
-rect 27 515 37 549
-rect 71 515 110 549
-rect 27 499 110 515
-rect 80 187 110 499
-rect 166 496 196 605
-rect 252 570 282 605
-rect 252 540 289 570
-rect 152 479 217 496
-rect 152 445 173 479
-rect 207 445 217 479
-rect 152 429 217 445
-rect 152 187 182 429
-rect 259 398 289 540
-rect 259 368 313 398
-rect 259 348 269 368
-rect 252 334 269 348
-rect 303 334 313 368
-rect 252 318 313 334
-rect 252 187 282 318
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 515 71 549
-rect 173 445 207 479
-rect 269 334 303 368
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 827
-rect 121 757 155 773
-rect 35 605 69 621
-rect 105 621 121 639
-rect 105 605 155 621
-rect 207 757 241 827
-rect 207 605 241 621
-rect 293 757 327 773
-rect 37 549 71 565
-rect 37 513 71 515
-rect 105 368 139 605
-rect 293 513 327 621
-rect 173 429 207 445
-rect 35 334 269 368
-rect 303 334 319 368
-rect 35 165 69 334
-rect 35 115 69 131
-rect 193 165 227 181
-rect 193 61 227 131
-rect 293 165 327 257
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 37 479 71 513
-rect 173 479 207 513
-rect 293 479 327 513
-rect 293 257 327 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 25 513 83 519
-rect 161 513 219 519
-rect 281 513 339 519
-rect 25 479 37 513
-rect 71 479 104 513
-rect 161 479 173 513
-rect 207 479 241 513
-rect 281 479 293 513
-rect 327 479 339 513
-rect 25 473 83 479
-rect 161 473 219 479
-rect 281 473 339 479
-rect 293 297 327 473
-rect 281 291 339 297
-rect 281 257 293 291
-rect 327 257 339 291
-rect 281 251 339 257
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel viali 54 497 54 497 1 A
-rlabel metal1 311 422 311 422 1 Y
-port 1 n
-rlabel viali 190 496 190 496 1 B
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__ant.mag b/12T_ls/sky130_osu_sc_12T_ls__ant.mag
deleted file mode 100644
index 25d866a..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__ant.mag
+++ /dev/null
@@ -1,103 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864415
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 485 199 897
-<< nmos >>
-rect 80 115 110 219
-<< pmoshvt >>
-rect 80 521 110 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 561 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 455 110 521
-rect 35 439 110 455
-rect 35 405 47 439
-rect 81 405 110 439
-rect 35 389 110 405
-rect 80 219 110 389
-rect 80 89 110 115
-<< polycont >>
-rect 47 405 81 439
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 773
-rect 35 439 69 561
-rect 121 757 155 827
-rect 121 545 155 561
-rect 31 405 47 439
-rect 81 405 97 439
-rect 35 321 69 405
-rect 35 287 155 321
-rect 35 171 69 287
-rect 35 115 69 131
-rect 121 171 155 287
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 47 405 81 439
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 35 439 108 445
-rect 35 405 47 439
-rect 81 405 108 439
-rect 35 399 108 405
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 422 64 422 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__antfill.mag b/12T_ls/sky130_osu_sc_12T_ls__antfill.mag
deleted file mode 100644
index 79e05e9..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__antfill.mag
+++ /dev/null
@@ -1,60 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864415
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 485 199 897
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 439 69 773
-rect 121 545 155 827
-rect 31 405 47 439
-rect 81 405 97 439
-rect 35 321 69 405
-rect 35 287 155 321
-rect 35 115 69 287
-rect 121 115 155 287
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 47 405 81 439
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 35 439 108 445
-rect 35 405 47 439
-rect 81 405 108 439
-rect 35 399 108 405
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 422 64 422 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__aoi21_l.mag b/12T_ls/sky130_osu_sc_12T_ls__aoi21_l.mag
deleted file mode 100644
index dc66352..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__aoi21_l.mag
+++ /dev/null
@@ -1,199 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864415
-<< checkpaint >>
-rect -1209 -1244 1481 2131
-<< nwell >>
-rect -10 485 374 897
-<< nmos >>
-rect 80 114 110 218
-rect 152 114 182 218
-rect 250 114 280 186
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-<< ndiff >>
-rect 27 164 80 218
-rect 27 130 35 164
-rect 69 130 80 164
-rect 27 114 80 130
-rect 110 114 152 218
-rect 182 186 233 218
-rect 182 164 250 186
-rect 182 130 193 164
-rect 227 130 250 164
-rect 182 114 250 130
-rect 280 164 333 186
-rect 280 130 291 164
-rect 325 130 333 164
-rect 280 114 333 130
-<< pdiff >>
-rect 27 757 80 773
-rect 27 696 35 757
-rect 69 696 80 757
-rect 27 521 80 696
-rect 110 757 166 773
-rect 110 696 121 757
-rect 155 696 166 757
-rect 110 521 166 696
-rect 196 757 252 773
-rect 196 697 207 757
-rect 241 697 252 757
-rect 196 521 252 697
-rect 282 757 335 773
-rect 282 643 293 757
-rect 327 643 335 757
-rect 282 521 335 643
-<< ndiffc >>
-rect 35 130 69 164
-rect 193 130 227 164
-rect 291 130 325 164
-<< pdiffc >>
-rect 35 696 69 757
-rect 121 696 155 757
-rect 207 697 241 757
-rect 293 643 327 757
-<< psubdiff >>
-rect 27 26 51 60
-rect 85 26 109 60
-rect 163 26 187 60
-rect 221 26 245 60
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 26 85 60
-rect 187 26 221 60
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 484 110 521
-rect 44 474 110 484
-rect 44 440 60 474
-rect 94 440 110 474
-rect 44 430 110 440
-rect 44 274 74 430
-rect 166 388 196 521
-rect 252 504 282 521
-rect 252 474 309 504
-rect 134 372 196 388
-rect 134 338 146 372
-rect 180 338 196 372
-rect 134 322 196 338
-rect 44 242 110 274
-rect 80 218 110 242
-rect 152 218 182 322
-rect 279 309 309 474
-rect 279 293 333 309
-rect 279 275 289 293
-rect 250 259 289 275
-rect 323 259 333 293
-rect 250 243 333 259
-rect 250 186 280 243
-rect 80 88 110 114
-rect 152 88 182 114
-rect 250 88 280 114
-<< polycont >>
-rect 60 440 94 474
-rect 146 338 180 372
-rect 289 259 323 293
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 35 646 69 696
-rect 121 757 155 827
-rect 121 680 155 696
-rect 207 757 241 773
-rect 207 646 241 697
-rect 35 612 241 646
-rect 293 757 327 773
-rect 60 474 94 490
-rect 60 439 94 440
-rect 128 388 162 479
-rect 128 372 180 388
-rect 128 338 146 372
-rect 128 322 180 338
-rect 216 293 250 405
-rect 293 365 327 643
-rect 216 259 289 293
-rect 323 259 339 293
-rect 193 217 227 218
-rect 35 164 69 186
-rect 35 60 69 130
-rect 193 164 227 183
-rect 193 114 227 130
-rect 291 164 325 180
-rect 291 60 325 130
-rect 0 20 51 60
-rect 85 20 187 60
-rect 221 20 374 60
-rect 0 0 374 20
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 60 405 94 439
-rect 128 479 162 513
-rect 216 405 250 439
-rect 293 331 327 365
-rect 193 183 227 217
-rect 51 26 85 54
-rect 51 20 85 26
-rect 187 26 221 54
-rect 187 20 221 26
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 116 513 174 519
-rect 116 479 128 513
-rect 162 479 196 513
-rect 116 473 174 479
-rect 48 439 106 445
-rect 204 439 262 445
-rect 48 405 60 439
-rect 94 405 128 439
-rect 182 405 216 439
-rect 250 405 262 439
-rect 48 399 106 405
-rect 204 399 262 405
-rect 281 365 339 371
-rect 281 331 293 365
-rect 327 331 339 365
-rect 281 325 339 331
-rect 181 218 233 223
-rect 293 218 327 325
-rect 181 217 327 218
-rect 181 183 193 217
-rect 227 183 327 217
-rect 181 177 233 183
-rect 291 60 325 61
-rect 0 54 374 60
-rect 0 20 51 54
-rect 85 20 187 54
-rect 221 20 374 54
-rect 0 0 374 20
-<< labels >>
-rlabel viali 145 496 145 496 1 A1
-port 4 n
-rlabel metal1 310 318 310 318 1 Y
-port 3 n
-rlabel viali 77 422 77 422 1 A0
-rlabel viali 233 422 233 422 1 B0
-rlabel viali 68 47 68 47 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__aoi22_l.mag b/12T_ls/sky130_osu_sc_12T_ls__aoi22_l.mag
deleted file mode 100644
index 4925e03..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__aoi22_l.mag
+++ /dev/null
@@ -1,239 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864415
-<< checkpaint >>
-rect -1209 -1243 1617 2131
-<< nwell >>
-rect -9 485 462 897
-<< nmos >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 252 115 282 219
-rect 324 115 354 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 219
-rect 182 171 252 219
-rect 182 131 200 171
-rect 234 131 252 171
-rect 182 115 252 131
-rect 282 115 324 219
-rect 354 171 407 219
-rect 354 131 365 171
-rect 399 131 407 171
-rect 354 115 407 131
-<< pdiff >>
-rect 27 732 80 773
-rect 27 663 35 732
-rect 69 663 80 732
-rect 27 521 80 663
-rect 110 765 166 773
-rect 110 697 121 765
-rect 155 697 166 765
-rect 110 521 166 697
-rect 196 732 252 773
-rect 196 663 207 732
-rect 241 663 252 732
-rect 196 521 252 663
-rect 282 698 338 773
-rect 282 629 293 698
-rect 327 629 338 698
-rect 282 521 338 629
-rect 368 732 421 773
-rect 368 664 379 732
-rect 413 664 421 732
-rect 368 521 421 664
-<< ndiffc >>
-rect 35 131 69 171
-rect 200 131 234 171
-rect 365 131 399 171
-<< pdiffc >>
-rect 35 663 69 732
-rect 121 697 155 765
-rect 207 663 241 732
-rect 293 629 327 698
-rect 379 664 413 732
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 799
-rect 80 484 110 521
-rect 44 474 110 484
-rect 44 440 60 474
-rect 94 440 110 474
-rect 44 430 110 440
-rect 44 274 74 430
-rect 166 418 196 521
-rect 152 388 196 418
-rect 116 372 182 388
-rect 116 338 128 372
-rect 162 338 182 372
-rect 116 322 182 338
-rect 44 242 110 274
-rect 80 219 110 242
-rect 152 219 182 322
-rect 252 317 282 521
-rect 338 381 368 521
-rect 338 365 416 381
-rect 338 338 370 365
-rect 224 301 282 317
-rect 224 267 234 301
-rect 268 267 282 301
-rect 224 251 282 267
-rect 252 219 282 251
-rect 324 331 370 338
-rect 404 331 416 365
-rect 324 315 416 331
-rect 324 308 368 315
-rect 324 219 354 308
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-rect 324 89 354 115
-<< polycont >>
-rect 60 440 94 474
-rect 128 338 162 372
-rect 234 267 268 301
-rect 370 331 404 365
-<< locali >>
-rect 0 867 462 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 462 867
-rect 121 765 155 827
-rect 35 732 69 748
-rect 121 680 155 697
-rect 207 748 413 782
-rect 207 732 241 748
-rect 35 646 69 663
-rect 379 732 413 748
-rect 207 646 241 663
-rect 35 612 241 646
-rect 293 698 327 714
-rect 379 648 413 664
-rect 293 570 327 629
-rect 293 536 336 570
-rect 60 474 94 490
-rect 60 439 94 440
-rect 128 372 162 479
-rect 128 322 162 338
-rect 216 317 250 405
-rect 216 301 268 317
-rect 216 267 234 301
-rect 234 251 268 267
-rect 302 291 336 536
-rect 370 365 404 381
-rect 370 315 404 331
-rect 35 171 69 187
-rect 35 61 69 131
-rect 200 171 234 183
-rect 200 115 234 131
-rect 365 171 399 187
-rect 365 61 399 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 60 405 94 439
-rect 128 479 162 513
-rect 216 405 250 439
-rect 370 331 404 365
-rect 302 257 336 291
-rect 200 183 234 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 462 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 462 867
-rect 0 827 462 833
-rect 116 513 174 519
-rect 116 479 128 513
-rect 162 479 196 513
-rect 116 473 174 479
-rect 48 439 106 445
-rect 204 439 262 445
-rect 48 405 60 439
-rect 94 405 127 439
-rect 204 405 216 439
-rect 250 405 284 439
-rect 48 399 106 405
-rect 204 399 262 405
-rect 358 365 416 371
-rect 336 331 370 365
-rect 404 331 416 365
-rect 358 325 416 331
-rect 290 291 348 297
-rect 290 257 302 291
-rect 336 257 348 291
-rect 290 251 348 257
-rect 188 217 246 223
-rect 304 217 338 251
-rect 188 183 200 217
-rect 234 183 338 217
-rect 188 177 246 183
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 233 422 233 422 1 B0
-port 2 n
-rlabel viali 145 496 145 496 1 A1
-port 4 n
-rlabel metal1 321 244 321 244 1 Y
-port 3 n
-rlabel viali 77 422 77 422 1 A0
-rlabel viali 387 348 387 348 1 B1
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__buf_1.mag b/12T_ls/sky130_osu_sc_12T_ls__buf_1.mag
deleted file mode 100644
index 4cd1b5e..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__buf_1.mag
+++ /dev/null
@@ -1,158 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864416
-<< checkpaint >>
-rect -1269 2461 1548 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1548 -1129
-<< nwell >>
-rect -9 485 288 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 249 219
-rect 196 131 207 171
-rect 241 131 249 171
-rect 196 115 249 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 249 773
-rect 196 561 207 757
-rect 241 561 249 757
-rect 196 521 249 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 207 561 241 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 80 433 110 521
-rect 166 506 196 521
-rect 166 476 251 506
-rect 80 417 154 433
-rect 80 383 110 417
-rect 144 383 154 417
-rect 80 367 154 383
-rect 80 219 110 367
-rect 221 324 251 476
-rect 166 308 251 324
-rect 166 274 176 308
-rect 210 274 251 308
-rect 166 258 251 274
-rect 166 219 196 258
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 110 383 144 417
-rect 176 274 210 308
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 308 69 561
-rect 110 417 144 553
-rect 207 513 241 561
-rect 110 367 144 383
-rect 176 308 210 324
-rect 35 274 176 308
-rect 35 171 69 274
-rect 176 258 210 274
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 207 171 241 183
-rect 207 115 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 110 553 144 587
-rect 207 479 241 513
-rect 207 183 241 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 98 587 156 593
-rect 64 553 110 587
-rect 144 553 156 587
-rect 98 547 156 553
-rect 195 513 253 519
-rect 195 479 207 513
-rect 241 479 253 513
-rect 195 473 253 479
-rect 207 223 241 473
-rect 195 217 253 223
-rect 195 183 207 217
-rect 241 183 253 217
-rect 195 177 253 183
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel viali 127 570 127 570 1 A
-port 1 n
-rlabel metal1 213 359 213 359 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__buf_2.mag b/12T_ls/sky130_osu_sc_12T_ls__buf_2.mag
deleted file mode 100644
index edde3fc..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__buf_2.mag
+++ /dev/null
@@ -1,179 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864416
-<< checkpaint >>
-rect -1269 2461 1636 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1636 -1129
-<< nwell >>
-rect -9 485 376 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 335 219
-rect 282 131 293 171
-rect 327 131 335 171
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 335 773
-rect 282 561 293 757
-rect 327 561 335 757
-rect 282 521 335 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 800
-rect 80 433 110 521
-rect 166 506 196 521
-rect 252 506 282 521
-rect 166 476 282 506
-rect 80 417 154 433
-rect 80 383 110 417
-rect 144 383 154 417
-rect 80 367 154 383
-rect 80 219 110 367
-rect 221 324 251 476
-rect 166 308 251 324
-rect 166 274 176 308
-rect 210 288 251 308
-rect 210 274 282 288
-rect 166 258 282 274
-rect 166 219 196 258
-rect 252 219 282 258
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 110 383 144 417
-rect 176 274 210 308
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 308 69 561
-rect 110 417 144 553
-rect 207 513 241 561
-rect 293 757 327 827
-rect 293 545 327 561
-rect 110 367 144 383
-rect 176 308 210 324
-rect 35 274 176 308
-rect 35 171 69 274
-rect 176 258 210 274
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 207 171 241 183
-rect 207 115 241 131
-rect 293 171 327 187
-rect 293 61 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 110 553 144 587
-rect 207 479 241 513
-rect 207 183 241 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 98 587 156 593
-rect 64 553 110 587
-rect 144 553 156 587
-rect 98 547 156 553
-rect 195 513 253 519
-rect 195 479 207 513
-rect 241 479 253 513
-rect 195 473 253 479
-rect 207 223 241 473
-rect 195 217 253 223
-rect 195 183 207 217
-rect 241 183 253 217
-rect 195 177 253 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel viali 127 570 127 570 1 A
-port 1 n
-rlabel metal1 211 358 211 358 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__buf_4.mag b/12T_ls/sky130_osu_sc_12T_ls__buf_4.mag
deleted file mode 100644
index 426db1c..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__buf_4.mag
+++ /dev/null
@@ -1,244 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864416
-<< checkpaint >>
-rect -1269 2461 1812 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1812 -1129
-<< nwell >>
-rect -9 485 552 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 507 219
-rect 454 131 465 171
-rect 499 131 507 171
-rect 454 115 507 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 507 773
-rect 454 561 465 757
-rect 499 561 507 757
-rect 454 521 507 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 800
-rect 338 773 368 799
-rect 424 773 454 799
-rect 80 433 110 521
-rect 166 506 196 521
-rect 252 506 282 521
-rect 338 506 368 521
-rect 424 506 454 521
-rect 166 476 454 506
-rect 80 417 154 433
-rect 80 383 110 417
-rect 144 383 154 417
-rect 80 367 154 383
-rect 80 219 110 367
-rect 221 324 251 476
-rect 166 308 251 324
-rect 166 274 176 308
-rect 210 288 251 308
-rect 210 274 454 288
-rect 166 258 454 274
-rect 166 219 196 258
-rect 252 219 282 258
-rect 338 219 368 258
-rect 424 219 454 258
-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 383 144 417
-rect 176 274 210 308
-<< locali >>
-rect 0 867 550 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 550 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 308 69 561
-rect 110 417 144 553
-rect 207 513 241 561
-rect 293 757 327 827
-rect 293 545 327 561
-rect 379 757 413 773
-rect 379 513 413 561
-rect 465 757 499 827
-rect 465 545 499 561
-rect 110 367 144 383
-rect 176 308 210 324
-rect 35 274 176 308
-rect 35 171 69 274
-rect 176 258 210 274
-rect 35 115 69 131
-rect 121 171 155 187
-rect 35 61 69 62
-rect 121 61 155 131
-rect 207 171 241 183
-rect 207 115 241 131
-rect 293 171 327 187
-rect 207 61 241 62
-rect 293 61 327 131
-rect 379 171 413 183
-rect 379 115 413 131
-rect 465 171 499 187
-rect 465 61 499 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 110 553 144 587
-rect 207 479 241 513
-rect 379 479 413 513
-rect 207 183 241 217
-rect 379 183 413 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 550 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 550 867
-rect 0 827 550 833
-rect 98 587 156 593
-rect 64 553 110 587
-rect 144 553 156 587
-rect 98 547 156 553
-rect 195 513 253 519
-rect 367 513 425 519
-rect 195 479 207 513
-rect 241 479 379 513
-rect 413 479 425 513
-rect 195 473 253 479
-rect 367 473 425 479
-rect 207 223 241 473
-rect 379 223 413 473
-rect 195 217 253 223
-rect 367 217 425 223
-rect 195 183 207 217
-rect 241 183 379 217
-rect 413 183 425 217
-rect 195 177 253 183
-rect 367 177 425 183
-rect 0 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel viali 127 570 127 570 1 A
-port 1 n
-rlabel metal1 211 358 211 358 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__buf_6.mag b/12T_ls/sky130_osu_sc_12T_ls__buf_6.mag
deleted file mode 100644
index 81cb7a0..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__buf_6.mag
+++ /dev/null
@@ -1,286 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604093984
-<< checkpaint >>
-rect -1269 2461 1988 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1988 -1129
-<< nwell >>
-rect -9 485 728 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-rect 596 115 626 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 219
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 679 219
-rect 626 131 637 171
-rect 671 131 679 171
-rect 626 115 679 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 679 773
-rect 626 561 637 757
-rect 671 561 679 757
-rect 626 521 679 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 800
-rect 338 773 368 799
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 80 433 110 521
-rect 166 506 196 521
-rect 252 506 282 521
-rect 338 506 368 521
-rect 424 506 454 521
-rect 510 506 540 521
-rect 596 506 626 521
-rect 166 476 626 506
-rect 80 417 154 433
-rect 80 383 110 417
-rect 144 383 154 417
-rect 80 367 154 383
-rect 80 219 110 367
-rect 221 324 251 476
-rect 166 308 251 324
-rect 166 274 176 308
-rect 210 288 251 308
-rect 510 288 540 476
-rect 210 274 626 288
-rect 166 258 626 274
-rect 166 219 196 258
-rect 252 219 282 258
-rect 338 219 368 258
-rect 424 219 454 258
-rect 510 219 540 258
-rect 596 219 626 258
-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 383 144 417
-rect 176 274 210 308
-<< locali >>
-rect 0 861 726 888
-rect 0 827 51 861
-rect 85 827 187 861
-rect 221 827 323 861
-rect 357 827 459 861
-rect 493 827 595 861
-rect 629 827 726 861
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 308 69 561
-rect 110 417 144 553
-rect 207 513 241 561
-rect 293 757 327 827
-rect 293 545 327 561
-rect 379 757 413 773
-rect 379 513 413 561
-rect 465 757 499 827
-rect 465 545 499 561
-rect 551 757 585 773
-rect 551 513 585 561
-rect 637 757 671 827
-rect 637 545 671 561
-rect 110 367 144 383
-rect 176 308 210 324
-rect 35 274 176 308
-rect 35 171 69 274
-rect 176 258 210 274
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 207 171 241 183
-rect 207 115 241 131
-rect 293 171 327 187
-rect 293 61 327 131
-rect 379 171 413 183
-rect 379 115 413 131
-rect 465 171 499 187
-rect 465 61 499 131
-rect 551 171 585 183
-rect 551 115 585 131
-rect 637 171 671 187
-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 553 144 587
-rect 207 479 241 513
-rect 379 479 413 513
-rect 551 479 585 513
-rect 207 183 241 217
-rect 379 183 413 217
-rect 551 183 585 217
-<< metal1 >>
-rect 0 827 726 888
-rect 98 587 156 593
-rect 64 553 110 587
-rect 144 553 156 587
-rect 98 547 156 553
-rect 195 513 253 519
-rect 367 513 425 519
-rect 539 513 597 519
-rect 195 479 207 513
-rect 241 479 379 513
-rect 413 479 551 513
-rect 585 479 597 513
-rect 195 473 253 479
-rect 367 473 425 479
-rect 539 473 597 479
-rect 207 223 241 473
-rect 379 223 413 473
-rect 551 223 585 473
-rect 195 217 253 223
-rect 367 217 425 223
-rect 539 217 597 223
-rect 195 183 207 217
-rect 241 183 379 217
-rect 413 183 551 217
-rect 585 183 597 217
-rect 195 177 253 183
-rect 367 177 425 183
-rect 539 177 597 183
-rect 0 0 726 61
-<< labels >>
-rlabel viali 127 570 127 570 1 A
-port 1 n
-rlabel metal1 211 358 211 358 1 Y
-port 2 n
-rlabel metal1 68 844 68 844 1 vdd
-rlabel metal1 68 44 68 44 1 gnd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__buf_8.mag b/12T_ls/sky130_osu_sc_12T_ls__buf_8.mag
deleted file mode 100644
index aab4de1..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__buf_8.mag
+++ /dev/null
@@ -1,383 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864416
-<< checkpaint >>
-rect -1269 2461 2164 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2164 -1129
-<< nwell >>
-rect -9 485 904 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-rect 596 115 626 219
-rect 682 115 712 219
-rect 768 115 798 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-rect 768 521 798 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 219
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 219
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 768 219
-rect 712 131 723 171
-rect 757 131 768 171
-rect 712 115 768 131
-rect 798 171 851 219
-rect 798 131 809 171
-rect 843 131 851 171
-rect 798 115 851 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 768 773
-rect 712 561 723 757
-rect 757 561 768 757
-rect 712 521 768 561
-rect 798 757 851 773
-rect 798 561 809 757
-rect 843 561 851 757
-rect 798 521 851 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-rect 809 131 843 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-rect 809 561 843 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 800
-rect 338 773 368 799
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 768 773 798 799
-rect 80 433 110 521
-rect 166 506 196 521
-rect 252 506 282 521
-rect 338 506 368 521
-rect 424 506 454 521
-rect 510 506 540 521
-rect 596 506 626 521
-rect 682 506 712 521
-rect 768 506 798 521
-rect 166 476 798 506
-rect 80 417 154 433
-rect 80 383 110 417
-rect 144 383 154 417
-rect 80 367 154 383
-rect 80 219 110 367
-rect 221 324 251 476
-rect 166 308 251 324
-rect 166 274 176 308
-rect 210 288 251 308
-rect 510 288 540 476
-rect 210 274 798 288
-rect 166 258 798 274
-rect 166 219 196 258
-rect 252 219 282 258
-rect 338 219 368 258
-rect 424 219 454 258
-rect 510 219 540 258
-rect 596 219 626 258
-rect 682 219 712 258
-rect 768 219 798 258
-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 383 144 417
-rect 176 274 210 308
-<< locali >>
-rect 0 867 902 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 902 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 308 69 561
-rect 110 417 144 553
-rect 207 513 241 561
-rect 293 757 327 827
-rect 293 545 327 561
-rect 379 757 413 773
-rect 379 513 413 561
-rect 465 757 499 827
-rect 465 545 499 561
-rect 551 757 585 773
-rect 551 513 585 561
-rect 637 757 671 827
-rect 637 545 671 561
-rect 723 757 757 773
-rect 723 513 757 561
-rect 809 757 843 827
-rect 809 545 843 561
-rect 110 367 144 383
-rect 176 308 210 324
-rect 35 274 176 308
-rect 35 171 69 274
-rect 176 258 210 274
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 207 171 241 183
-rect 207 115 241 131
-rect 293 171 327 187
-rect 293 61 327 131
-rect 379 171 413 183
-rect 379 115 413 131
-rect 465 171 499 187
-rect 465 61 499 131
-rect 551 171 585 183
-rect 551 115 585 131
-rect 637 171 671 187
-rect 637 61 671 131
-rect 723 171 757 183
-rect 723 115 757 131
-rect 809 171 843 187
-rect 809 61 843 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 902 61
-rect 0 0 902 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 110 553 144 587
-rect 207 479 241 513
-rect 379 479 413 513
-rect 551 479 585 513
-rect 723 479 757 513
-rect 207 183 241 217
-rect 379 183 413 217
-rect 551 183 585 217
-rect 723 183 757 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 867 902 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 902 867
-rect 0 827 902 833
-rect 98 587 156 593
-rect 64 553 110 587
-rect 144 553 156 587
-rect 98 547 156 553
-rect 195 513 253 519
-rect 367 513 425 519
-rect 539 513 597 519
-rect 711 513 769 519
-rect 195 479 207 513
-rect 241 479 379 513
-rect 413 479 551 513
-rect 585 479 723 513
-rect 757 479 769 513
-rect 195 473 253 479
-rect 367 473 425 479
-rect 539 473 597 479
-rect 711 473 769 479
-rect 207 223 241 473
-rect 379 223 413 473
-rect 551 223 585 473
-rect 723 223 757 473
-rect 195 217 253 223
-rect 367 217 425 223
-rect 539 217 597 223
-rect 711 217 769 223
-rect 195 183 207 217
-rect 241 183 379 217
-rect 413 183 551 217
-rect 585 183 723 217
-rect 757 183 769 217
-rect 195 177 253 183
-rect 367 177 425 183
-rect 539 177 597 183
-rect 711 177 769 183
-rect 0 55 902 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 902 55
-rect 0 0 902 21
-<< labels >>
-rlabel viali 127 570 127 570 1 A
-port 1 n
-rlabel metal1 211 358 211 358 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__buf_l.mag b/12T_ls/sky130_osu_sc_12T_ls__buf_l.mag
deleted file mode 100644
index a7b795c..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__buf_l.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864417
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 288 897
-<< nmos >>
-rect 80 115 110 187
-rect 166 115 196 187
-<< pmoshvt >>
-rect 80 605 110 773
-rect 166 605 196 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 166 187
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 165 249 187
-rect 196 131 207 165
-rect 241 131 249 165
-rect 196 115 249 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 605 80 621
-rect 110 757 166 773
-rect 110 621 121 757
-rect 155 621 166 757
-rect 110 605 166 621
-rect 196 757 249 773
-rect 196 621 207 757
-rect 241 621 249 757
-rect 196 605 249 621
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-rect 207 131 241 165
-<< pdiffc >>
-rect 35 621 69 757
-rect 121 621 155 757
-rect 207 621 241 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 80 507 110 605
-rect 166 580 196 605
-rect 166 550 251 580
-rect 80 491 154 507
-rect 80 457 110 491
-rect 144 457 154 491
-rect 80 441 154 457
-rect 80 187 110 441
-rect 221 398 251 550
-rect 166 382 251 398
-rect 166 348 176 382
-rect 210 348 251 382
-rect 166 332 251 348
-rect 166 187 196 332
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 110 457 144 491
-rect 176 348 210 382
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 773
-rect 35 382 69 621
-rect 121 757 155 827
-rect 121 605 155 621
-rect 207 757 241 773
-rect 207 587 241 621
-rect 110 441 144 457
-rect 176 382 210 398
-rect 35 348 176 382
-rect 35 165 69 348
-rect 176 332 210 348
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 207 165 241 257
-rect 207 115 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 207 553 241 587
-rect 110 491 144 513
-rect 110 479 144 491
-rect 207 257 241 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 195 587 253 593
-rect 195 553 207 587
-rect 241 553 253 587
-rect 195 547 253 553
-rect 98 513 156 519
-rect 64 479 110 513
-rect 144 479 156 513
-rect 98 473 156 479
-rect 207 297 241 547
-rect 195 291 253 297
-rect 195 257 207 291
-rect 241 257 253 291
-rect 195 251 253 257
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 214 430 214 430 1 Y
-port 2 n
-rlabel viali 127 496 127 496 1 A
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__decap_1.mag b/12T_ls/sky130_osu_sc_12T_ls__decap_1.mag
deleted file mode 100644
index 66fd776..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__decap_1.mag
+++ /dev/null
@@ -1,83 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864417
-<< checkpaint >>
-rect -1209 -1243 1345 2131
-<< nwell >>
-rect -9 365 199 897
-<< nmos >>
-rect 80 115 110 263
-<< pmoshvt >>
-rect 80 601 110 773
-<< ndiff >>
-rect 27 200 80 263
-rect 27 131 35 200
-rect 69 131 80 200
-rect 27 115 80 131
-rect 110 200 163 263
-rect 110 131 121 200
-rect 155 131 163 200
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 601 80 621
-rect 110 757 163 773
-rect 110 621 121 757
-rect 155 621 163 757
-rect 110 601 163 621
-<< ndiffc >>
-rect 35 131 69 200
-rect 121 131 155 200
-<< pdiffc >>
-rect 35 621 69 757
-rect 121 621 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 263 110 601
-rect 80 80 110 115
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 827
-rect 35 605 69 621
-rect 121 757 155 827
-rect 121 605 155 621
-rect 35 200 69 216
-rect 35 61 69 131
-rect 121 200 155 216
-rect 121 61 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__decap_l.mag b/12T_ls/sky130_osu_sc_12T_ls__decap_l.mag
deleted file mode 100644
index 9a0d9e2..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__decap_l.mag
+++ /dev/null
@@ -1,83 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864417
-<< checkpaint >>
-rect -1209 -1243 1345 2131
-<< nwell >>
-rect -9 365 199 897
-<< nmos >>
-rect 80 115 110 217
-<< pmoshvt >>
-rect 80 673 110 773
-<< ndiff >>
-rect 27 191 80 217
-rect 27 131 35 191
-rect 69 131 80 191
-rect 27 115 80 131
-rect 110 191 163 217
-rect 110 131 121 191
-rect 155 131 163 191
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 689 35 757
-rect 69 689 80 757
-rect 27 673 80 689
-rect 110 757 163 773
-rect 110 689 121 757
-rect 155 689 163 757
-rect 110 673 163 689
-<< ndiffc >>
-rect 35 131 69 191
-rect 121 131 155 191
-<< pdiffc >>
-rect 35 689 69 757
-rect 121 689 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 217 110 673
-rect 80 80 110 115
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 827
-rect 35 673 69 689
-rect 121 757 155 827
-rect 121 673 155 689
-rect 35 191 69 207
-rect 35 61 69 131
-rect 121 191 155 207
-rect 121 61 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__dff_1.mag b/12T_ls/sky130_osu_sc_12T_ls__dff_1.mag
deleted file mode 100644
index 0034723..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__dff_1.mag
+++ /dev/null
@@ -1,658 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864417
-<< checkpaint >>
-rect -1209 -1243 2569 2131
-<< nwell >>
-rect -9 485 1456 897
-<< nmos >>
-rect 85 115 115 219
-rect 171 115 201 219
-rect 243 115 273 219
-rect 363 115 393 219
-rect 435 115 465 219
-rect 521 115 551 219
-rect 593 115 623 219
-rect 713 115 743 219
-rect 785 115 815 219
-rect 871 115 901 219
-rect 1061 115 1091 219
-rect 1251 115 1281 219
-rect 1337 115 1367 219
-<< pmoshvt >>
-rect 85 521 115 773
-rect 171 521 201 773
-rect 243 521 273 773
-rect 363 521 393 773
-rect 435 521 465 773
-rect 521 521 551 773
-rect 593 521 623 773
-rect 713 521 743 773
-rect 785 521 815 773
-rect 871 521 901 773
-rect 1061 521 1091 773
-rect 1251 521 1281 773
-rect 1337 521 1367 773
-<< ndiff >>
-rect 32 171 85 219
-rect 32 131 40 171
-rect 74 131 85 171
-rect 32 115 85 131
-rect 115 171 171 219
-rect 115 131 126 171
-rect 160 131 171 171
-rect 115 115 171 131
-rect 201 115 243 219
-rect 273 171 363 219
-rect 273 131 284 171
-rect 352 131 363 171
-rect 273 115 363 131
-rect 393 115 435 219
-rect 465 165 521 219
-rect 465 131 476 165
-rect 510 131 521 165
-rect 465 115 521 131
-rect 551 115 593 219
-rect 623 171 713 219
-rect 623 131 634 171
-rect 702 131 713 171
-rect 623 115 713 131
-rect 743 115 785 219
-rect 815 171 871 219
-rect 815 131 826 171
-rect 860 131 871 171
-rect 815 115 871 131
-rect 901 171 954 219
-rect 901 131 912 171
-rect 946 131 954 171
-rect 901 115 954 131
-rect 1008 171 1061 219
-rect 1008 131 1016 171
-rect 1050 131 1061 171
-rect 1008 115 1061 131
-rect 1091 171 1144 219
-rect 1091 131 1102 171
-rect 1136 131 1144 171
-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 757 85 773
-rect 32 561 40 757
-rect 74 561 85 757
-rect 32 521 85 561
-rect 115 757 171 773
-rect 115 629 126 757
-rect 160 629 171 757
-rect 115 521 171 629
-rect 201 521 243 773
-rect 273 757 363 773
-rect 273 561 284 757
-rect 352 561 363 757
-rect 273 521 363 561
-rect 393 521 435 773
-rect 465 757 521 773
-rect 465 629 476 757
-rect 510 629 521 757
-rect 465 521 521 629
-rect 551 521 593 773
-rect 623 757 713 773
-rect 623 629 634 757
-rect 702 629 713 757
-rect 623 521 713 629
-rect 743 521 785 773
-rect 815 757 871 773
-rect 815 595 826 757
-rect 860 595 871 757
-rect 815 521 871 595
-rect 901 757 954 773
-rect 901 561 912 757
-rect 946 561 954 757
-rect 901 521 954 561
-rect 1008 757 1061 773
-rect 1008 629 1016 757
-rect 1050 629 1061 757
-rect 1008 521 1061 629
-rect 1091 757 1144 773
-rect 1091 561 1102 757
-rect 1136 561 1144 757
-rect 1091 521 1144 561
-rect 1198 757 1251 773
-rect 1198 689 1206 757
-rect 1240 689 1251 757
-rect 1198 521 1251 689
-rect 1281 757 1337 773
-rect 1281 689 1292 757
-rect 1326 689 1337 757
-rect 1281 521 1337 689
-rect 1367 757 1420 773
-rect 1367 689 1378 757
-rect 1412 689 1420 757
-rect 1367 521 1420 689
-<< ndiffc >>
-rect 40 131 74 171
-rect 126 131 160 171
-rect 284 131 352 171
-rect 476 131 510 165
-rect 634 131 702 171
-rect 826 131 860 171
-rect 912 131 946 171
-rect 1016 131 1050 171
-rect 1102 131 1136 171
-rect 1206 131 1240 165
-rect 1292 131 1326 165
-rect 1378 131 1412 165
-<< pdiffc >>
-rect 40 561 74 757
-rect 126 629 160 757
-rect 284 561 352 757
-rect 476 629 510 757
-rect 634 629 702 757
-rect 826 595 860 757
-rect 912 561 946 757
-rect 1016 629 1050 757
-rect 1102 561 1136 757
-rect 1206 689 1240 757
-rect 1292 689 1326 757
-rect 1378 689 1412 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-rect 979 827 1003 861
-rect 1037 827 1061 861
-rect 1115 827 1139 861
-rect 1173 827 1197 861
-rect 1251 827 1275 861
-rect 1309 827 1333 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-rect 1003 827 1037 861
-rect 1139 827 1173 861
-rect 1275 827 1309 861
-<< poly >>
-rect 85 773 115 799
-rect 171 773 201 799
-rect 243 773 273 799
-rect 363 773 393 799
-rect 435 773 465 799
-rect 521 773 551 799
-rect 593 773 623 799
-rect 713 773 743 799
-rect 785 773 815 799
-rect 871 773 901 799
-rect 1061 773 1091 799
-rect 1251 773 1281 799
-rect 1337 773 1367 799
-rect 85 490 115 521
-rect 75 474 129 490
-rect 75 440 85 474
-rect 119 440 129 474
-rect 75 424 129 440
-rect 75 278 105 424
-rect 171 381 201 521
-rect 243 490 273 521
-rect 243 474 297 490
-rect 243 440 253 474
-rect 287 440 297 474
-rect 243 424 297 440
-rect 171 365 225 381
-rect 363 379 393 521
-rect 435 484 465 521
-rect 521 484 551 521
-rect 435 474 551 484
-rect 435 440 467 474
-rect 501 440 551 474
-rect 435 430 551 440
-rect 593 381 623 521
-rect 713 490 743 521
-rect 689 474 743 490
-rect 689 440 699 474
-rect 733 440 743 474
-rect 689 424 743 440
-rect 785 381 815 521
-rect 871 490 901 521
-rect 871 474 942 490
-rect 871 460 898 474
-rect 882 440 898 460
-rect 932 440 942 474
-rect 882 424 942 440
-rect 593 379 743 381
-rect 171 331 181 365
-rect 215 331 225 365
-rect 171 315 225 331
-rect 267 365 743 379
-rect 267 349 699 365
-rect 75 248 115 278
-rect 85 219 115 248
-rect 171 219 201 315
-rect 267 271 297 349
-rect 689 331 699 349
-rect 733 331 743 365
-rect 689 315 743 331
-rect 243 241 297 271
-rect 339 291 393 307
-rect 339 257 349 291
-rect 383 257 393 291
-rect 339 241 393 257
-rect 243 219 273 241
-rect 363 219 393 241
-rect 435 291 551 301
-rect 435 257 467 291
-rect 501 257 551 291
-rect 435 247 551 257
-rect 435 219 465 247
-rect 521 219 551 247
-rect 593 291 647 307
-rect 593 257 603 291
-rect 637 257 647 291
-rect 593 241 647 257
-rect 593 219 623 241
-rect 713 219 743 315
-rect 785 365 839 381
-rect 785 331 795 365
-rect 829 331 839 365
-rect 785 315 839 331
-rect 785 219 815 315
-rect 882 271 912 424
-rect 1061 307 1091 521
-rect 1251 498 1281 521
-rect 1241 472 1281 498
-rect 1241 381 1271 472
-rect 1337 436 1367 521
-rect 1216 365 1271 381
-rect 1313 420 1367 436
-rect 1313 386 1323 420
-rect 1357 386 1367 420
-rect 1313 370 1367 386
-rect 1216 331 1226 365
-rect 1260 331 1271 365
-rect 1216 315 1271 331
-rect 1240 308 1271 315
-rect 871 241 912 271
-rect 1008 291 1091 307
-rect 1008 257 1018 291
-rect 1052 257 1091 291
-rect 1008 241 1091 257
-rect 1241 284 1271 308
-rect 1241 254 1281 284
-rect 871 219 901 241
-rect 1061 219 1091 241
-rect 1251 219 1281 254
-rect 1337 219 1367 370
-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 440 119 474
-rect 253 440 287 474
-rect 467 440 501 474
-rect 699 440 733 474
-rect 898 440 932 474
-rect 181 331 215 365
-rect 699 331 733 365
-rect 349 257 383 291
-rect 467 257 501 291
-rect 603 257 637 291
-rect 795 331 829 365
-rect 1323 386 1357 420
-rect 1226 331 1260 365
-rect 1018 257 1052 291
-<< locali >>
-rect 0 867 1452 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 1003 867
-rect 1037 827 1139 867
-rect 1173 827 1275 867
-rect 1309 827 1452 867
-rect 40 757 74 773
-rect 17 561 40 573
-rect 126 757 160 827
-rect 126 613 160 629
-rect 284 757 352 773
-rect 17 539 74 561
-rect 476 757 510 827
-rect 476 613 510 629
-rect 634 757 702 773
-rect 352 561 355 579
-rect 284 558 355 561
-rect 634 558 702 629
-rect 17 291 51 539
-rect 108 524 355 558
-rect 535 524 702 558
-rect 826 757 860 827
-rect 826 549 860 595
-rect 912 757 946 773
-rect 1016 757 1050 827
-rect 1016 613 1050 629
-rect 1102 757 1136 773
-rect 912 558 946 561
-rect 912 524 1000 558
-rect 108 490 142 524
-rect 85 474 142 490
-rect 119 440 142 474
-rect 85 424 142 440
-rect 17 257 40 291
-rect 17 236 74 257
-rect 108 274 142 424
-rect 253 474 287 490
-rect 253 439 287 440
-rect 467 474 501 490
-rect 287 405 383 439
-rect 181 365 215 381
-rect 181 315 215 331
-rect 349 291 383 405
-rect 467 291 501 440
-rect 108 240 315 274
-rect 535 291 569 524
-rect 699 474 733 490
-rect 699 439 733 440
-rect 603 405 699 439
-rect 829 479 830 513
-rect 603 291 637 405
-rect 795 365 830 479
-rect 898 474 932 490
-rect 898 439 932 440
-rect 966 365 1000 524
-rect 683 331 699 365
-rect 733 331 749 365
-rect 829 345 830 365
-rect 795 315 829 331
-rect 946 331 1000 365
-rect 912 325 1000 331
-rect 1102 365 1136 561
-rect 1206 757 1240 773
-rect 1206 439 1240 689
-rect 1292 757 1326 827
-rect 1292 673 1326 689
-rect 1378 757 1412 773
-rect 1378 635 1412 689
-rect 1377 576 1412 635
-rect 1377 513 1411 576
-rect 1411 479 1435 513
-rect 1240 420 1357 439
-rect 1240 405 1323 420
-rect 1102 331 1226 365
-rect 1260 331 1276 365
-rect 1323 349 1357 386
-rect 349 241 383 257
-rect 467 241 501 257
-rect 603 241 637 257
-rect 671 285 705 291
-rect 40 171 74 236
-rect 281 187 315 240
-rect 671 207 705 251
-rect 40 115 74 131
-rect 126 171 160 187
-rect 281 171 352 187
-rect 281 153 284 171
-rect 126 61 160 131
-rect 284 115 352 131
-rect 476 165 510 181
-rect 476 61 510 131
-rect 634 171 705 207
-rect 702 131 705 171
-rect 634 115 705 131
-rect 826 171 860 187
-rect 826 61 860 131
-rect 912 171 946 325
-rect 1002 257 1018 291
-rect 1052 257 1068 291
-rect 912 115 946 131
-rect 1016 171 1050 187
-rect 1016 61 1050 131
-rect 1102 171 1136 331
-rect 1323 297 1358 349
-rect 1102 115 1136 131
-rect 1206 263 1358 297
-rect 1206 165 1240 263
-rect 1401 231 1435 479
-rect 1378 197 1435 231
-rect 1206 115 1240 131
-rect 1292 165 1326 181
-rect 1292 61 1326 131
-rect 1378 165 1412 197
-rect 1378 115 1412 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 1003 861 1037 867
-rect 1003 833 1037 861
-rect 1139 861 1173 867
-rect 1139 833 1173 861
-rect 1275 861 1309 867
-rect 1275 833 1309 861
-rect 40 257 74 291
-rect 253 405 287 439
-rect 181 331 215 365
-rect 449 257 467 291
-rect 467 257 483 291
-rect 535 257 569 291
-rect 699 405 733 439
-rect 795 479 829 513
-rect 898 405 932 439
-rect 699 331 733 365
-rect 912 331 946 365
-rect 1377 479 1411 513
-rect 1206 405 1240 439
-rect 1226 331 1260 365
-rect 671 251 705 285
-rect 1018 257 1052 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 867 1452 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 1003 867
-rect 1037 833 1139 867
-rect 1173 833 1275 867
-rect 1309 833 1452 867
-rect 0 827 1452 833
-rect 783 513 841 519
-rect 1365 513 1424 519
-rect 783 479 795 513
-rect 829 479 1016 513
-rect 1344 479 1377 513
-rect 1411 479 1424 513
-rect 783 473 841 479
-rect 241 439 299 445
-rect 687 439 745 445
-rect 886 439 944 445
-rect 241 405 253 439
-rect 287 405 699 439
-rect 733 405 898 439
-rect 932 405 944 439
-rect 241 399 299 405
-rect 687 399 745 405
-rect 886 399 944 405
-rect 169 365 227 371
-rect 687 365 745 371
-rect 169 331 181 365
-rect 215 331 249 365
-rect 683 331 699 365
-rect 733 359 745 365
-rect 900 365 958 371
-rect 900 359 912 365
-rect 733 331 912 359
-rect 946 331 958 365
-rect 987 365 1016 479
-rect 1365 473 1424 479
-rect 1194 439 1252 445
-rect 1194 438 1206 439
-rect 1173 405 1206 438
-rect 1240 405 1252 439
-rect 1173 404 1252 405
-rect 1194 399 1252 404
-rect 1216 365 1272 371
-rect 987 331 1226 365
-rect 1260 331 1272 365
-rect 169 325 227 331
-rect 687 325 745 331
-rect 900 325 958 331
-rect 1216 325 1272 331
-rect 28 291 86 297
-rect 437 291 495 297
-rect 28 257 40 291
-rect 74 257 449 291
-rect 483 257 495 291
-rect 28 251 86 257
-rect 437 251 495 257
-rect 523 291 581 297
-rect 1006 291 1064 297
-rect 523 257 535 291
-rect 569 285 1018 291
-rect 569 257 671 285
-rect 523 251 581 257
-rect 659 251 671 257
-rect 705 257 1018 285
-rect 1052 257 1064 291
-rect 705 251 717 257
-rect 1006 251 1064 257
-rect 665 245 711 251
-rect 0 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel viali 198 348 198 348 1 D
-port 1 n
-rlabel viali 915 422 915 422 1 CK
-port 4 n
-rlabel viali 1223 422 1223 422 1 ON
-rlabel viali 1394 496 1394 496 1 Q
-rlabel viali 68 49 68 49 1 gnd
-rlabel viali 68 841 68 841 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__dff_l.mag b/12T_ls/sky130_osu_sc_12T_ls__dff_l.mag
deleted file mode 100644
index 646975d..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__dff_l.mag
+++ /dev/null
@@ -1,658 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864417
-<< checkpaint >>
-rect -1209 -1243 2569 2131
-<< nwell >>
-rect -9 485 1456 897
-<< nmos >>
-rect 85 115 115 219
-rect 171 115 201 219
-rect 243 115 273 219
-rect 363 115 393 219
-rect 435 115 465 219
-rect 521 115 551 219
-rect 593 115 623 219
-rect 713 115 743 219
-rect 785 115 815 219
-rect 871 115 901 219
-rect 1061 115 1091 219
-rect 1251 115 1281 187
-rect 1337 115 1367 187
-<< pmoshvt >>
-rect 85 521 115 773
-rect 171 521 201 773
-rect 243 521 273 773
-rect 363 521 393 773
-rect 435 521 465 773
-rect 521 521 551 773
-rect 593 521 623 773
-rect 713 521 743 773
-rect 785 521 815 773
-rect 871 521 901 773
-rect 1061 521 1091 773
-rect 1251 605 1281 773
-rect 1337 605 1367 773
-<< ndiff >>
-rect 32 171 85 219
-rect 32 131 40 171
-rect 74 131 85 171
-rect 32 115 85 131
-rect 115 171 171 219
-rect 115 131 126 171
-rect 160 131 171 171
-rect 115 115 171 131
-rect 201 115 243 219
-rect 273 171 363 219
-rect 273 131 284 171
-rect 352 131 363 171
-rect 273 115 363 131
-rect 393 115 435 219
-rect 465 165 521 219
-rect 465 131 476 165
-rect 510 131 521 165
-rect 465 115 521 131
-rect 551 115 593 219
-rect 623 171 713 219
-rect 623 131 634 171
-rect 702 131 713 171
-rect 623 115 713 131
-rect 743 115 785 219
-rect 815 171 871 219
-rect 815 131 826 171
-rect 860 131 871 171
-rect 815 115 871 131
-rect 901 171 954 219
-rect 901 131 912 171
-rect 946 131 954 171
-rect 901 115 954 131
-rect 1008 171 1061 219
-rect 1008 131 1016 171
-rect 1050 131 1061 171
-rect 1008 115 1061 131
-rect 1091 171 1144 219
-rect 1091 131 1102 171
-rect 1136 131 1144 171
-rect 1091 115 1144 131
-rect 1198 165 1251 187
-rect 1198 131 1206 165
-rect 1240 131 1251 165
-rect 1198 115 1251 131
-rect 1281 165 1337 187
-rect 1281 131 1292 165
-rect 1326 131 1337 165
-rect 1281 115 1337 131
-rect 1367 165 1420 187
-rect 1367 131 1378 165
-rect 1412 131 1420 165
-rect 1367 115 1420 131
-<< pdiff >>
-rect 32 757 85 773
-rect 32 561 40 757
-rect 74 561 85 757
-rect 32 521 85 561
-rect 115 757 171 773
-rect 115 629 126 757
-rect 160 629 171 757
-rect 115 521 171 629
-rect 201 521 243 773
-rect 273 757 363 773
-rect 273 561 284 757
-rect 352 561 363 757
-rect 273 521 363 561
-rect 393 521 435 773
-rect 465 757 521 773
-rect 465 629 476 757
-rect 510 629 521 757
-rect 465 521 521 629
-rect 551 521 593 773
-rect 623 757 713 773
-rect 623 629 634 757
-rect 702 629 713 757
-rect 623 521 713 629
-rect 743 521 785 773
-rect 815 757 871 773
-rect 815 595 826 757
-rect 860 595 871 757
-rect 815 521 871 595
-rect 901 757 954 773
-rect 901 561 912 757
-rect 946 561 954 757
-rect 901 521 954 561
-rect 1008 757 1061 773
-rect 1008 629 1016 757
-rect 1050 629 1061 757
-rect 1008 521 1061 629
-rect 1091 757 1144 773
-rect 1091 561 1102 757
-rect 1136 561 1144 757
-rect 1198 757 1251 773
-rect 1198 689 1206 757
-rect 1240 689 1251 757
-rect 1198 605 1251 689
-rect 1281 757 1337 773
-rect 1281 689 1292 757
-rect 1326 689 1337 757
-rect 1281 605 1337 689
-rect 1367 757 1420 773
-rect 1367 689 1378 757
-rect 1412 689 1420 757
-rect 1367 605 1420 689
-rect 1091 521 1144 561
-<< ndiffc >>
-rect 40 131 74 171
-rect 126 131 160 171
-rect 284 131 352 171
-rect 476 131 510 165
-rect 634 131 702 171
-rect 826 131 860 171
-rect 912 131 946 171
-rect 1016 131 1050 171
-rect 1102 131 1136 171
-rect 1206 131 1240 165
-rect 1292 131 1326 165
-rect 1378 131 1412 165
-<< pdiffc >>
-rect 40 561 74 757
-rect 126 629 160 757
-rect 284 561 352 757
-rect 476 629 510 757
-rect 634 629 702 757
-rect 826 595 860 757
-rect 912 561 946 757
-rect 1016 629 1050 757
-rect 1102 561 1136 757
-rect 1206 689 1240 757
-rect 1292 689 1326 757
-rect 1378 689 1412 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-rect 979 827 1003 861
-rect 1037 827 1061 861
-rect 1115 827 1139 861
-rect 1173 827 1197 861
-rect 1251 827 1275 861
-rect 1309 827 1333 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-rect 1003 827 1037 861
-rect 1139 827 1173 861
-rect 1275 827 1309 861
-<< poly >>
-rect 85 773 115 799
-rect 171 773 201 799
-rect 243 773 273 799
-rect 363 773 393 799
-rect 435 773 465 799
-rect 521 773 551 799
-rect 593 773 623 799
-rect 713 773 743 799
-rect 785 773 815 799
-rect 871 773 901 799
-rect 1061 773 1091 799
-rect 1251 773 1281 799
-rect 1337 773 1367 799
-rect 1251 525 1281 605
-rect 85 490 115 521
-rect 75 474 129 490
-rect 75 440 85 474
-rect 119 440 129 474
-rect 75 424 129 440
-rect 75 278 105 424
-rect 171 381 201 521
-rect 243 490 273 521
-rect 243 474 297 490
-rect 243 440 253 474
-rect 287 440 297 474
-rect 243 424 297 440
-rect 171 365 225 381
-rect 363 379 393 521
-rect 435 484 465 521
-rect 521 484 551 521
-rect 435 474 551 484
-rect 435 440 467 474
-rect 501 440 551 474
-rect 435 430 551 440
-rect 593 381 623 521
-rect 713 490 743 521
-rect 689 474 743 490
-rect 689 440 699 474
-rect 733 440 743 474
-rect 689 424 743 440
-rect 785 381 815 521
-rect 871 490 901 521
-rect 871 474 942 490
-rect 871 460 898 474
-rect 882 440 898 460
-rect 932 440 942 474
-rect 882 424 942 440
-rect 593 379 743 381
-rect 171 331 181 365
-rect 215 331 225 365
-rect 171 315 225 331
-rect 267 365 743 379
-rect 267 349 699 365
-rect 75 248 115 278
-rect 85 219 115 248
-rect 171 219 201 315
-rect 267 271 297 349
-rect 689 331 699 349
-rect 733 331 743 365
-rect 689 315 743 331
-rect 243 241 297 271
-rect 339 291 393 307
-rect 339 257 349 291
-rect 383 257 393 291
-rect 339 241 393 257
-rect 243 219 273 241
-rect 363 219 393 241
-rect 435 291 551 301
-rect 435 257 467 291
-rect 501 257 551 291
-rect 435 247 551 257
-rect 435 219 465 247
-rect 521 219 551 247
-rect 593 291 647 307
-rect 593 257 603 291
-rect 637 257 647 291
-rect 593 241 647 257
-rect 593 219 623 241
-rect 713 219 743 315
-rect 785 365 839 381
-rect 785 331 795 365
-rect 829 331 839 365
-rect 785 315 839 331
-rect 785 219 815 315
-rect 882 271 912 424
-rect 1061 307 1091 521
-rect 1241 495 1281 525
-rect 1241 381 1271 495
-rect 1337 436 1367 605
-rect 1216 365 1271 381
-rect 1313 420 1367 436
-rect 1313 386 1323 420
-rect 1357 386 1367 420
-rect 1313 370 1367 386
-rect 1216 331 1226 365
-rect 1260 331 1271 365
-rect 1216 315 1271 331
-rect 1240 308 1271 315
-rect 871 241 912 271
-rect 1008 291 1091 307
-rect 1008 257 1018 291
-rect 1052 257 1091 291
-rect 1008 241 1091 257
-rect 1241 284 1271 308
-rect 1241 254 1281 284
-rect 871 219 901 241
-rect 1061 219 1091 241
-rect 1251 187 1281 254
-rect 1337 187 1367 370
-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 440 119 474
-rect 253 440 287 474
-rect 467 440 501 474
-rect 699 440 733 474
-rect 898 440 932 474
-rect 181 331 215 365
-rect 699 331 733 365
-rect 349 257 383 291
-rect 467 257 501 291
-rect 603 257 637 291
-rect 795 331 829 365
-rect 1323 386 1357 420
-rect 1226 331 1260 365
-rect 1018 257 1052 291
-<< locali >>
-rect 0 867 1452 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 1003 867
-rect 1037 827 1139 867
-rect 1173 827 1275 867
-rect 1309 827 1452 867
-rect 40 757 74 773
-rect 17 561 40 573
-rect 126 757 160 827
-rect 126 613 160 629
-rect 284 757 352 773
-rect 17 539 74 561
-rect 476 757 510 827
-rect 476 613 510 629
-rect 634 757 702 773
-rect 352 561 355 579
-rect 284 558 355 561
-rect 634 558 702 629
-rect 17 291 51 539
-rect 108 524 355 558
-rect 535 524 702 558
-rect 826 757 860 827
-rect 826 549 860 595
-rect 912 757 946 773
-rect 1016 757 1050 827
-rect 1016 613 1050 629
-rect 1102 757 1136 773
-rect 912 558 946 561
-rect 912 524 1000 558
-rect 108 490 142 524
-rect 85 474 142 490
-rect 119 440 142 474
-rect 85 424 142 440
-rect 17 257 40 291
-rect 17 236 74 257
-rect 108 274 142 424
-rect 253 474 287 490
-rect 253 439 287 440
-rect 467 474 501 490
-rect 287 405 383 439
-rect 181 365 215 381
-rect 181 315 215 331
-rect 349 291 383 405
-rect 467 291 501 440
-rect 108 240 315 274
-rect 535 291 569 524
-rect 699 474 733 490
-rect 699 439 733 440
-rect 603 405 699 439
-rect 829 479 830 513
-rect 603 291 637 405
-rect 795 365 830 479
-rect 898 474 932 490
-rect 898 439 932 440
-rect 966 365 1000 524
-rect 683 331 699 365
-rect 733 331 749 365
-rect 829 345 830 365
-rect 795 315 829 331
-rect 946 331 1000 365
-rect 912 325 1000 331
-rect 1102 365 1136 561
-rect 1206 757 1240 773
-rect 1206 439 1240 689
-rect 1292 757 1326 827
-rect 1292 673 1326 689
-rect 1378 757 1412 773
-rect 1378 635 1412 689
-rect 1377 576 1412 635
-rect 1377 513 1411 576
-rect 1411 479 1435 513
-rect 1240 420 1357 439
-rect 1240 405 1323 420
-rect 1102 331 1226 365
-rect 1260 331 1276 365
-rect 1323 349 1357 386
-rect 349 241 383 257
-rect 467 241 501 257
-rect 603 241 637 257
-rect 671 285 705 291
-rect 40 171 74 236
-rect 281 187 315 240
-rect 671 207 705 251
-rect 40 115 74 131
-rect 126 171 160 187
-rect 281 171 352 187
-rect 281 153 284 171
-rect 126 61 160 131
-rect 284 115 352 131
-rect 476 165 510 181
-rect 476 61 510 131
-rect 634 171 705 207
-rect 702 131 705 171
-rect 634 115 705 131
-rect 826 171 860 187
-rect 826 61 860 131
-rect 912 171 946 325
-rect 1002 257 1018 291
-rect 1052 257 1068 291
-rect 912 115 946 131
-rect 1016 171 1050 187
-rect 1016 61 1050 131
-rect 1102 171 1136 331
-rect 1323 297 1358 349
-rect 1102 115 1136 131
-rect 1206 263 1358 297
-rect 1206 165 1240 263
-rect 1401 231 1435 479
-rect 1378 197 1435 231
-rect 1206 115 1240 131
-rect 1292 165 1326 181
-rect 1292 61 1326 131
-rect 1378 165 1412 197
-rect 1378 115 1412 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 1003 861 1037 867
-rect 1003 833 1037 861
-rect 1139 861 1173 867
-rect 1139 833 1173 861
-rect 1275 861 1309 867
-rect 1275 833 1309 861
-rect 40 257 74 291
-rect 253 405 287 439
-rect 181 331 215 365
-rect 449 257 467 291
-rect 467 257 483 291
-rect 535 257 569 291
-rect 699 405 733 439
-rect 795 479 829 513
-rect 898 405 932 439
-rect 699 331 733 365
-rect 912 331 946 365
-rect 1377 479 1411 513
-rect 1206 405 1240 439
-rect 1226 331 1260 365
-rect 671 251 705 285
-rect 1018 257 1052 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 867 1452 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 1003 867
-rect 1037 833 1139 867
-rect 1173 833 1275 867
-rect 1309 833 1452 867
-rect 0 827 1452 833
-rect 783 513 841 519
-rect 1365 513 1424 519
-rect 783 479 795 513
-rect 829 479 1016 513
-rect 1344 479 1377 513
-rect 1411 479 1424 513
-rect 783 473 841 479
-rect 241 439 299 445
-rect 687 439 745 445
-rect 886 439 944 445
-rect 241 405 253 439
-rect 287 405 699 439
-rect 733 405 898 439
-rect 932 405 944 439
-rect 241 399 299 405
-rect 687 399 745 405
-rect 886 399 944 405
-rect 169 365 227 371
-rect 687 365 745 371
-rect 169 331 181 365
-rect 215 331 249 365
-rect 683 331 699 365
-rect 733 359 745 365
-rect 900 365 958 371
-rect 900 359 912 365
-rect 733 331 912 359
-rect 946 331 958 365
-rect 987 365 1016 479
-rect 1365 473 1424 479
-rect 1194 439 1252 445
-rect 1194 438 1206 439
-rect 1173 405 1206 438
-rect 1240 405 1252 439
-rect 1173 404 1252 405
-rect 1194 399 1252 404
-rect 1216 365 1272 371
-rect 987 331 1226 365
-rect 1260 331 1272 365
-rect 169 325 227 331
-rect 687 325 745 331
-rect 900 325 958 331
-rect 1216 325 1272 331
-rect 28 291 86 297
-rect 437 291 495 297
-rect 28 257 40 291
-rect 74 257 449 291
-rect 483 257 495 291
-rect 28 251 86 257
-rect 437 251 495 257
-rect 523 291 581 297
-rect 1006 291 1064 297
-rect 523 257 535 291
-rect 569 285 1018 291
-rect 569 257 671 285
-rect 523 251 581 257
-rect 659 251 671 257
-rect 705 257 1018 285
-rect 1052 257 1064 291
-rect 705 251 717 257
-rect 1006 251 1064 257
-rect 665 245 711 251
-rect 0 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel viali 198 348 198 348 1 D
-port 1 n
-rlabel viali 915 422 915 422 1 CK
-port 4 n
-rlabel viali 1223 422 1223 422 1 ON
-rlabel viali 1394 496 1394 496 1 Q
-rlabel viali 68 49 68 49 1 gnd
-rlabel viali 68 841 68 841 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__dffr_1.mag b/12T_ls/sky130_osu_sc_12T_ls__dffr_1.mag
deleted file mode 100644
index 30fa099..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__dffr_1.mag
+++ /dev/null
@@ -1,838 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864418
-<< checkpaint >>
-rect -1210 -1243 3112 2131
-<< nwell >>
-rect -10 485 1917 897
-<< nmos >>
-rect 80 115 110 219
-rect 270 115 300 187
-rect 356 115 386 187
-rect 546 115 576 219
-rect 618 115 648 219
-rect 738 115 768 219
-rect 810 115 840 219
-rect 896 115 926 219
-rect 968 115 998 219
-rect 1088 115 1118 219
-rect 1160 115 1190 219
-rect 1246 115 1276 219
-rect 1436 115 1466 187
-rect 1522 115 1552 187
-rect 1712 115 1742 219
-rect 1798 115 1828 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 270 605 300 773
-rect 342 605 372 773
-rect 546 521 576 773
-rect 618 521 648 773
-rect 738 521 768 773
-rect 810 521 840 773
-rect 896 521 926 773
-rect 968 521 998 773
-rect 1088 521 1118 773
-rect 1160 521 1190 773
-rect 1246 521 1276 773
-rect 1436 605 1466 773
-rect 1508 605 1538 773
-rect 1712 521 1742 773
-rect 1798 521 1828 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-rect 217 165 270 187
-rect 217 131 225 165
-rect 259 131 270 165
-rect 217 115 270 131
-rect 300 165 356 187
-rect 300 131 311 165
-rect 345 131 356 165
-rect 300 115 356 131
-rect 386 165 439 187
-rect 386 131 397 165
-rect 431 131 439 165
-rect 386 115 439 131
-rect 493 171 546 219
-rect 493 131 501 171
-rect 535 131 546 171
-rect 493 115 546 131
-rect 576 115 618 219
-rect 648 171 738 219
-rect 648 131 659 171
-rect 727 131 738 171
-rect 648 115 738 131
-rect 768 115 810 219
-rect 840 165 896 219
-rect 840 131 851 165
-rect 885 131 896 165
-rect 840 115 896 131
-rect 926 115 968 219
-rect 998 171 1088 219
-rect 998 131 1009 171
-rect 1077 131 1088 171
-rect 998 115 1088 131
-rect 1118 115 1160 219
-rect 1190 171 1246 219
-rect 1190 131 1201 171
-rect 1235 131 1246 171
-rect 1190 115 1246 131
-rect 1276 171 1329 219
-rect 1276 131 1287 171
-rect 1321 131 1329 171
-rect 1276 115 1329 131
-rect 1383 165 1436 187
-rect 1383 131 1391 165
-rect 1425 131 1436 165
-rect 1383 115 1436 131
-rect 1466 165 1522 187
-rect 1466 131 1477 165
-rect 1511 131 1522 165
-rect 1466 115 1522 131
-rect 1552 165 1605 187
-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 758 80 773
-rect 27 697 35 758
-rect 69 697 80 758
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 560 121 757
-rect 155 560 163 757
-rect 217 757 270 773
-rect 217 621 225 757
-rect 259 621 270 757
-rect 217 605 270 621
-rect 300 605 342 773
-rect 372 757 425 773
-rect 372 621 383 757
-rect 417 621 425 757
-rect 372 605 425 621
-rect 493 757 546 773
-rect 493 629 501 757
-rect 535 629 546 757
-rect 110 521 163 560
-rect 493 521 546 629
-rect 576 521 618 773
-rect 648 757 738 773
-rect 648 561 659 757
-rect 727 561 738 757
-rect 648 521 738 561
-rect 768 521 810 773
-rect 840 757 896 773
-rect 840 629 851 757
-rect 885 629 896 757
-rect 840 521 896 629
-rect 926 521 968 773
-rect 998 757 1088 773
-rect 998 629 1009 757
-rect 1077 629 1088 757
-rect 998 521 1088 629
-rect 1118 521 1160 773
-rect 1190 757 1246 773
-rect 1190 595 1201 757
-rect 1235 595 1246 757
-rect 1190 521 1246 595
-rect 1276 757 1329 773
-rect 1276 561 1287 757
-rect 1321 561 1329 757
-rect 1383 757 1436 773
-rect 1383 621 1391 757
-rect 1425 621 1436 757
-rect 1383 605 1436 621
-rect 1466 605 1508 773
-rect 1538 757 1591 773
-rect 1538 621 1549 757
-rect 1583 621 1591 757
-rect 1538 605 1591 621
-rect 1659 757 1712 773
-rect 1659 617 1667 757
-rect 1701 617 1712 757
-rect 1276 521 1329 561
-rect 1659 521 1712 617
-rect 1742 757 1798 773
-rect 1742 617 1753 757
-rect 1787 617 1798 757
-rect 1742 521 1798 617
-rect 1828 757 1881 773
-rect 1828 617 1839 757
-rect 1873 617 1881 757
-rect 1828 521 1881 617
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 225 131 259 165
-rect 311 131 345 165
-rect 397 131 431 165
-rect 501 131 535 171
-rect 659 131 727 171
-rect 851 131 885 165
-rect 1009 131 1077 171
-rect 1201 131 1235 171
-rect 1287 131 1321 171
-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 697 69 758
-rect 121 560 155 757
-rect 225 621 259 757
-rect 383 621 417 757
-rect 501 629 535 757
-rect 659 561 727 757
-rect 851 629 885 757
-rect 1009 629 1077 757
-rect 1201 595 1235 757
-rect 1287 561 1321 757
-rect 1391 621 1425 757
-rect 1549 621 1583 757
-rect 1667 617 1701 757
-rect 1753 617 1787 757
-rect 1839 617 1873 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-rect 1658 827 1682 861
-rect 1716 827 1740 861
-rect 1794 827 1818 861
-rect 1852 827 1876 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-rect 1682 827 1716 861
-rect 1818 827 1852 861
-<< poly >>
-rect 80 773 110 799
-rect 270 773 300 799
-rect 342 773 372 799
-rect 546 773 576 799
-rect 618 773 648 799
-rect 738 773 768 799
-rect 810 773 840 799
-rect 896 773 926 799
-rect 968 773 998 799
-rect 1088 773 1118 799
-rect 1160 773 1190 799
-rect 1246 773 1276 799
-rect 1436 773 1466 799
-rect 1508 773 1538 799
-rect 1712 773 1742 799
-rect 1798 773 1828 799
-rect 80 398 110 521
-rect 79 382 133 398
-rect 79 348 89 382
-rect 123 348 133 382
-rect 79 332 133 348
-rect 79 331 110 332
-rect 80 219 110 331
-rect 270 275 300 605
-rect 342 508 372 605
-rect 342 492 415 508
-rect 342 458 371 492
-rect 405 458 415 492
-rect 342 442 415 458
-rect 217 259 300 275
-rect 217 225 227 259
-rect 261 225 300 259
-rect 217 209 300 225
-rect 270 187 300 209
-rect 356 187 386 442
-rect 546 381 576 521
-rect 618 490 648 521
-rect 618 474 672 490
-rect 618 440 628 474
-rect 662 440 672 474
-rect 618 424 672 440
-rect 546 365 600 381
-rect 738 379 768 521
-rect 810 484 840 521
-rect 896 484 926 521
-rect 810 474 926 484
-rect 810 440 842 474
-rect 876 440 926 474
-rect 810 430 926 440
-rect 968 379 998 521
-rect 1088 490 1118 521
-rect 1064 474 1118 490
-rect 1064 440 1074 474
-rect 1108 440 1118 474
-rect 1064 424 1118 440
-rect 1160 451 1190 521
-rect 1246 490 1276 521
-rect 1246 474 1317 490
-rect 1246 460 1273 474
-rect 1160 421 1196 451
-rect 1257 440 1273 460
-rect 1307 440 1317 474
-rect 1257 424 1317 440
-rect 1166 387 1196 421
-rect 546 331 556 365
-rect 590 331 600 365
-rect 546 315 600 331
-rect 642 365 1124 379
-rect 642 349 1074 365
-rect 546 219 576 315
-rect 642 271 672 349
-rect 1064 325 1074 349
-rect 1108 325 1124 365
-rect 618 241 672 271
-rect 714 291 768 307
-rect 714 257 724 291
-rect 758 257 768 291
-rect 714 241 768 257
-rect 618 219 648 241
-rect 738 219 768 241
-rect 810 291 926 301
-rect 810 257 842 291
-rect 876 257 926 291
-rect 810 247 926 257
-rect 810 219 840 247
-rect 896 219 926 247
-rect 968 291 1022 307
-rect 1064 304 1124 325
-rect 1166 371 1220 387
-rect 1166 337 1176 371
-rect 1210 337 1220 371
-rect 1166 321 1220 337
-rect 968 257 978 291
-rect 1012 257 1022 291
-rect 968 241 1022 257
-rect 968 219 998 241
-rect 1088 219 1118 304
-rect 1166 273 1196 321
-rect 1160 241 1196 273
-rect 1262 271 1292 424
-rect 1436 307 1466 605
-rect 1246 241 1292 271
-rect 1399 291 1466 307
-rect 1399 257 1409 291
-rect 1443 257 1466 291
-rect 1508 304 1538 605
-rect 1712 505 1742 521
-rect 1702 475 1742 505
-rect 1702 381 1732 475
-rect 1798 416 1828 521
-rect 1677 365 1732 381
-rect 1677 331 1687 365
-rect 1721 331 1732 365
-rect 1774 400 1828 416
-rect 1774 366 1784 400
-rect 1818 366 1828 400
-rect 1774 350 1828 366
-rect 1677 315 1732 331
-rect 1508 275 1552 304
-rect 1399 241 1466 257
-rect 1160 219 1190 241
-rect 1246 219 1276 241
-rect 1436 187 1466 241
-rect 1522 259 1605 275
-rect 1522 225 1561 259
-rect 1595 225 1605 259
-rect 1702 264 1732 315
-rect 1702 234 1742 264
-rect 1522 209 1605 225
-rect 1712 219 1742 234
-rect 1798 219 1828 350
-rect 1522 187 1552 209
-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 348 123 382
-rect 371 458 405 492
-rect 227 225 261 259
-rect 628 440 662 474
-rect 842 440 876 474
-rect 1074 440 1108 474
-rect 1273 440 1307 474
-rect 556 331 590 365
-rect 1074 325 1108 365
-rect 724 257 758 291
-rect 842 257 876 291
-rect 1176 337 1210 371
-rect 978 257 1012 291
-rect 1409 257 1443 291
-rect 1687 331 1721 365
-rect 1784 366 1818 400
-rect 1561 225 1595 259
-<< locali >>
-rect 0 867 1914 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1682 867
-rect 1716 827 1818 867
-rect 1852 827 1914 867
-rect 35 758 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 398 81 553
-rect 121 469 155 560
-rect 225 757 259 773
-rect 121 435 191 469
-rect 47 382 123 398
-rect 47 348 89 382
-rect 89 332 123 348
-rect 157 259 191 435
-rect 225 379 259 621
-rect 383 757 417 827
-rect 383 605 417 621
-rect 501 757 535 827
-rect 501 613 535 629
-rect 659 757 727 773
-rect 851 757 885 827
-rect 851 613 885 629
-rect 1009 757 1077 773
-rect 659 558 727 561
-rect 1009 558 1077 629
-rect 1201 757 1235 827
-rect 1201 579 1235 595
-rect 1287 757 1321 773
-rect 405 524 727 558
-rect 910 524 1077 558
-rect 1391 757 1425 773
-rect 1549 757 1583 827
-rect 1425 621 1511 626
-rect 1391 592 1511 621
-rect 1549 605 1583 621
-rect 1667 757 1701 773
-rect 1287 558 1321 561
-rect 1287 524 1377 558
-rect 405 508 439 524
-rect 371 492 439 508
-rect 405 458 439 492
-rect 371 442 439 458
-rect 225 345 345 379
-rect 311 291 345 345
-rect 157 239 227 259
-rect 121 225 227 239
-rect 261 225 277 259
-rect 121 205 191 225
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 205
-rect 121 115 155 131
-rect 225 165 259 181
-rect 225 61 259 131
-rect 311 165 345 257
-rect 405 294 439 442
-rect 628 474 662 490
-rect 628 439 662 440
-rect 842 474 876 490
-rect 662 405 758 439
-rect 556 365 590 381
-rect 556 315 590 331
-rect 405 274 440 294
-rect 724 291 758 405
-rect 842 291 876 440
-rect 405 240 690 274
-rect 724 241 758 257
-rect 842 241 876 257
-rect 910 291 944 524
-rect 1074 474 1108 490
-rect 1074 439 1108 440
-rect 910 241 944 257
-rect 978 405 1074 439
-rect 1170 405 1204 479
-rect 1273 474 1307 490
-rect 1273 439 1307 440
-rect 978 291 1012 405
-rect 1170 371 1210 405
-rect 1058 325 1074 365
-rect 1108 325 1124 365
-rect 1341 365 1377 524
-rect 1176 321 1210 337
-rect 1289 331 1377 365
-rect 1287 325 1377 331
-rect 1477 365 1511 592
-rect 1667 513 1701 617
-rect 1753 757 1787 827
-rect 1753 545 1787 617
-rect 1839 757 1873 773
-rect 1839 587 1873 617
-rect 1872 570 1873 587
-rect 1872 553 1896 570
-rect 1839 536 1896 553
-rect 1667 474 1701 479
-rect 1667 440 1818 474
-rect 1784 400 1818 440
-rect 1477 331 1687 365
-rect 1721 331 1737 365
-rect 978 241 1012 257
-rect 656 187 690 240
-rect 1046 207 1080 257
-rect 311 115 345 131
-rect 397 165 431 181
-rect 397 61 431 131
-rect 501 171 535 187
-rect 656 171 727 187
-rect 656 153 659 171
-rect 501 61 535 131
-rect 659 115 727 131
-rect 851 165 885 181
-rect 851 61 885 131
-rect 1009 171 1080 207
-rect 1077 131 1080 171
-rect 1009 115 1080 131
-rect 1201 171 1235 187
-rect 1201 61 1235 131
-rect 1287 171 1321 325
-rect 1409 291 1443 307
-rect 1409 241 1443 257
-rect 1287 115 1321 131
-rect 1391 165 1425 181
-rect 1391 61 1425 131
-rect 1477 165 1511 331
-rect 1784 291 1818 366
-rect 1545 225 1561 259
-rect 1595 225 1611 259
-rect 1667 257 1818 291
-rect 1477 115 1511 131
-rect 1563 165 1597 181
-rect 1563 61 1597 131
-rect 1667 165 1701 257
-rect 1862 224 1896 536
-rect 1839 190 1896 224
-rect 1667 115 1701 131
-rect 1753 165 1787 181
-rect 1753 61 1787 131
-rect 1839 165 1873 190
-rect 1839 115 1873 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 1682 861 1716 867
-rect 1682 833 1716 861
-rect 1818 861 1852 867
-rect 1818 833 1852 861
-rect 47 553 81 587
-rect 227 259 261 291
-rect 227 257 261 259
-rect 311 257 345 291
-rect 628 405 662 439
-rect 556 331 590 365
-rect 824 257 842 291
-rect 842 257 858 291
-rect 910 257 944 291
-rect 1074 405 1108 439
-rect 1170 479 1204 513
-rect 1273 405 1307 439
-rect 1074 331 1108 365
-rect 1255 331 1289 365
-rect 1838 553 1872 587
-rect 1667 479 1701 513
-rect 1687 331 1721 365
-rect 1046 257 1080 291
-rect 1409 257 1443 291
-rect 1561 259 1595 291
-rect 1561 257 1595 259
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 867 1914 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1682 867
-rect 1716 833 1818 867
-rect 1852 833 1914 867
-rect 0 827 1914 833
-rect 35 587 93 593
-rect 1826 587 1884 593
-rect 35 553 47 587
-rect 81 586 121 587
-rect 81 553 127 586
-rect 1804 553 1838 587
-rect 1872 553 1884 587
-rect 35 547 93 553
-rect 1826 547 1884 553
-rect 1158 513 1216 519
-rect 1655 513 1713 519
-rect 1158 479 1170 513
-rect 1204 479 1383 513
-rect 1632 479 1667 513
-rect 1701 479 1713 513
-rect 1158 473 1216 479
-rect 616 439 674 445
-rect 1062 439 1120 445
-rect 1261 439 1319 445
-rect 616 405 628 439
-rect 662 405 1074 439
-rect 1108 405 1273 439
-rect 1307 405 1319 439
-rect 616 399 674 405
-rect 1062 399 1120 405
-rect 1261 399 1319 405
-rect 544 365 602 371
-rect 1062 365 1120 371
-rect 1243 365 1302 371
-rect 544 331 556 365
-rect 590 331 624 365
-rect 1062 331 1074 365
-rect 1108 331 1255 365
-rect 1289 331 1302 365
-rect 544 325 602 331
-rect 1062 325 1120 331
-rect 1243 325 1302 331
-rect 1347 365 1383 479
-rect 1655 473 1713 479
-rect 1675 365 1733 371
-rect 1347 331 1687 365
-rect 1721 331 1733 365
-rect 1347 330 1733 331
-rect 1675 325 1733 330
-rect 217 291 271 303
-rect 217 257 227 291
-rect 261 257 271 291
-rect 217 251 271 257
-rect 299 291 356 299
-rect 812 291 870 297
-rect 299 257 311 291
-rect 345 257 824 291
-rect 858 257 870 291
-rect 227 217 261 251
-rect 299 250 356 257
-rect 812 251 870 257
-rect 898 291 956 297
-rect 1036 291 1088 297
-rect 1397 291 1455 297
-rect 898 257 910 291
-rect 944 257 1046 291
-rect 1080 257 1409 291
-rect 1443 257 1455 291
-rect 898 251 956 257
-rect 1036 251 1088 257
-rect 1397 251 1455 257
-rect 1549 291 1607 297
-rect 1549 257 1561 291
-rect 1595 257 1607 291
-rect 1549 251 1607 257
-rect 1561 217 1595 251
-rect 227 183 1595 217
-rect 0 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel viali 65 570 65 570 1 RN
-port 1 n
-rlabel viali 1855 570 1855 570 1 Q
-port 4 n
-rlabel viali 1685 496 1685 496 1 QN
-port 5 n
-rlabel viali 573 348 573 348 1 D
-port 2 n
-rlabel viali 1290 422 1290 422 1 CK
-port 3 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__dffr_l.mag b/12T_ls/sky130_osu_sc_12T_ls__dffr_l.mag
deleted file mode 100644
index a8f1f72..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__dffr_l.mag
+++ /dev/null
@@ -1,838 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864418
-<< checkpaint >>
-rect -1210 -1243 3112 2131
-<< nwell >>
-rect -10 485 1917 897
-<< nmos >>
-rect 80 115 110 219
-rect 270 115 300 187
-rect 356 115 386 187
-rect 546 115 576 219
-rect 618 115 648 219
-rect 738 115 768 219
-rect 810 115 840 219
-rect 896 115 926 219
-rect 968 115 998 219
-rect 1088 115 1118 219
-rect 1160 115 1190 219
-rect 1246 115 1276 219
-rect 1436 115 1466 187
-rect 1522 115 1552 187
-rect 1712 115 1742 187
-rect 1798 115 1828 187
-<< pmoshvt >>
-rect 80 521 110 773
-rect 270 605 300 773
-rect 342 605 372 773
-rect 546 521 576 773
-rect 618 521 648 773
-rect 738 521 768 773
-rect 810 521 840 773
-rect 896 521 926 773
-rect 968 521 998 773
-rect 1088 521 1118 773
-rect 1160 521 1190 773
-rect 1246 521 1276 773
-rect 1436 605 1466 773
-rect 1508 605 1538 773
-rect 1712 605 1742 773
-rect 1798 605 1828 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-rect 217 165 270 187
-rect 217 131 225 165
-rect 259 131 270 165
-rect 217 115 270 131
-rect 300 165 356 187
-rect 300 131 311 165
-rect 345 131 356 165
-rect 300 115 356 131
-rect 386 165 439 187
-rect 386 131 397 165
-rect 431 131 439 165
-rect 386 115 439 131
-rect 493 171 546 219
-rect 493 131 501 171
-rect 535 131 546 171
-rect 493 115 546 131
-rect 576 115 618 219
-rect 648 171 738 219
-rect 648 131 659 171
-rect 727 131 738 171
-rect 648 115 738 131
-rect 768 115 810 219
-rect 840 165 896 219
-rect 840 131 851 165
-rect 885 131 896 165
-rect 840 115 896 131
-rect 926 115 968 219
-rect 998 171 1088 219
-rect 998 131 1009 171
-rect 1077 131 1088 171
-rect 998 115 1088 131
-rect 1118 115 1160 219
-rect 1190 171 1246 219
-rect 1190 131 1201 171
-rect 1235 131 1246 171
-rect 1190 115 1246 131
-rect 1276 171 1329 219
-rect 1276 131 1287 171
-rect 1321 131 1329 171
-rect 1276 115 1329 131
-rect 1383 165 1436 187
-rect 1383 131 1391 165
-rect 1425 131 1436 165
-rect 1383 115 1436 131
-rect 1466 165 1522 187
-rect 1466 131 1477 165
-rect 1511 131 1522 165
-rect 1466 115 1522 131
-rect 1552 165 1605 187
-rect 1552 131 1563 165
-rect 1597 131 1605 165
-rect 1552 115 1605 131
-rect 1659 165 1712 187
-rect 1659 131 1667 165
-rect 1701 131 1712 165
-rect 1659 115 1712 131
-rect 1742 165 1798 187
-rect 1742 131 1753 165
-rect 1787 131 1798 165
-rect 1742 115 1798 131
-rect 1828 165 1881 187
-rect 1828 131 1839 165
-rect 1873 131 1881 165
-rect 1828 115 1881 131
-<< pdiff >>
-rect 27 758 80 773
-rect 27 697 35 758
-rect 69 697 80 758
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 560 121 757
-rect 155 560 163 757
-rect 217 757 270 773
-rect 217 621 225 757
-rect 259 621 270 757
-rect 217 605 270 621
-rect 300 605 342 773
-rect 372 757 425 773
-rect 372 621 383 757
-rect 417 621 425 757
-rect 372 605 425 621
-rect 493 757 546 773
-rect 493 629 501 757
-rect 535 629 546 757
-rect 110 521 163 560
-rect 493 521 546 629
-rect 576 521 618 773
-rect 648 757 738 773
-rect 648 561 659 757
-rect 727 561 738 757
-rect 648 521 738 561
-rect 768 521 810 773
-rect 840 757 896 773
-rect 840 629 851 757
-rect 885 629 896 757
-rect 840 521 896 629
-rect 926 521 968 773
-rect 998 757 1088 773
-rect 998 629 1009 757
-rect 1077 629 1088 757
-rect 998 521 1088 629
-rect 1118 521 1160 773
-rect 1190 757 1246 773
-rect 1190 595 1201 757
-rect 1235 595 1246 757
-rect 1190 521 1246 595
-rect 1276 757 1329 773
-rect 1276 561 1287 757
-rect 1321 561 1329 757
-rect 1383 757 1436 773
-rect 1383 621 1391 757
-rect 1425 621 1436 757
-rect 1383 605 1436 621
-rect 1466 605 1508 773
-rect 1538 757 1591 773
-rect 1538 621 1549 757
-rect 1583 621 1591 757
-rect 1538 605 1591 621
-rect 1659 757 1712 773
-rect 1659 617 1667 757
-rect 1701 617 1712 757
-rect 1659 605 1712 617
-rect 1742 757 1798 773
-rect 1742 617 1753 757
-rect 1787 617 1798 757
-rect 1742 605 1798 617
-rect 1828 757 1881 773
-rect 1828 617 1839 757
-rect 1873 617 1881 757
-rect 1828 605 1881 617
-rect 1276 521 1329 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 225 131 259 165
-rect 311 131 345 165
-rect 397 131 431 165
-rect 501 131 535 171
-rect 659 131 727 171
-rect 851 131 885 165
-rect 1009 131 1077 171
-rect 1201 131 1235 171
-rect 1287 131 1321 171
-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 697 69 758
-rect 121 560 155 757
-rect 225 621 259 757
-rect 383 621 417 757
-rect 501 629 535 757
-rect 659 561 727 757
-rect 851 629 885 757
-rect 1009 629 1077 757
-rect 1201 595 1235 757
-rect 1287 561 1321 757
-rect 1391 621 1425 757
-rect 1549 621 1583 757
-rect 1667 617 1701 757
-rect 1753 617 1787 757
-rect 1839 617 1873 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-rect 1658 827 1682 861
-rect 1716 827 1740 861
-rect 1794 827 1818 861
-rect 1852 827 1876 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-rect 1682 827 1716 861
-rect 1818 827 1852 861
-<< poly >>
-rect 80 773 110 799
-rect 270 773 300 799
-rect 342 773 372 799
-rect 546 773 576 799
-rect 618 773 648 799
-rect 738 773 768 799
-rect 810 773 840 799
-rect 896 773 926 799
-rect 968 773 998 799
-rect 1088 773 1118 799
-rect 1160 773 1190 799
-rect 1246 773 1276 799
-rect 1436 773 1466 799
-rect 1508 773 1538 799
-rect 1712 773 1742 799
-rect 1798 773 1828 799
-rect 80 398 110 521
-rect 79 382 133 398
-rect 79 348 89 382
-rect 123 348 133 382
-rect 79 332 133 348
-rect 79 331 110 332
-rect 80 219 110 331
-rect 270 275 300 605
-rect 342 508 372 605
-rect 342 492 415 508
-rect 342 458 371 492
-rect 405 458 415 492
-rect 342 442 415 458
-rect 217 259 300 275
-rect 217 225 227 259
-rect 261 225 300 259
-rect 217 209 300 225
-rect 270 187 300 209
-rect 356 187 386 442
-rect 546 381 576 521
-rect 618 490 648 521
-rect 618 474 672 490
-rect 618 440 628 474
-rect 662 440 672 474
-rect 618 424 672 440
-rect 546 365 600 381
-rect 738 379 768 521
-rect 810 484 840 521
-rect 896 484 926 521
-rect 810 474 926 484
-rect 810 440 842 474
-rect 876 440 926 474
-rect 810 430 926 440
-rect 968 379 998 521
-rect 1088 490 1118 521
-rect 1064 474 1118 490
-rect 1064 440 1074 474
-rect 1108 440 1118 474
-rect 1064 424 1118 440
-rect 1160 451 1190 521
-rect 1246 490 1276 521
-rect 1246 474 1317 490
-rect 1246 460 1273 474
-rect 1160 421 1196 451
-rect 1257 440 1273 460
-rect 1307 440 1317 474
-rect 1257 424 1317 440
-rect 1166 387 1196 421
-rect 546 331 556 365
-rect 590 331 600 365
-rect 546 315 600 331
-rect 642 365 1124 379
-rect 642 349 1074 365
-rect 546 219 576 315
-rect 642 271 672 349
-rect 1064 325 1074 349
-rect 1108 325 1124 365
-rect 618 241 672 271
-rect 714 291 768 307
-rect 714 257 724 291
-rect 758 257 768 291
-rect 714 241 768 257
-rect 618 219 648 241
-rect 738 219 768 241
-rect 810 291 926 301
-rect 810 257 842 291
-rect 876 257 926 291
-rect 810 247 926 257
-rect 810 219 840 247
-rect 896 219 926 247
-rect 968 291 1022 307
-rect 1064 304 1124 325
-rect 1166 371 1220 387
-rect 1166 337 1176 371
-rect 1210 337 1220 371
-rect 1166 321 1220 337
-rect 968 257 978 291
-rect 1012 257 1022 291
-rect 968 241 1022 257
-rect 968 219 998 241
-rect 1088 219 1118 304
-rect 1166 273 1196 321
-rect 1160 241 1196 273
-rect 1262 271 1292 424
-rect 1436 307 1466 605
-rect 1246 241 1292 271
-rect 1399 291 1466 307
-rect 1399 257 1409 291
-rect 1443 257 1466 291
-rect 1508 304 1538 605
-rect 1712 505 1742 605
-rect 1702 475 1742 505
-rect 1702 381 1732 475
-rect 1798 416 1828 605
-rect 1677 365 1732 381
-rect 1677 331 1687 365
-rect 1721 331 1732 365
-rect 1774 400 1828 416
-rect 1774 366 1784 400
-rect 1818 366 1828 400
-rect 1774 350 1828 366
-rect 1677 315 1732 331
-rect 1508 275 1552 304
-rect 1399 241 1466 257
-rect 1160 219 1190 241
-rect 1246 219 1276 241
-rect 1436 187 1466 241
-rect 1522 259 1605 275
-rect 1522 225 1561 259
-rect 1595 225 1605 259
-rect 1702 264 1732 315
-rect 1702 234 1742 264
-rect 1522 209 1605 225
-rect 1522 187 1552 209
-rect 1712 187 1742 234
-rect 1798 187 1828 350
-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 348 123 382
-rect 371 458 405 492
-rect 227 225 261 259
-rect 628 440 662 474
-rect 842 440 876 474
-rect 1074 440 1108 474
-rect 1273 440 1307 474
-rect 556 331 590 365
-rect 1074 325 1108 365
-rect 724 257 758 291
-rect 842 257 876 291
-rect 1176 337 1210 371
-rect 978 257 1012 291
-rect 1409 257 1443 291
-rect 1687 331 1721 365
-rect 1784 366 1818 400
-rect 1561 225 1595 259
-<< locali >>
-rect 0 867 1914 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1682 867
-rect 1716 827 1818 867
-rect 1852 827 1914 867
-rect 35 758 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 398 81 553
-rect 121 469 155 560
-rect 225 757 259 773
-rect 121 435 191 469
-rect 47 382 123 398
-rect 47 348 89 382
-rect 89 332 123 348
-rect 157 259 191 435
-rect 225 379 259 621
-rect 383 757 417 827
-rect 383 605 417 621
-rect 501 757 535 827
-rect 501 613 535 629
-rect 659 757 727 773
-rect 851 757 885 827
-rect 851 613 885 629
-rect 1009 757 1077 773
-rect 659 558 727 561
-rect 1009 558 1077 629
-rect 1201 757 1235 827
-rect 1201 579 1235 595
-rect 1287 757 1321 773
-rect 405 524 727 558
-rect 910 524 1077 558
-rect 1391 757 1425 773
-rect 1549 757 1583 827
-rect 1425 621 1511 626
-rect 1391 592 1511 621
-rect 1549 605 1583 621
-rect 1667 757 1701 773
-rect 1287 558 1321 561
-rect 1287 524 1377 558
-rect 405 508 439 524
-rect 371 492 439 508
-rect 405 458 439 492
-rect 371 442 439 458
-rect 225 345 345 379
-rect 311 291 345 345
-rect 157 239 227 259
-rect 121 225 227 239
-rect 261 225 277 259
-rect 121 205 191 225
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 205
-rect 121 115 155 131
-rect 225 165 259 181
-rect 225 61 259 131
-rect 311 165 345 257
-rect 405 294 439 442
-rect 628 474 662 490
-rect 628 439 662 440
-rect 842 474 876 490
-rect 662 405 758 439
-rect 556 365 590 381
-rect 556 315 590 331
-rect 405 274 440 294
-rect 724 291 758 405
-rect 842 291 876 440
-rect 405 240 690 274
-rect 724 241 758 257
-rect 842 241 876 257
-rect 910 291 944 524
-rect 1074 474 1108 490
-rect 1074 439 1108 440
-rect 910 241 944 257
-rect 978 405 1074 439
-rect 1170 405 1204 479
-rect 1273 474 1307 490
-rect 1273 439 1307 440
-rect 978 291 1012 405
-rect 1170 371 1210 405
-rect 1058 325 1074 365
-rect 1108 325 1124 365
-rect 1341 365 1377 524
-rect 1176 321 1210 337
-rect 1289 331 1377 365
-rect 1287 325 1377 331
-rect 1477 365 1511 592
-rect 1667 513 1701 617
-rect 1753 757 1787 827
-rect 1753 545 1787 617
-rect 1839 757 1873 773
-rect 1839 587 1873 617
-rect 1872 570 1873 587
-rect 1872 553 1896 570
-rect 1839 536 1896 553
-rect 1667 474 1701 479
-rect 1667 440 1818 474
-rect 1784 400 1818 440
-rect 1477 331 1687 365
-rect 1721 331 1737 365
-rect 978 241 1012 257
-rect 656 187 690 240
-rect 1046 207 1080 257
-rect 311 115 345 131
-rect 397 165 431 181
-rect 397 61 431 131
-rect 501 171 535 187
-rect 656 171 727 187
-rect 656 153 659 171
-rect 501 61 535 131
-rect 659 115 727 131
-rect 851 165 885 181
-rect 851 61 885 131
-rect 1009 171 1080 207
-rect 1077 131 1080 171
-rect 1009 115 1080 131
-rect 1201 171 1235 187
-rect 1201 61 1235 131
-rect 1287 171 1321 325
-rect 1409 291 1443 307
-rect 1409 241 1443 257
-rect 1287 115 1321 131
-rect 1391 165 1425 181
-rect 1391 61 1425 131
-rect 1477 165 1511 331
-rect 1784 291 1818 366
-rect 1545 225 1561 259
-rect 1595 225 1611 259
-rect 1667 257 1818 291
-rect 1477 115 1511 131
-rect 1563 165 1597 181
-rect 1563 61 1597 131
-rect 1667 165 1701 257
-rect 1862 224 1896 536
-rect 1839 190 1896 224
-rect 1667 115 1701 131
-rect 1753 165 1787 181
-rect 1753 61 1787 131
-rect 1839 165 1873 190
-rect 1839 115 1873 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 1682 861 1716 867
-rect 1682 833 1716 861
-rect 1818 861 1852 867
-rect 1818 833 1852 861
-rect 47 553 81 587
-rect 227 259 261 291
-rect 227 257 261 259
-rect 311 257 345 291
-rect 628 405 662 439
-rect 556 331 590 365
-rect 824 257 842 291
-rect 842 257 858 291
-rect 910 257 944 291
-rect 1074 405 1108 439
-rect 1170 479 1204 513
-rect 1273 405 1307 439
-rect 1074 331 1108 365
-rect 1255 331 1289 365
-rect 1838 553 1872 587
-rect 1667 479 1701 513
-rect 1687 331 1721 365
-rect 1046 257 1080 291
-rect 1409 257 1443 291
-rect 1561 259 1595 291
-rect 1561 257 1595 259
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 867 1914 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1682 867
-rect 1716 833 1818 867
-rect 1852 833 1914 867
-rect 0 827 1914 833
-rect 35 587 93 593
-rect 1826 587 1884 593
-rect 35 553 47 587
-rect 81 586 121 587
-rect 81 553 127 586
-rect 1804 553 1838 587
-rect 1872 553 1884 587
-rect 35 547 93 553
-rect 1826 547 1884 553
-rect 1158 513 1216 519
-rect 1655 513 1713 519
-rect 1158 479 1170 513
-rect 1204 479 1383 513
-rect 1632 479 1667 513
-rect 1701 479 1713 513
-rect 1158 473 1216 479
-rect 616 439 674 445
-rect 1062 439 1120 445
-rect 1261 439 1319 445
-rect 616 405 628 439
-rect 662 405 1074 439
-rect 1108 405 1273 439
-rect 1307 405 1319 439
-rect 616 399 674 405
-rect 1062 399 1120 405
-rect 1261 399 1319 405
-rect 544 365 602 371
-rect 1062 365 1120 371
-rect 1243 365 1302 371
-rect 544 331 556 365
-rect 590 331 624 365
-rect 1062 331 1074 365
-rect 1108 331 1255 365
-rect 1289 331 1302 365
-rect 544 325 602 331
-rect 1062 325 1120 331
-rect 1243 325 1302 331
-rect 1347 365 1383 479
-rect 1655 473 1713 479
-rect 1675 365 1733 371
-rect 1347 331 1687 365
-rect 1721 331 1733 365
-rect 1347 330 1733 331
-rect 1675 325 1733 330
-rect 217 291 271 303
-rect 217 257 227 291
-rect 261 257 271 291
-rect 217 251 271 257
-rect 299 291 356 299
-rect 812 291 870 297
-rect 299 257 311 291
-rect 345 257 824 291
-rect 858 257 870 291
-rect 227 217 261 251
-rect 299 250 356 257
-rect 812 251 870 257
-rect 898 291 956 297
-rect 1036 291 1088 297
-rect 1397 291 1455 297
-rect 898 257 910 291
-rect 944 257 1046 291
-rect 1080 257 1409 291
-rect 1443 257 1455 291
-rect 898 251 956 257
-rect 1036 251 1088 257
-rect 1397 251 1455 257
-rect 1549 291 1607 297
-rect 1549 257 1561 291
-rect 1595 257 1607 291
-rect 1549 251 1607 257
-rect 1561 217 1595 251
-rect 227 183 1595 217
-rect 0 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel viali 65 570 65 570 1 RN
-port 1 n
-rlabel viali 1855 570 1855 570 1 Q
-port 4 n
-rlabel viali 1685 496 1685 496 1 QN
-port 5 n
-rlabel viali 573 348 573 348 1 D
-port 2 n
-rlabel viali 1290 422 1290 422 1 CK
-port 3 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__dffs_1.mag b/12T_ls/sky130_osu_sc_12T_ls__dffs_1.mag
deleted file mode 100644
index a40955e..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__dffs_1.mag
+++ /dev/null
@@ -1,753 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864418
-<< checkpaint >>
-rect -1210 -1243 2840 2131
-<< nwell >>
-rect -10 789 1741 897
-rect -11 563 1741 789
-rect -10 485 1741 563
-<< nmos >>
-rect 80 115 110 187
-rect 152 115 182 187
-rect 356 115 386 219
-rect 428 115 458 219
-rect 548 115 578 219
-rect 620 115 650 219
-rect 706 115 736 219
-rect 778 115 808 219
-rect 898 115 928 219
-rect 970 115 1000 219
-rect 1056 115 1086 219
-rect 1246 115 1276 187
-rect 1318 115 1348 187
-rect 1522 115 1552 219
-rect 1608 115 1638 219
-<< pmoshvt >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 356 521 386 773
-rect 428 521 458 773
-rect 548 521 578 773
-rect 620 521 650 773
-rect 706 521 736 773
-rect 778 521 808 773
-rect 898 521 928 773
-rect 970 521 1000 773
-rect 1056 521 1086 773
-rect 1246 605 1276 773
-rect 1332 605 1362 773
-rect 1522 521 1552 773
-rect 1608 521 1638 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 115 152 187
-rect 182 165 235 187
-rect 182 131 193 165
-rect 227 131 235 165
-rect 182 115 235 131
-rect 303 171 356 219
-rect 303 131 311 171
-rect 345 131 356 171
-rect 303 115 356 131
-rect 386 115 428 219
-rect 458 171 548 219
-rect 458 131 469 171
-rect 537 131 548 171
-rect 458 115 548 131
-rect 578 115 620 219
-rect 650 165 706 219
-rect 650 131 661 165
-rect 695 131 706 165
-rect 650 115 706 131
-rect 736 115 778 219
-rect 808 171 898 219
-rect 808 131 819 171
-rect 887 131 898 171
-rect 808 115 898 131
-rect 928 115 970 219
-rect 1000 171 1056 219
-rect 1000 131 1011 171
-rect 1045 131 1056 171
-rect 1000 115 1056 131
-rect 1086 171 1139 219
-rect 1086 131 1097 171
-rect 1131 131 1139 171
-rect 1086 115 1139 131
-rect 1193 165 1246 187
-rect 1193 131 1201 165
-rect 1235 131 1246 165
-rect 1193 115 1246 131
-rect 1276 115 1318 187
-rect 1348 165 1401 187
-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 757 80 773
-rect 27 689 35 757
-rect 69 689 80 757
-rect 27 605 80 689
-rect 110 757 166 773
-rect 110 689 121 757
-rect 155 689 166 757
-rect 110 605 166 689
-rect 196 757 249 773
-rect 196 689 207 757
-rect 241 689 249 757
-rect 196 605 249 689
-rect 303 757 356 773
-rect 303 629 311 757
-rect 345 629 356 757
-rect 303 521 356 629
-rect 386 521 428 773
-rect 458 757 548 773
-rect 458 561 469 757
-rect 537 561 548 757
-rect 458 521 548 561
-rect 578 521 620 773
-rect 650 757 706 773
-rect 650 629 661 757
-rect 695 629 706 757
-rect 650 521 706 629
-rect 736 521 778 773
-rect 808 757 898 773
-rect 808 629 819 757
-rect 887 629 898 757
-rect 808 521 898 629
-rect 928 521 970 773
-rect 1000 757 1056 773
-rect 1000 595 1011 757
-rect 1045 595 1056 757
-rect 1000 521 1056 595
-rect 1086 757 1139 773
-rect 1086 561 1097 757
-rect 1131 561 1139 757
-rect 1193 757 1246 773
-rect 1193 689 1201 757
-rect 1235 689 1246 757
-rect 1193 605 1246 689
-rect 1276 757 1332 773
-rect 1276 689 1287 757
-rect 1321 689 1332 757
-rect 1276 605 1332 689
-rect 1362 757 1415 773
-rect 1362 689 1373 757
-rect 1407 689 1415 757
-rect 1362 605 1415 689
-rect 1469 757 1522 773
-rect 1469 617 1477 757
-rect 1511 617 1522 757
-rect 1086 521 1139 561
-rect 1469 521 1522 617
-rect 1552 757 1608 773
-rect 1552 617 1563 757
-rect 1597 617 1608 757
-rect 1552 521 1608 617
-rect 1638 757 1691 773
-rect 1638 617 1649 757
-rect 1683 617 1691 757
-rect 1638 521 1691 617
-<< ndiffc >>
-rect 35 131 69 165
-rect 193 131 227 165
-rect 311 131 345 171
-rect 469 131 537 171
-rect 661 131 695 165
-rect 819 131 887 171
-rect 1011 131 1045 171
-rect 1097 131 1131 171
-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 689 69 757
-rect 121 689 155 757
-rect 207 689 241 757
-rect 311 629 345 757
-rect 469 561 537 757
-rect 661 629 695 757
-rect 819 629 887 757
-rect 1011 595 1045 757
-rect 1097 561 1131 757
-rect 1201 689 1235 757
-rect 1287 689 1321 757
-rect 1373 689 1407 757
-rect 1477 617 1511 757
-rect 1563 617 1597 757
-rect 1649 617 1683 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 356 773 386 799
-rect 428 773 458 799
-rect 548 773 578 799
-rect 620 773 650 799
-rect 706 773 736 799
-rect 778 773 808 799
-rect 898 773 928 799
-rect 970 773 1000 799
-rect 1056 773 1086 799
-rect 1246 773 1276 799
-rect 1332 773 1362 799
-rect 1522 773 1552 799
-rect 1608 773 1638 799
-rect 80 327 110 605
-rect 166 418 196 605
-rect 37 311 110 327
-rect 37 277 47 311
-rect 81 277 110 311
-rect 37 261 110 277
-rect 80 187 110 261
-rect 152 402 233 418
-rect 152 368 189 402
-rect 223 368 233 402
-rect 152 352 233 368
-rect 356 381 386 521
-rect 428 490 458 521
-rect 428 474 482 490
-rect 428 440 438 474
-rect 472 440 482 474
-rect 428 424 482 440
-rect 356 365 410 381
-rect 548 379 578 521
-rect 620 484 650 521
-rect 706 484 736 521
-rect 620 474 736 484
-rect 620 440 652 474
-rect 686 440 736 474
-rect 620 430 736 440
-rect 778 381 808 521
-rect 898 490 928 521
-rect 874 474 928 490
-rect 874 440 884 474
-rect 918 440 928 474
-rect 874 424 928 440
-rect 778 379 928 381
-rect 152 187 182 352
-rect 356 331 366 365
-rect 400 331 410 365
-rect 356 315 410 331
-rect 452 365 928 379
-rect 452 349 884 365
-rect 356 219 386 315
-rect 452 271 482 349
-rect 874 331 884 349
-rect 918 331 928 365
-rect 874 313 928 331
-rect 428 241 482 271
-rect 524 291 578 307
-rect 524 257 534 291
-rect 568 257 578 291
-rect 524 241 578 257
-rect 428 219 458 241
-rect 548 219 578 241
-rect 620 291 736 301
-rect 620 257 652 291
-rect 686 257 736 291
-rect 620 247 736 257
-rect 620 219 650 247
-rect 706 219 736 247
-rect 778 291 832 307
-rect 778 257 788 291
-rect 822 257 832 291
-rect 778 241 832 257
-rect 778 219 808 241
-rect 898 219 928 313
-rect 970 375 1000 521
-rect 1056 490 1086 521
-rect 1056 474 1127 490
-rect 1056 460 1083 474
-rect 1067 440 1083 460
-rect 1117 440 1127 474
-rect 1067 424 1127 440
-rect 970 359 1024 375
-rect 970 325 980 359
-rect 1014 325 1024 359
-rect 970 309 1024 325
-rect 970 219 1000 309
-rect 1067 271 1097 424
-rect 1246 307 1276 605
-rect 1056 241 1097 271
-rect 1193 291 1276 307
-rect 1193 257 1203 291
-rect 1237 257 1276 291
-rect 1332 285 1362 605
-rect 1522 505 1552 521
-rect 1512 475 1552 505
-rect 1512 375 1542 475
-rect 1608 416 1638 521
-rect 1487 359 1542 375
-rect 1487 325 1497 359
-rect 1531 325 1542 359
-rect 1584 400 1638 416
-rect 1584 366 1594 400
-rect 1628 366 1638 400
-rect 1584 350 1638 366
-rect 1487 309 1542 325
-rect 1193 241 1276 257
-rect 1056 219 1086 241
-rect 1246 187 1276 241
-rect 1318 275 1378 285
-rect 1318 259 1415 275
-rect 1318 225 1371 259
-rect 1405 225 1415 259
-rect 1512 264 1542 309
-rect 1512 234 1552 264
-rect 1318 208 1415 225
-rect 1522 219 1552 234
-rect 1608 219 1638 350
-rect 1318 187 1348 208
-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 277 81 311
-rect 189 368 223 402
-rect 438 440 472 474
-rect 652 440 686 474
-rect 884 440 918 474
-rect 366 331 400 365
-rect 884 331 918 365
-rect 534 257 568 291
-rect 652 257 686 291
-rect 788 257 822 291
-rect 1083 440 1117 474
-rect 980 325 1014 359
-rect 1203 257 1237 291
-rect 1497 325 1531 359
-rect 1594 366 1628 400
-rect 1371 225 1405 259
-<< locali >>
-rect 0 867 1738 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1738 867
-rect 35 757 69 827
-rect 35 673 69 689
-rect 121 757 155 773
-rect 121 398 155 689
-rect 207 757 241 827
-rect 207 673 241 689
-rect 311 757 345 827
-rect 311 613 345 629
-rect 469 757 537 773
-rect 661 757 695 827
-rect 661 613 695 629
-rect 819 757 887 773
-rect 469 558 537 561
-rect 819 558 887 629
-rect 1011 757 1045 827
-rect 1011 579 1045 595
-rect 1097 757 1131 773
-rect 47 324 81 327
-rect 47 261 81 277
-rect 121 199 155 364
-rect 189 524 537 558
-rect 720 524 887 558
-rect 1201 757 1235 827
-rect 1201 673 1235 689
-rect 1287 757 1321 773
-rect 1097 558 1131 561
-rect 1097 524 1187 558
-rect 189 402 223 524
-rect 438 474 472 490
-rect 438 439 472 440
-rect 652 474 686 490
-rect 472 405 568 439
-rect 189 274 223 368
-rect 366 365 400 381
-rect 366 315 400 331
-rect 534 291 568 405
-rect 652 291 686 440
-rect 189 240 500 274
-rect 534 241 568 257
-rect 652 241 686 257
-rect 720 291 754 524
-rect 884 474 918 490
-rect 884 439 918 440
-rect 720 251 754 257
-rect 788 405 884 439
-rect 788 291 822 405
-rect 868 331 884 365
-rect 918 331 934 365
-rect 980 359 1014 479
-rect 1083 474 1117 490
-rect 1083 439 1117 440
-rect 1151 371 1187 524
-rect 1097 365 1187 371
-rect 1121 356 1187 365
-rect 1287 359 1321 689
-rect 1373 757 1407 827
-rect 1373 673 1407 689
-rect 1477 757 1511 773
-rect 1477 513 1511 617
-rect 1563 757 1597 827
-rect 1563 545 1597 617
-rect 1649 757 1683 773
-rect 1649 587 1683 617
-rect 1682 570 1683 587
-rect 1682 553 1706 570
-rect 1649 536 1706 553
-rect 1477 474 1511 479
-rect 1477 440 1628 474
-rect 1594 400 1628 440
-rect 1121 337 1183 356
-rect 1121 331 1131 337
-rect 980 309 1014 325
-rect 788 241 822 257
-rect 35 165 155 199
-rect 466 187 500 240
-rect 856 207 890 257
-rect 193 165 227 181
-rect 35 115 69 131
-rect 193 61 227 131
-rect 311 171 345 187
-rect 466 171 537 187
-rect 466 153 469 171
-rect 311 61 345 131
-rect 469 115 537 131
-rect 661 165 695 181
-rect 661 61 695 131
-rect 819 171 890 207
-rect 887 131 890 171
-rect 819 115 890 131
-rect 1011 171 1045 187
-rect 1011 61 1045 131
-rect 1097 171 1131 331
-rect 1287 325 1497 359
-rect 1531 325 1547 359
-rect 1187 257 1203 291
-rect 1237 257 1253 291
-rect 1287 199 1321 325
-rect 1594 291 1628 366
-rect 1371 259 1405 275
-rect 1355 217 1371 251
-rect 1477 257 1628 291
-rect 1405 217 1421 251
-rect 1097 115 1131 131
-rect 1201 165 1321 199
-rect 1359 165 1393 182
-rect 1201 115 1235 131
-rect 1359 61 1393 131
-rect 1477 165 1511 257
-rect 1672 224 1706 536
-rect 1649 190 1706 224
-rect 1477 115 1511 131
-rect 1563 165 1597 181
-rect 1563 61 1597 131
-rect 1649 165 1683 190
-rect 1649 115 1683 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 121 364 155 398
-rect 47 311 81 324
-rect 47 290 81 311
-rect 438 405 472 439
-rect 366 331 400 365
-rect 634 257 652 291
-rect 652 257 668 291
-rect 720 257 754 291
-rect 884 405 918 439
-rect 980 479 1014 513
-rect 884 331 918 365
-rect 1083 405 1117 439
-rect 1087 331 1121 365
-rect 1648 553 1682 587
-rect 1477 479 1511 513
-rect 856 257 890 291
-rect 1497 325 1531 359
-rect 1203 257 1237 291
-rect 1371 225 1405 250
-rect 1371 216 1405 225
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 867 1738 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1738 867
-rect 0 827 1738 833
-rect 1636 587 1694 593
-rect 1614 553 1648 587
-rect 1682 553 1694 587
-rect 1636 547 1694 553
-rect 968 513 1026 519
-rect 1465 513 1523 519
-rect 968 479 980 513
-rect 1014 479 1192 513
-rect 1443 479 1477 513
-rect 1511 479 1523 513
-rect 968 473 1026 479
-rect 1157 478 1192 479
-rect 426 439 484 445
-rect 872 439 930 445
-rect 1071 439 1129 445
-rect 426 405 438 439
-rect 472 405 884 439
-rect 918 405 1083 439
-rect 1117 405 1129 439
-rect 109 398 167 404
-rect 426 399 484 405
-rect 872 399 930 405
-rect 1071 399 1129 405
-rect 109 364 121 398
-rect 155 364 167 398
-rect 109 358 167 364
-rect 354 365 412 371
-rect 872 365 930 371
-rect 1081 365 1133 371
-rect 35 324 93 330
-rect 35 290 47 324
-rect 81 290 93 324
-rect 35 283 93 290
-rect 121 291 155 358
-rect 354 331 366 365
-rect 400 331 434 365
-rect 872 331 884 365
-rect 918 331 1087 365
-rect 1121 331 1133 365
-rect 354 325 412 331
-rect 872 325 930 331
-rect 1081 325 1133 331
-rect 1161 359 1192 478
-rect 1465 473 1523 479
-rect 1485 359 1543 365
-rect 1161 325 1497 359
-rect 1531 325 1543 359
-rect 1485 319 1543 325
-rect 622 291 680 297
-rect 47 211 81 283
-rect 121 257 634 291
-rect 668 257 680 291
-rect 622 251 680 257
-rect 708 291 766 297
-rect 849 291 896 297
-rect 1191 291 1249 297
-rect 708 257 720 291
-rect 754 257 856 291
-rect 890 257 1203 291
-rect 1237 257 1249 291
-rect 708 251 766 257
-rect 849 251 896 257
-rect 1191 251 1249 257
-rect 1355 250 1417 256
-rect 1355 216 1371 250
-rect 1405 216 1417 250
-rect 1355 212 1417 216
-rect 281 211 1417 212
-rect 47 210 1417 211
-rect 47 183 1405 210
-rect 0 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 348 383 348 1 D
-port 1 n
-rlabel viali 1100 422 1100 422 1 CK
-port 2 n
-rlabel viali 1665 570 1665 570 1 Q
-port 4 n
-rlabel viali 1495 496 1495 496 1 QN
-port 3 n
-rlabel viali 64 307 64 307 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__dffs_l.mag b/12T_ls/sky130_osu_sc_12T_ls__dffs_l.mag
deleted file mode 100644
index 9c90af0..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__dffs_l.mag
+++ /dev/null
@@ -1,754 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864418
-<< checkpaint >>
-rect -1210 -1243 2840 2131
-<< nwell >>
-rect -10 789 1741 897
-rect -11 563 1741 789
-rect -10 485 1741 563
-<< nmos >>
-rect 80 115 110 187
-rect 152 115 182 187
-rect 356 115 386 219
-rect 428 115 458 219
-rect 548 115 578 219
-rect 620 115 650 219
-rect 706 115 736 219
-rect 778 115 808 219
-rect 898 115 928 219
-rect 970 115 1000 219
-rect 1056 115 1086 219
-rect 1246 115 1276 187
-rect 1318 115 1348 187
-rect 1522 115 1552 187
-rect 1608 115 1638 187
-<< pmoshvt >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 356 521 386 773
-rect 428 521 458 773
-rect 548 521 578 773
-rect 620 521 650 773
-rect 706 521 736 773
-rect 778 521 808 773
-rect 898 521 928 773
-rect 970 521 1000 773
-rect 1056 521 1086 773
-rect 1246 605 1276 773
-rect 1332 605 1362 773
-rect 1522 605 1552 773
-rect 1608 605 1638 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 115 152 187
-rect 182 165 235 187
-rect 182 131 193 165
-rect 227 131 235 165
-rect 182 115 235 131
-rect 303 171 356 219
-rect 303 131 311 171
-rect 345 131 356 171
-rect 303 115 356 131
-rect 386 115 428 219
-rect 458 171 548 219
-rect 458 131 469 171
-rect 537 131 548 171
-rect 458 115 548 131
-rect 578 115 620 219
-rect 650 165 706 219
-rect 650 131 661 165
-rect 695 131 706 165
-rect 650 115 706 131
-rect 736 115 778 219
-rect 808 171 898 219
-rect 808 131 819 171
-rect 887 131 898 171
-rect 808 115 898 131
-rect 928 115 970 219
-rect 1000 171 1056 219
-rect 1000 131 1011 171
-rect 1045 131 1056 171
-rect 1000 115 1056 131
-rect 1086 171 1139 219
-rect 1086 131 1097 171
-rect 1131 131 1139 171
-rect 1086 115 1139 131
-rect 1193 165 1246 187
-rect 1193 131 1201 165
-rect 1235 131 1246 165
-rect 1193 115 1246 131
-rect 1276 115 1318 187
-rect 1348 165 1401 187
-rect 1348 131 1359 165
-rect 1393 131 1401 165
-rect 1348 115 1401 131
-rect 1469 165 1522 187
-rect 1469 131 1477 165
-rect 1511 131 1522 165
-rect 1469 115 1522 131
-rect 1552 165 1608 187
-rect 1552 131 1563 165
-rect 1597 131 1608 165
-rect 1552 115 1608 131
-rect 1638 165 1691 187
-rect 1638 131 1649 165
-rect 1683 131 1691 165
-rect 1638 115 1691 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 689 35 757
-rect 69 689 80 757
-rect 27 605 80 689
-rect 110 757 166 773
-rect 110 689 121 757
-rect 155 689 166 757
-rect 110 605 166 689
-rect 196 757 249 773
-rect 196 689 207 757
-rect 241 689 249 757
-rect 196 605 249 689
-rect 303 757 356 773
-rect 303 629 311 757
-rect 345 629 356 757
-rect 303 521 356 629
-rect 386 521 428 773
-rect 458 757 548 773
-rect 458 561 469 757
-rect 537 561 548 757
-rect 458 521 548 561
-rect 578 521 620 773
-rect 650 757 706 773
-rect 650 629 661 757
-rect 695 629 706 757
-rect 650 521 706 629
-rect 736 521 778 773
-rect 808 757 898 773
-rect 808 629 819 757
-rect 887 629 898 757
-rect 808 521 898 629
-rect 928 521 970 773
-rect 1000 757 1056 773
-rect 1000 595 1011 757
-rect 1045 595 1056 757
-rect 1000 521 1056 595
-rect 1086 757 1139 773
-rect 1086 561 1097 757
-rect 1131 561 1139 757
-rect 1193 757 1246 773
-rect 1193 689 1201 757
-rect 1235 689 1246 757
-rect 1193 605 1246 689
-rect 1276 757 1332 773
-rect 1276 689 1287 757
-rect 1321 689 1332 757
-rect 1276 605 1332 689
-rect 1362 757 1415 773
-rect 1362 689 1373 757
-rect 1407 689 1415 757
-rect 1362 605 1415 689
-rect 1469 757 1522 773
-rect 1469 617 1477 757
-rect 1511 617 1522 757
-rect 1469 605 1522 617
-rect 1552 757 1608 773
-rect 1552 617 1563 757
-rect 1597 617 1608 757
-rect 1552 605 1608 617
-rect 1638 757 1691 773
-rect 1638 617 1649 757
-rect 1683 617 1691 757
-rect 1638 605 1691 617
-rect 1086 521 1139 561
-<< ndiffc >>
-rect 35 131 69 165
-rect 193 131 227 165
-rect 311 131 345 171
-rect 469 131 537 171
-rect 661 131 695 165
-rect 819 131 887 171
-rect 1011 131 1045 171
-rect 1097 131 1131 171
-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 689 69 757
-rect 121 689 155 757
-rect 207 689 241 757
-rect 311 629 345 757
-rect 469 561 537 757
-rect 661 629 695 757
-rect 819 629 887 757
-rect 1011 595 1045 757
-rect 1097 561 1131 757
-rect 1201 689 1235 757
-rect 1287 689 1321 757
-rect 1373 689 1407 757
-rect 1477 617 1511 757
-rect 1563 617 1597 757
-rect 1649 617 1683 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 356 773 386 799
-rect 428 773 458 799
-rect 548 773 578 799
-rect 620 773 650 799
-rect 706 773 736 799
-rect 778 773 808 799
-rect 898 773 928 799
-rect 970 773 1000 799
-rect 1056 773 1086 799
-rect 1246 773 1276 799
-rect 1332 773 1362 799
-rect 1522 773 1552 799
-rect 1608 773 1638 799
-rect 80 327 110 605
-rect 166 418 196 605
-rect 37 311 110 327
-rect 37 277 47 311
-rect 81 277 110 311
-rect 37 261 110 277
-rect 80 187 110 261
-rect 152 402 233 418
-rect 152 368 189 402
-rect 223 368 233 402
-rect 152 352 233 368
-rect 356 381 386 521
-rect 428 490 458 521
-rect 428 474 482 490
-rect 428 440 438 474
-rect 472 440 482 474
-rect 428 424 482 440
-rect 356 365 410 381
-rect 548 379 578 521
-rect 620 484 650 521
-rect 706 484 736 521
-rect 620 474 736 484
-rect 620 440 652 474
-rect 686 440 736 474
-rect 620 430 736 440
-rect 778 381 808 521
-rect 898 490 928 521
-rect 874 474 928 490
-rect 874 440 884 474
-rect 918 440 928 474
-rect 874 424 928 440
-rect 778 379 928 381
-rect 152 187 182 352
-rect 356 331 366 365
-rect 400 331 410 365
-rect 356 315 410 331
-rect 452 365 928 379
-rect 452 349 884 365
-rect 356 219 386 315
-rect 452 271 482 349
-rect 874 331 884 349
-rect 918 331 928 365
-rect 874 313 928 331
-rect 428 241 482 271
-rect 524 291 578 307
-rect 524 257 534 291
-rect 568 257 578 291
-rect 524 241 578 257
-rect 428 219 458 241
-rect 548 219 578 241
-rect 620 291 736 301
-rect 620 257 652 291
-rect 686 257 736 291
-rect 620 247 736 257
-rect 620 219 650 247
-rect 706 219 736 247
-rect 778 291 832 307
-rect 778 257 788 291
-rect 822 257 832 291
-rect 778 241 832 257
-rect 778 219 808 241
-rect 898 219 928 313
-rect 970 375 1000 521
-rect 1056 490 1086 521
-rect 1056 474 1127 490
-rect 1056 460 1083 474
-rect 1067 440 1083 460
-rect 1117 440 1127 474
-rect 1067 424 1127 440
-rect 970 359 1024 375
-rect 970 325 980 359
-rect 1014 325 1024 359
-rect 970 309 1024 325
-rect 970 219 1000 309
-rect 1067 271 1097 424
-rect 1246 307 1276 605
-rect 1056 241 1097 271
-rect 1193 291 1276 307
-rect 1193 257 1203 291
-rect 1237 257 1276 291
-rect 1332 285 1362 605
-rect 1522 505 1552 605
-rect 1512 475 1552 505
-rect 1512 375 1542 475
-rect 1608 416 1638 605
-rect 1487 359 1542 375
-rect 1487 325 1497 359
-rect 1531 325 1542 359
-rect 1584 400 1638 416
-rect 1584 366 1594 400
-rect 1628 366 1638 400
-rect 1584 350 1638 366
-rect 1487 309 1542 325
-rect 1193 241 1276 257
-rect 1056 219 1086 241
-rect 1246 187 1276 241
-rect 1318 275 1378 285
-rect 1318 259 1415 275
-rect 1318 225 1371 259
-rect 1405 225 1415 259
-rect 1512 264 1542 309
-rect 1512 234 1552 264
-rect 1318 209 1415 225
-rect 1318 208 1355 209
-rect 1318 187 1348 208
-rect 1522 187 1552 234
-rect 1608 187 1638 350
-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 277 81 311
-rect 189 368 223 402
-rect 438 440 472 474
-rect 652 440 686 474
-rect 884 440 918 474
-rect 366 331 400 365
-rect 884 331 918 365
-rect 534 257 568 291
-rect 652 257 686 291
-rect 788 257 822 291
-rect 1083 440 1117 474
-rect 980 325 1014 359
-rect 1203 257 1237 291
-rect 1497 325 1531 359
-rect 1594 366 1628 400
-rect 1371 225 1405 259
-<< locali >>
-rect 0 867 1738 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1738 867
-rect 35 757 69 827
-rect 35 673 69 689
-rect 121 757 155 773
-rect 121 398 155 689
-rect 207 757 241 827
-rect 207 673 241 689
-rect 311 757 345 827
-rect 311 613 345 629
-rect 469 757 537 773
-rect 661 757 695 827
-rect 661 613 695 629
-rect 819 757 887 773
-rect 469 558 537 561
-rect 819 558 887 629
-rect 1011 757 1045 827
-rect 1011 579 1045 595
-rect 1097 757 1131 773
-rect 47 324 81 327
-rect 47 261 81 277
-rect 121 199 155 364
-rect 189 524 537 558
-rect 720 524 887 558
-rect 1201 757 1235 827
-rect 1201 673 1235 689
-rect 1287 757 1321 773
-rect 1097 558 1131 561
-rect 1097 524 1187 558
-rect 189 402 223 524
-rect 438 474 472 490
-rect 438 439 472 440
-rect 652 474 686 490
-rect 472 405 568 439
-rect 189 274 223 368
-rect 366 365 400 381
-rect 366 315 400 331
-rect 534 291 568 405
-rect 652 291 686 440
-rect 189 240 500 274
-rect 534 241 568 257
-rect 652 241 686 257
-rect 720 291 754 524
-rect 884 474 918 490
-rect 884 439 918 440
-rect 720 251 754 257
-rect 788 405 884 439
-rect 788 291 822 405
-rect 868 331 884 365
-rect 918 331 934 365
-rect 980 359 1014 479
-rect 1083 474 1117 490
-rect 1083 439 1117 440
-rect 1151 371 1187 524
-rect 1097 365 1187 371
-rect 1121 356 1187 365
-rect 1287 359 1321 689
-rect 1373 757 1407 827
-rect 1373 673 1407 689
-rect 1477 757 1511 773
-rect 1477 513 1511 617
-rect 1563 757 1597 827
-rect 1563 545 1597 617
-rect 1649 757 1683 773
-rect 1649 587 1683 617
-rect 1682 570 1683 587
-rect 1682 553 1706 570
-rect 1649 536 1706 553
-rect 1477 474 1511 479
-rect 1477 440 1628 474
-rect 1594 400 1628 440
-rect 1121 337 1183 356
-rect 1121 331 1131 337
-rect 980 309 1014 325
-rect 788 241 822 257
-rect 35 165 155 199
-rect 466 187 500 240
-rect 856 207 890 257
-rect 193 165 227 181
-rect 35 115 69 131
-rect 193 61 227 131
-rect 311 171 345 187
-rect 466 171 537 187
-rect 466 153 469 171
-rect 311 61 345 131
-rect 469 115 537 131
-rect 661 165 695 181
-rect 661 61 695 131
-rect 819 171 890 207
-rect 887 131 890 171
-rect 819 115 890 131
-rect 1011 171 1045 187
-rect 1011 61 1045 131
-rect 1097 171 1131 331
-rect 1287 325 1497 359
-rect 1531 325 1547 359
-rect 1187 257 1203 291
-rect 1237 257 1253 291
-rect 1287 199 1321 325
-rect 1594 291 1628 366
-rect 1371 259 1405 275
-rect 1355 217 1371 251
-rect 1477 257 1628 291
-rect 1405 217 1421 251
-rect 1097 115 1131 131
-rect 1201 165 1321 199
-rect 1359 165 1393 182
-rect 1201 115 1235 131
-rect 1359 61 1393 131
-rect 1477 165 1511 257
-rect 1672 224 1706 536
-rect 1649 190 1706 224
-rect 1477 115 1511 131
-rect 1563 165 1597 181
-rect 1563 61 1597 131
-rect 1649 165 1683 190
-rect 1649 115 1683 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 121 364 155 398
-rect 47 311 81 324
-rect 47 290 81 311
-rect 438 405 472 439
-rect 366 331 400 365
-rect 634 257 652 291
-rect 652 257 668 291
-rect 720 257 754 291
-rect 884 405 918 439
-rect 980 479 1014 513
-rect 884 331 918 365
-rect 1083 405 1117 439
-rect 1087 331 1121 365
-rect 1648 553 1682 587
-rect 1477 479 1511 513
-rect 856 257 890 291
-rect 1497 325 1531 359
-rect 1203 257 1237 291
-rect 1371 225 1405 250
-rect 1371 216 1405 225
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 867 1738 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1738 867
-rect 0 827 1738 833
-rect 1636 587 1694 593
-rect 1614 553 1648 587
-rect 1682 553 1694 587
-rect 1636 547 1694 553
-rect 968 513 1026 519
-rect 1465 513 1523 519
-rect 968 479 980 513
-rect 1014 479 1192 513
-rect 1443 479 1477 513
-rect 1511 479 1523 513
-rect 968 473 1026 479
-rect 1157 478 1192 479
-rect 426 439 484 445
-rect 872 439 930 445
-rect 1071 439 1129 445
-rect 426 405 438 439
-rect 472 405 884 439
-rect 918 405 1083 439
-rect 1117 405 1129 439
-rect 109 398 167 404
-rect 426 399 484 405
-rect 872 399 930 405
-rect 1071 399 1129 405
-rect 109 364 121 398
-rect 155 364 167 398
-rect 109 358 167 364
-rect 354 365 412 371
-rect 872 365 930 371
-rect 1081 365 1133 371
-rect 35 324 93 330
-rect 35 290 47 324
-rect 81 290 93 324
-rect 35 283 93 290
-rect 121 291 155 358
-rect 354 331 366 365
-rect 400 331 434 365
-rect 872 331 884 365
-rect 918 331 1087 365
-rect 1121 331 1133 365
-rect 354 325 412 331
-rect 872 325 930 331
-rect 1081 325 1133 331
-rect 1161 359 1192 478
-rect 1465 473 1523 479
-rect 1485 359 1543 365
-rect 1161 325 1497 359
-rect 1531 325 1543 359
-rect 1485 319 1543 325
-rect 622 291 680 297
-rect 47 211 81 283
-rect 121 257 634 291
-rect 668 257 680 291
-rect 622 251 680 257
-rect 708 291 766 297
-rect 849 291 896 297
-rect 1191 291 1249 297
-rect 708 257 720 291
-rect 754 257 856 291
-rect 890 257 1203 291
-rect 1237 257 1249 291
-rect 708 251 766 257
-rect 849 251 896 257
-rect 1191 251 1249 257
-rect 1355 250 1417 256
-rect 1355 216 1371 250
-rect 1405 216 1417 250
-rect 1355 212 1417 216
-rect 281 211 1417 212
-rect 47 210 1417 211
-rect 47 183 1405 210
-rect 0 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 348 383 348 1 D
-port 1 n
-rlabel viali 1100 422 1100 422 1 CK
-port 2 n
-rlabel viali 1665 570 1665 570 1 Q
-port 4 n
-rlabel viali 1495 496 1495 496 1 QN
-port 3 n
-rlabel viali 64 307 64 307 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__dffsr_1.mag b/12T_ls/sky130_osu_sc_12T_ls__dffsr_1.mag
deleted file mode 100644
index 43593c6..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__dffsr_1.mag
+++ /dev/null
@@ -1,938 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864418
-<< checkpaint >>
-rect -1210 -1243 3248 2131
-<< nwell >>
-rect -10 485 2090 897
-<< nmos >>
-rect 80 115 110 219
-rect 272 115 302 187
-rect 370 115 400 219
-rect 442 115 472 219
-rect 632 115 662 219
-rect 704 115 734 219
-rect 824 115 854 219
-rect 896 115 926 219
-rect 982 115 1012 219
-rect 1054 115 1084 219
-rect 1174 115 1204 219
-rect 1246 115 1276 219
-rect 1332 115 1362 219
-rect 1522 115 1552 219
-rect 1594 115 1624 219
-rect 1692 115 1722 187
-rect 1884 115 1914 219
-rect 1970 115 2000 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 270 521 300 773
-rect 356 521 386 773
-rect 442 521 472 773
-rect 632 521 662 773
-rect 704 521 734 773
-rect 824 521 854 773
-rect 896 521 926 773
-rect 982 521 1012 773
-rect 1054 521 1084 773
-rect 1174 521 1204 773
-rect 1246 521 1276 773
-rect 1332 521 1362 773
-rect 1522 521 1552 773
-rect 1608 521 1638 773
-rect 1694 521 1724 773
-rect 1884 521 1914 773
-rect 1970 521 2000 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 317 187 370 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-rect 219 165 272 187
-rect 219 131 227 165
-rect 261 131 272 165
-rect 219 115 272 131
-rect 302 171 370 187
-rect 302 131 325 171
-rect 359 131 370 171
-rect 302 115 370 131
-rect 400 115 442 219
-rect 472 171 525 219
-rect 472 131 483 171
-rect 517 131 525 171
-rect 472 115 525 131
-rect 579 171 632 219
-rect 579 131 587 171
-rect 621 131 632 171
-rect 579 115 632 131
-rect 662 115 704 219
-rect 734 171 824 219
-rect 734 131 745 171
-rect 813 131 824 171
-rect 734 115 824 131
-rect 854 115 896 219
-rect 926 165 982 219
-rect 926 131 937 165
-rect 971 131 982 165
-rect 926 115 982 131
-rect 1012 115 1054 219
-rect 1084 171 1174 219
-rect 1084 131 1095 171
-rect 1163 131 1174 171
-rect 1084 115 1174 131
-rect 1204 115 1246 219
-rect 1276 171 1332 219
-rect 1276 131 1287 171
-rect 1321 131 1332 171
-rect 1276 115 1332 131
-rect 1362 171 1415 219
-rect 1362 131 1373 171
-rect 1407 131 1415 171
-rect 1362 115 1415 131
-rect 1469 171 1522 219
-rect 1469 131 1477 171
-rect 1511 131 1522 171
-rect 1469 115 1522 131
-rect 1552 115 1594 219
-rect 1624 187 1677 219
-rect 1624 171 1692 187
-rect 1624 131 1635 171
-rect 1669 131 1692 171
-rect 1624 115 1692 131
-rect 1722 165 1775 187
-rect 1722 131 1733 165
-rect 1767 131 1775 165
-rect 1722 115 1775 131
-rect 1831 171 1884 219
-rect 1831 131 1839 171
-rect 1873 131 1884 171
-rect 1831 115 1884 131
-rect 1914 171 1970 219
-rect 1914 131 1925 171
-rect 1959 131 1970 171
-rect 1914 115 1970 131
-rect 2000 171 2053 219
-rect 2000 131 2011 171
-rect 2045 131 2053 171
-rect 2000 115 2053 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-rect 217 757 270 773
-rect 217 629 225 757
-rect 259 629 270 757
-rect 217 521 270 629
-rect 300 757 356 773
-rect 300 629 311 757
-rect 345 629 356 757
-rect 300 521 356 629
-rect 386 757 442 773
-rect 386 723 397 757
-rect 431 723 442 757
-rect 386 521 442 723
-rect 472 757 525 773
-rect 472 629 483 757
-rect 517 629 525 757
-rect 472 521 525 629
-rect 579 757 632 773
-rect 579 629 587 757
-rect 621 629 632 757
-rect 579 521 632 629
-rect 662 521 704 773
-rect 734 757 824 773
-rect 734 561 745 757
-rect 813 561 824 757
-rect 734 521 824 561
-rect 854 521 896 773
-rect 926 757 982 773
-rect 926 629 937 757
-rect 971 629 982 757
-rect 926 521 982 629
-rect 1012 521 1054 773
-rect 1084 757 1174 773
-rect 1084 629 1095 757
-rect 1163 629 1174 757
-rect 1084 521 1174 629
-rect 1204 521 1246 773
-rect 1276 757 1332 773
-rect 1276 595 1287 757
-rect 1321 595 1332 757
-rect 1276 521 1332 595
-rect 1362 757 1415 773
-rect 1362 561 1373 757
-rect 1407 561 1415 757
-rect 1362 521 1415 561
-rect 1469 757 1522 773
-rect 1469 629 1477 757
-rect 1511 629 1522 757
-rect 1469 521 1522 629
-rect 1552 757 1608 773
-rect 1552 723 1563 757
-rect 1597 723 1608 757
-rect 1552 521 1608 723
-rect 1638 757 1694 773
-rect 1638 629 1649 757
-rect 1683 629 1694 757
-rect 1638 521 1694 629
-rect 1724 757 1777 773
-rect 1724 629 1735 757
-rect 1769 629 1777 757
-rect 1724 521 1777 629
-rect 1831 757 1884 773
-rect 1831 561 1839 757
-rect 1873 561 1884 757
-rect 1831 521 1884 561
-rect 1914 757 1970 773
-rect 1914 561 1925 757
-rect 1959 561 1970 757
-rect 1914 521 1970 561
-rect 2000 757 2053 773
-rect 2000 561 2011 757
-rect 2045 561 2053 757
-rect 2000 521 2053 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 227 131 261 165
-rect 325 131 359 171
-rect 483 131 517 171
-rect 587 131 621 171
-rect 745 131 813 171
-rect 937 131 971 165
-rect 1095 131 1163 171
-rect 1287 131 1321 171
-rect 1373 131 1407 171
-rect 1477 131 1511 171
-rect 1635 131 1669 171
-rect 1733 131 1767 165
-rect 1839 131 1873 171
-rect 1925 131 1959 171
-rect 2011 131 2045 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 225 629 259 757
-rect 311 629 345 757
-rect 397 723 431 757
-rect 483 629 517 757
-rect 587 629 621 757
-rect 745 561 813 757
-rect 937 629 971 757
-rect 1095 629 1163 757
-rect 1287 595 1321 757
-rect 1373 561 1407 757
-rect 1477 629 1511 757
-rect 1563 723 1597 757
-rect 1649 629 1683 757
-rect 1735 629 1769 757
-rect 1839 561 1873 757
-rect 1925 561 1959 757
-rect 2011 561 2045 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-rect 1658 827 1682 861
-rect 1716 827 1740 861
-rect 1794 827 1818 861
-rect 1852 827 1876 861
-rect 1930 827 1954 861
-rect 1988 827 2012 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-rect 1682 827 1716 861
-rect 1818 827 1852 861
-rect 1954 827 1988 861
-<< poly >>
-rect 80 773 110 799
-rect 270 773 300 799
-rect 356 773 386 799
-rect 442 773 472 799
-rect 632 773 662 799
-rect 704 773 734 799
-rect 824 773 854 799
-rect 896 773 926 799
-rect 982 773 1012 799
-rect 1054 773 1084 799
-rect 1174 773 1204 799
-rect 1246 773 1276 799
-rect 1332 773 1362 799
-rect 1522 773 1552 799
-rect 1608 773 1638 799
-rect 1694 773 1724 799
-rect 1884 773 1914 799
-rect 1970 773 2000 799
-rect 80 398 110 521
-rect 270 483 300 521
-rect 243 453 300 483
-rect 79 382 133 398
-rect 79 348 89 382
-rect 123 348 133 382
-rect 79 332 133 348
-rect 79 331 110 332
-rect 80 219 110 331
-rect 243 275 273 453
-rect 356 411 386 521
-rect 442 490 472 521
-rect 432 474 486 490
-rect 432 440 442 474
-rect 476 440 486 474
-rect 432 424 486 440
-rect 315 395 386 411
-rect 315 361 325 395
-rect 359 381 386 395
-rect 359 361 400 381
-rect 315 345 400 361
-rect 219 259 273 275
-rect 356 259 400 345
-rect 219 225 229 259
-rect 263 241 273 259
-rect 263 225 302 241
-rect 219 209 302 225
-rect 370 219 400 259
-rect 442 219 472 424
-rect 632 381 662 521
-rect 704 490 734 521
-rect 704 474 758 490
-rect 704 440 714 474
-rect 748 440 758 474
-rect 704 424 758 440
-rect 632 365 686 381
-rect 824 379 854 521
-rect 896 484 926 521
-rect 982 484 1012 521
-rect 896 474 1012 484
-rect 896 440 928 474
-rect 962 440 1012 474
-rect 896 430 1012 440
-rect 1054 379 1084 521
-rect 1174 490 1204 521
-rect 1150 474 1204 490
-rect 1150 440 1160 474
-rect 1194 440 1204 474
-rect 1150 424 1204 440
-rect 632 331 642 365
-rect 676 331 686 365
-rect 632 315 686 331
-rect 728 362 1204 379
-rect 728 349 1160 362
-rect 632 219 662 315
-rect 728 271 758 349
-rect 1150 328 1160 349
-rect 1194 328 1204 362
-rect 1150 312 1204 328
-rect 704 241 758 271
-rect 800 291 854 307
-rect 800 257 810 291
-rect 844 257 854 291
-rect 800 241 854 257
-rect 704 219 734 241
-rect 824 219 854 241
-rect 896 291 1012 301
-rect 896 257 928 291
-rect 962 257 1012 291
-rect 896 247 1012 257
-rect 896 219 926 247
-rect 982 219 1012 247
-rect 1054 291 1108 307
-rect 1054 257 1064 291
-rect 1098 257 1108 291
-rect 1054 241 1108 257
-rect 1054 219 1084 241
-rect 1174 219 1204 312
-rect 1246 375 1276 521
-rect 1332 490 1362 521
-rect 1332 474 1403 490
-rect 1522 484 1552 521
-rect 1332 460 1359 474
-rect 1343 440 1359 460
-rect 1393 440 1403 474
-rect 1343 424 1403 440
-rect 1486 474 1552 484
-rect 1486 440 1502 474
-rect 1536 440 1552 474
-rect 1486 430 1552 440
-rect 1246 359 1300 375
-rect 1246 325 1256 359
-rect 1290 325 1300 359
-rect 1246 309 1300 325
-rect 1246 219 1276 309
-rect 1343 271 1373 424
-rect 1332 241 1373 271
-rect 1486 274 1516 430
-rect 1608 388 1638 521
-rect 1694 483 1724 521
-rect 1884 505 1914 521
-rect 1694 457 1751 483
-rect 1874 475 1914 505
-rect 1694 453 1775 457
-rect 1721 425 1775 453
-rect 1576 372 1638 388
-rect 1576 338 1588 372
-rect 1622 338 1638 372
-rect 1576 322 1638 338
-rect 1486 242 1552 274
-rect 1332 219 1362 241
-rect 1522 219 1552 242
-rect 1594 219 1624 322
-rect 1745 275 1775 425
-rect 1874 375 1904 475
-rect 1970 416 2000 521
-rect 1849 359 1904 375
-rect 1849 325 1859 359
-rect 1893 325 1904 359
-rect 1946 400 2000 416
-rect 1946 366 1956 400
-rect 1990 366 2000 400
-rect 1946 350 2000 366
-rect 1849 309 1904 325
-rect 1745 259 1799 275
-rect 1745 239 1755 259
-rect 1692 225 1755 239
-rect 1789 225 1799 259
-rect 1874 264 1904 309
-rect 1874 234 1914 264
-rect 272 187 302 209
-rect 1692 209 1799 225
-rect 1884 219 1914 234
-rect 1970 219 2000 350
-rect 1692 187 1722 209
-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 348 123 382
-rect 442 440 476 474
-rect 325 361 359 395
-rect 229 225 263 259
-rect 714 440 748 474
-rect 928 440 962 474
-rect 1160 440 1194 474
-rect 642 331 676 365
-rect 1160 328 1194 362
-rect 810 257 844 291
-rect 928 257 962 291
-rect 1064 257 1098 291
-rect 1359 440 1393 474
-rect 1502 440 1536 474
-rect 1256 325 1290 359
-rect 1588 338 1622 372
-rect 1859 325 1893 359
-rect 1956 366 1990 400
-rect 1755 225 1789 259
-<< locali >>
-rect 0 867 2090 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1682 867
-rect 1716 827 1818 867
-rect 1852 827 1954 867
-rect 1988 827 2090 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 398 81 553
-rect 121 469 155 561
-rect 225 757 259 773
-rect 121 435 191 469
-rect 47 382 123 398
-rect 47 348 89 382
-rect 89 332 123 348
-rect 157 291 191 435
-rect 225 327 259 629
-rect 311 757 345 773
-rect 397 757 431 827
-rect 397 707 431 723
-rect 483 757 517 773
-rect 345 629 483 655
-rect 311 621 517 629
-rect 311 613 345 621
-rect 483 613 517 621
-rect 587 757 621 827
-rect 587 613 621 629
-rect 745 757 813 773
-rect 325 553 394 563
-rect 937 757 971 827
-rect 937 613 971 629
-rect 1095 757 1163 773
-rect 813 561 816 579
-rect 325 524 428 553
-rect 537 558 571 559
-rect 745 558 816 561
-rect 1095 558 1163 629
-rect 1287 757 1321 827
-rect 1287 579 1321 595
-rect 1373 757 1407 773
-rect 537 524 816 558
-rect 996 524 1163 558
-rect 1477 757 1511 773
-rect 1563 757 1597 827
-rect 1563 707 1597 723
-rect 1649 757 1683 773
-rect 1511 629 1649 654
-rect 1477 620 1683 629
-rect 1477 613 1511 620
-rect 1649 613 1683 620
-rect 1735 757 1769 773
-rect 1373 558 1407 561
-rect 1373 524 1461 558
-rect 325 395 359 524
-rect 442 474 476 490
-rect 537 474 571 524
-rect 476 440 571 474
-rect 714 474 748 490
-rect 309 361 325 395
-rect 359 361 375 395
-rect 225 293 359 327
-rect 313 291 359 293
-rect 121 257 157 259
-rect 191 257 229 259
-rect 121 225 229 257
-rect 263 225 279 259
-rect 121 224 219 225
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 224
-rect 121 115 155 131
-rect 227 165 261 181
-rect 227 61 261 131
-rect 325 171 359 257
-rect 442 274 476 440
-rect 714 439 748 440
-rect 928 474 962 490
-rect 748 405 844 439
-rect 642 365 676 381
-rect 642 315 676 331
-rect 810 291 844 405
-rect 928 291 962 440
-rect 442 240 776 274
-rect 810 241 844 257
-rect 928 241 962 257
-rect 996 291 1030 524
-rect 1160 474 1194 490
-rect 1160 439 1194 440
-rect 996 241 1030 257
-rect 1064 405 1160 439
-rect 1064 291 1098 405
-rect 1144 328 1160 362
-rect 1194 328 1210 362
-rect 1256 359 1290 479
-rect 1359 474 1393 490
-rect 1359 439 1393 440
-rect 1427 362 1461 524
-rect 1256 309 1290 325
-rect 1407 328 1461 362
-rect 1373 325 1461 328
-rect 1502 474 1536 490
-rect 1064 241 1098 257
-rect 742 187 776 240
-rect 1132 207 1166 251
-rect 325 115 359 131
-rect 483 171 517 187
-rect 483 61 517 131
-rect 587 171 621 187
-rect 742 171 813 187
-rect 742 153 745 171
-rect 587 61 621 131
-rect 745 115 813 131
-rect 937 165 971 181
-rect 937 61 971 131
-rect 1095 171 1166 207
-rect 1163 131 1166 171
-rect 1095 115 1166 131
-rect 1287 171 1321 187
-rect 1287 61 1321 131
-rect 1373 171 1407 325
-rect 1502 291 1536 440
-rect 1570 479 1605 552
-rect 1570 388 1604 479
-rect 1570 372 1638 388
-rect 1570 338 1588 372
-rect 1622 338 1638 372
-rect 1735 359 1769 629
-rect 1839 757 1873 773
-rect 1839 513 1873 561
-rect 1925 757 1959 827
-rect 1925 545 1959 561
-rect 2011 757 2045 773
-rect 2011 539 2045 553
-rect 2011 505 2068 539
-rect 1839 474 1873 479
-rect 1839 440 1990 474
-rect 1956 400 1990 440
-rect 1672 325 1859 359
-rect 1893 325 1909 359
-rect 1672 303 1706 325
-rect 1635 269 1706 303
-rect 1956 291 1990 366
-rect 1373 115 1407 131
-rect 1477 171 1511 187
-rect 1477 61 1511 131
-rect 1635 171 1669 269
-rect 1739 225 1755 259
-rect 1789 225 1805 259
-rect 1839 257 1990 291
-rect 1635 115 1669 131
-rect 1733 165 1767 181
-rect 1733 61 1767 131
-rect 1839 171 1873 257
-rect 2034 224 2068 505
-rect 2011 190 2068 224
-rect 1839 115 1873 131
-rect 1925 171 1959 187
-rect 1925 61 1959 131
-rect 2011 171 2045 190
-rect 2011 115 2045 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 1682 861 1716 867
-rect 1682 833 1716 861
-rect 1818 861 1852 867
-rect 1818 833 1852 861
-rect 1954 861 1988 867
-rect 1954 833 1988 861
-rect 47 553 81 587
-rect 394 553 428 587
-rect 157 257 191 291
-rect 325 257 359 291
-rect 714 405 748 439
-rect 642 331 676 365
-rect 910 257 928 291
-rect 928 257 944 291
-rect 996 257 1030 291
-rect 1160 405 1194 439
-rect 1256 479 1290 513
-rect 1160 328 1194 362
-rect 1359 405 1393 439
-rect 1570 552 1605 586
-rect 1373 328 1407 362
-rect 1132 251 1166 285
-rect 2011 561 2045 587
-rect 2011 553 2045 561
-rect 1839 479 1873 513
-rect 1859 325 1893 359
-rect 1502 257 1536 291
-rect 1755 259 1789 291
-rect 1755 257 1789 259
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 867 2090 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1682 867
-rect 1716 833 1818 867
-rect 1852 833 1954 867
-rect 1988 833 2090 867
-rect 0 827 2090 833
-rect 35 587 93 593
-rect 380 587 439 593
-rect 1558 587 1617 592
-rect 1999 587 2057 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 380 553 394 587
-rect 428 586 1617 587
-rect 428 553 1570 586
-rect 35 547 93 553
-rect 380 547 439 553
-rect 1558 552 1570 553
-rect 1605 552 1617 586
-rect 1977 553 2011 587
-rect 2045 553 2057 587
-rect 1558 546 1617 552
-rect 1999 547 2057 553
-rect 1570 529 1605 546
-rect 1244 514 1303 519
-rect 1244 513 1475 514
-rect 1827 513 1885 519
-rect 1244 479 1256 513
-rect 1290 479 1475 513
-rect 1804 479 1839 513
-rect 1873 479 1885 513
-rect 1244 473 1303 479
-rect 1433 478 1475 479
-rect 702 439 760 445
-rect 1148 439 1206 445
-rect 1347 439 1405 445
-rect 702 405 714 439
-rect 748 405 1160 439
-rect 1194 405 1359 439
-rect 1393 405 1405 439
-rect 702 399 760 405
-rect 1148 399 1206 405
-rect 1347 399 1405 405
-rect 630 365 688 371
-rect 630 331 642 365
-rect 676 331 710 365
-rect 1143 362 1210 368
-rect 1367 362 1419 368
-rect 630 325 688 331
-rect 1143 328 1160 362
-rect 1194 328 1373 362
-rect 1407 328 1419 362
-rect 1143 322 1210 328
-rect 1367 322 1419 328
-rect 1447 359 1475 478
-rect 1827 473 1885 479
-rect 1847 359 1905 365
-rect 1447 325 1859 359
-rect 1893 325 1905 359
-rect 1847 319 1905 325
-rect 145 291 203 297
-rect 145 257 157 291
-rect 191 257 203 291
-rect 145 251 203 257
-rect 313 291 371 297
-rect 898 291 956 297
-rect 313 257 325 291
-rect 359 257 910 291
-rect 944 257 956 291
-rect 313 251 371 257
-rect 898 251 956 257
-rect 984 291 1042 297
-rect 1490 291 1548 297
-rect 984 257 996 291
-rect 1030 285 1502 291
-rect 1030 257 1132 285
-rect 984 251 1042 257
-rect 1120 251 1132 257
-rect 1166 257 1502 285
-rect 1536 257 1548 291
-rect 1166 251 1178 257
-rect 1490 251 1548 257
-rect 1743 291 1802 297
-rect 1743 257 1755 291
-rect 1789 257 1802 291
-rect 1743 251 1802 257
-rect 157 217 191 251
-rect 1126 245 1172 251
-rect 1755 217 1789 251
-rect 157 183 1789 217
-rect 0 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel viali 659 348 659 348 1 D
-port 1 n
-rlabel viali 1376 422 1376 422 1 CK
-port 2 n
-rlabel viali 1857 496 1857 496 1 QN
-port 3 n
-rlabel viali 65 570 65 570 1 RN
-port 5 n
-rlabel viali 2028 570 2028 570 1 Q
-port 6 n
-rlabel viali 1588 569 1588 569 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__dffsr_l.mag b/12T_ls/sky130_osu_sc_12T_ls__dffsr_l.mag
deleted file mode 100644
index 6ce138d..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__dffsr_l.mag
+++ /dev/null
@@ -1,941 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864419
-<< checkpaint >>
-rect -1210 -1243 3248 2131
-<< nwell >>
-rect -10 485 2090 897
-<< nmos >>
-rect 80 115 110 219
-rect 272 115 302 187
-rect 370 115 400 219
-rect 442 115 472 219
-rect 632 115 662 219
-rect 704 115 734 219
-rect 824 115 854 219
-rect 896 115 926 219
-rect 982 115 1012 219
-rect 1054 115 1084 219
-rect 1174 115 1204 219
-rect 1246 115 1276 219
-rect 1332 115 1362 219
-rect 1522 115 1552 219
-rect 1594 115 1624 219
-rect 1692 115 1722 187
-rect 1884 115 1914 187
-rect 1970 115 2000 187
-<< pmoshvt >>
-rect 80 521 110 773
-rect 270 521 300 773
-rect 356 521 386 773
-rect 442 521 472 773
-rect 632 521 662 773
-rect 704 521 734 773
-rect 824 521 854 773
-rect 896 521 926 773
-rect 982 521 1012 773
-rect 1054 521 1084 773
-rect 1174 521 1204 773
-rect 1246 521 1276 773
-rect 1332 521 1362 773
-rect 1522 521 1552 773
-rect 1608 521 1638 773
-rect 1694 521 1724 773
-rect 1884 605 1914 773
-rect 1970 605 2000 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 317 187 370 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-rect 219 165 272 187
-rect 219 131 227 165
-rect 261 131 272 165
-rect 219 115 272 131
-rect 302 171 370 187
-rect 302 131 325 171
-rect 359 131 370 171
-rect 302 115 370 131
-rect 400 115 442 219
-rect 472 171 525 219
-rect 472 131 483 171
-rect 517 131 525 171
-rect 472 115 525 131
-rect 579 171 632 219
-rect 579 131 587 171
-rect 621 131 632 171
-rect 579 115 632 131
-rect 662 115 704 219
-rect 734 171 824 219
-rect 734 131 745 171
-rect 813 131 824 171
-rect 734 115 824 131
-rect 854 115 896 219
-rect 926 165 982 219
-rect 926 131 937 165
-rect 971 131 982 165
-rect 926 115 982 131
-rect 1012 115 1054 219
-rect 1084 171 1174 219
-rect 1084 131 1095 171
-rect 1163 131 1174 171
-rect 1084 115 1174 131
-rect 1204 115 1246 219
-rect 1276 171 1332 219
-rect 1276 131 1287 171
-rect 1321 131 1332 171
-rect 1276 115 1332 131
-rect 1362 171 1415 219
-rect 1362 131 1373 171
-rect 1407 131 1415 171
-rect 1362 115 1415 131
-rect 1469 171 1522 219
-rect 1469 131 1477 171
-rect 1511 131 1522 171
-rect 1469 115 1522 131
-rect 1552 115 1594 219
-rect 1624 187 1677 219
-rect 1624 171 1692 187
-rect 1624 131 1635 171
-rect 1669 131 1692 171
-rect 1624 115 1692 131
-rect 1722 165 1775 187
-rect 1722 131 1733 165
-rect 1767 131 1775 165
-rect 1722 115 1775 131
-rect 1831 171 1884 187
-rect 1831 131 1839 171
-rect 1873 131 1884 171
-rect 1831 115 1884 131
-rect 1914 171 1970 187
-rect 1914 131 1925 171
-rect 1959 131 1970 171
-rect 1914 115 1970 131
-rect 2000 171 2053 187
-rect 2000 131 2011 171
-rect 2045 131 2053 171
-rect 2000 115 2053 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-rect 217 757 270 773
-rect 217 629 225 757
-rect 259 629 270 757
-rect 217 521 270 629
-rect 300 757 356 773
-rect 300 629 311 757
-rect 345 629 356 757
-rect 300 521 356 629
-rect 386 757 442 773
-rect 386 723 397 757
-rect 431 723 442 757
-rect 386 521 442 723
-rect 472 757 525 773
-rect 472 629 483 757
-rect 517 629 525 757
-rect 472 521 525 629
-rect 579 757 632 773
-rect 579 629 587 757
-rect 621 629 632 757
-rect 579 521 632 629
-rect 662 521 704 773
-rect 734 757 824 773
-rect 734 561 745 757
-rect 813 561 824 757
-rect 734 521 824 561
-rect 854 521 896 773
-rect 926 757 982 773
-rect 926 629 937 757
-rect 971 629 982 757
-rect 926 521 982 629
-rect 1012 521 1054 773
-rect 1084 757 1174 773
-rect 1084 629 1095 757
-rect 1163 629 1174 757
-rect 1084 521 1174 629
-rect 1204 521 1246 773
-rect 1276 757 1332 773
-rect 1276 595 1287 757
-rect 1321 595 1332 757
-rect 1276 521 1332 595
-rect 1362 757 1415 773
-rect 1362 561 1373 757
-rect 1407 561 1415 757
-rect 1362 521 1415 561
-rect 1469 757 1522 773
-rect 1469 629 1477 757
-rect 1511 629 1522 757
-rect 1469 521 1522 629
-rect 1552 757 1608 773
-rect 1552 723 1563 757
-rect 1597 723 1608 757
-rect 1552 521 1608 723
-rect 1638 757 1694 773
-rect 1638 629 1649 757
-rect 1683 629 1694 757
-rect 1638 521 1694 629
-rect 1724 757 1777 773
-rect 1724 629 1735 757
-rect 1769 629 1777 757
-rect 1724 521 1777 629
-rect 1831 757 1884 773
-rect 1831 617 1839 757
-rect 1873 617 1884 757
-rect 1831 605 1884 617
-rect 1914 757 1970 773
-rect 1914 617 1925 757
-rect 1959 617 1970 757
-rect 1914 605 1970 617
-rect 2000 757 2053 773
-rect 2000 617 2011 757
-rect 2045 617 2053 757
-rect 2000 605 2053 617
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 227 131 261 165
-rect 325 131 359 171
-rect 483 131 517 171
-rect 587 131 621 171
-rect 745 131 813 171
-rect 937 131 971 165
-rect 1095 131 1163 171
-rect 1287 131 1321 171
-rect 1373 131 1407 171
-rect 1477 131 1511 171
-rect 1635 131 1669 171
-rect 1733 131 1767 165
-rect 1839 131 1873 171
-rect 1925 131 1959 171
-rect 2011 131 2045 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 225 629 259 757
-rect 311 629 345 757
-rect 397 723 431 757
-rect 483 629 517 757
-rect 587 629 621 757
-rect 745 561 813 757
-rect 937 629 971 757
-rect 1095 629 1163 757
-rect 1287 595 1321 757
-rect 1373 561 1407 757
-rect 1477 629 1511 757
-rect 1563 723 1597 757
-rect 1649 629 1683 757
-rect 1735 629 1769 757
-rect 1839 617 1873 757
-rect 1925 617 1959 757
-rect 2011 617 2045 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-rect 1658 827 1682 861
-rect 1716 827 1740 861
-rect 1794 827 1818 861
-rect 1852 827 1876 861
-rect 1930 827 1954 861
-rect 1988 827 2012 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-rect 1682 827 1716 861
-rect 1818 827 1852 861
-rect 1954 827 1988 861
-<< poly >>
-rect 80 773 110 799
-rect 270 773 300 799
-rect 356 773 386 799
-rect 442 773 472 799
-rect 632 773 662 799
-rect 704 773 734 799
-rect 824 773 854 799
-rect 896 773 926 799
-rect 982 773 1012 799
-rect 1054 773 1084 799
-rect 1174 773 1204 799
-rect 1246 773 1276 799
-rect 1332 773 1362 799
-rect 1522 773 1552 799
-rect 1608 773 1638 799
-rect 1694 773 1724 799
-rect 1884 773 1914 799
-rect 1970 773 2000 799
-rect 80 398 110 521
-rect 270 483 300 521
-rect 243 453 300 483
-rect 79 382 133 398
-rect 79 348 89 382
-rect 123 348 133 382
-rect 79 332 133 348
-rect 79 331 110 332
-rect 80 219 110 331
-rect 243 275 273 453
-rect 356 411 386 521
-rect 442 490 472 521
-rect 432 474 486 490
-rect 432 440 442 474
-rect 476 440 486 474
-rect 432 424 486 440
-rect 315 395 386 411
-rect 315 361 325 395
-rect 359 381 386 395
-rect 359 361 400 381
-rect 315 345 400 361
-rect 219 259 273 275
-rect 356 259 400 345
-rect 219 225 229 259
-rect 263 241 273 259
-rect 263 225 302 241
-rect 219 209 302 225
-rect 370 219 400 259
-rect 442 219 472 424
-rect 632 381 662 521
-rect 704 490 734 521
-rect 704 474 758 490
-rect 704 440 714 474
-rect 748 440 758 474
-rect 704 424 758 440
-rect 632 365 686 381
-rect 824 379 854 521
-rect 896 484 926 521
-rect 982 484 1012 521
-rect 896 474 1012 484
-rect 896 440 928 474
-rect 962 440 1012 474
-rect 896 430 1012 440
-rect 1054 379 1084 521
-rect 1174 490 1204 521
-rect 1150 474 1204 490
-rect 1150 440 1160 474
-rect 1194 440 1204 474
-rect 1150 424 1204 440
-rect 632 331 642 365
-rect 676 331 686 365
-rect 632 315 686 331
-rect 728 362 1204 379
-rect 728 349 1160 362
-rect 632 219 662 315
-rect 728 271 758 349
-rect 1150 328 1160 349
-rect 1194 328 1204 362
-rect 1150 312 1204 328
-rect 704 241 758 271
-rect 800 291 854 307
-rect 800 257 810 291
-rect 844 257 854 291
-rect 800 241 854 257
-rect 704 219 734 241
-rect 824 219 854 241
-rect 896 291 1012 301
-rect 896 257 928 291
-rect 962 257 1012 291
-rect 896 247 1012 257
-rect 896 219 926 247
-rect 982 219 1012 247
-rect 1054 291 1108 307
-rect 1054 257 1064 291
-rect 1098 257 1108 291
-rect 1054 241 1108 257
-rect 1054 219 1084 241
-rect 1174 219 1204 312
-rect 1246 375 1276 521
-rect 1332 490 1362 521
-rect 1332 474 1403 490
-rect 1522 484 1552 521
-rect 1332 460 1359 474
-rect 1343 440 1359 460
-rect 1393 440 1403 474
-rect 1343 424 1403 440
-rect 1486 474 1552 484
-rect 1486 440 1502 474
-rect 1536 440 1552 474
-rect 1486 430 1552 440
-rect 1246 359 1300 375
-rect 1246 325 1256 359
-rect 1290 325 1300 359
-rect 1246 309 1300 325
-rect 1246 219 1276 309
-rect 1343 271 1373 424
-rect 1332 241 1373 271
-rect 1486 274 1516 430
-rect 1608 388 1638 521
-rect 1694 483 1724 521
-rect 1884 505 1914 605
-rect 1694 457 1751 483
-rect 1874 475 1914 505
-rect 1694 453 1775 457
-rect 1721 425 1775 453
-rect 1576 372 1638 388
-rect 1576 338 1588 372
-rect 1622 338 1638 372
-rect 1576 322 1638 338
-rect 1486 242 1552 274
-rect 1332 219 1362 241
-rect 1522 219 1552 242
-rect 1594 219 1624 322
-rect 1745 275 1775 425
-rect 1874 375 1904 475
-rect 1970 416 2000 605
-rect 1849 359 1904 375
-rect 1849 325 1859 359
-rect 1893 325 1904 359
-rect 1946 400 2000 416
-rect 1946 366 1956 400
-rect 1990 366 2000 400
-rect 1946 350 2000 366
-rect 1849 309 1904 325
-rect 1745 259 1799 275
-rect 1745 239 1755 259
-rect 1692 225 1755 239
-rect 1789 225 1799 259
-rect 1874 264 1904 309
-rect 1874 234 1914 264
-rect 272 187 302 209
-rect 1692 209 1799 225
-rect 1692 187 1722 209
-rect 1884 187 1914 234
-rect 1970 187 2000 350
-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 348 123 382
-rect 442 440 476 474
-rect 325 361 359 395
-rect 229 225 263 259
-rect 714 440 748 474
-rect 928 440 962 474
-rect 1160 440 1194 474
-rect 642 331 676 365
-rect 1160 328 1194 362
-rect 810 257 844 291
-rect 928 257 962 291
-rect 1064 257 1098 291
-rect 1359 440 1393 474
-rect 1502 440 1536 474
-rect 1256 325 1290 359
-rect 1588 338 1622 372
-rect 1859 325 1893 359
-rect 1956 366 1990 400
-rect 1755 225 1789 259
-<< locali >>
-rect 0 867 2090 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1682 867
-rect 1716 827 1818 867
-rect 1852 827 1954 867
-rect 1988 827 2090 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 398 81 553
-rect 121 469 155 561
-rect 225 757 259 773
-rect 121 435 191 469
-rect 47 382 123 398
-rect 47 348 89 382
-rect 89 332 123 348
-rect 157 291 191 435
-rect 225 327 259 629
-rect 311 757 345 773
-rect 397 757 431 827
-rect 397 707 431 723
-rect 483 757 517 773
-rect 345 629 483 655
-rect 311 621 517 629
-rect 311 613 345 621
-rect 483 613 517 621
-rect 587 757 621 827
-rect 587 613 621 629
-rect 745 757 813 773
-rect 325 553 394 563
-rect 937 757 971 827
-rect 937 613 971 629
-rect 1095 757 1163 773
-rect 813 561 816 579
-rect 325 524 428 553
-rect 537 558 571 559
-rect 745 558 816 561
-rect 1095 558 1163 629
-rect 1287 757 1321 827
-rect 1287 579 1321 595
-rect 1373 757 1407 773
-rect 537 524 816 558
-rect 996 524 1163 558
-rect 1477 757 1511 773
-rect 1563 757 1597 827
-rect 1563 707 1597 723
-rect 1649 757 1683 773
-rect 1511 629 1649 654
-rect 1477 620 1683 629
-rect 1477 613 1511 620
-rect 1649 613 1683 620
-rect 1735 757 1769 773
-rect 1373 558 1407 561
-rect 1373 524 1461 558
-rect 325 395 359 524
-rect 442 474 476 490
-rect 537 474 571 524
-rect 476 440 571 474
-rect 714 474 748 490
-rect 309 361 325 395
-rect 359 361 375 395
-rect 225 293 359 327
-rect 313 291 359 293
-rect 121 257 157 259
-rect 191 257 229 259
-rect 121 225 229 257
-rect 263 225 279 259
-rect 121 224 219 225
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 224
-rect 121 115 155 131
-rect 227 165 261 181
-rect 227 61 261 131
-rect 325 171 359 257
-rect 442 274 476 440
-rect 714 439 748 440
-rect 928 474 962 490
-rect 748 405 844 439
-rect 642 365 676 381
-rect 642 315 676 331
-rect 810 291 844 405
-rect 928 291 962 440
-rect 442 240 776 274
-rect 810 241 844 257
-rect 928 241 962 257
-rect 996 291 1030 524
-rect 1160 474 1194 490
-rect 1160 439 1194 440
-rect 996 241 1030 257
-rect 1064 405 1160 439
-rect 1064 291 1098 405
-rect 1144 328 1160 362
-rect 1194 328 1210 362
-rect 1256 359 1290 479
-rect 1359 474 1393 490
-rect 1359 439 1393 440
-rect 1427 362 1461 524
-rect 1256 309 1290 325
-rect 1407 328 1461 362
-rect 1373 325 1461 328
-rect 1502 474 1536 490
-rect 1064 241 1098 257
-rect 742 187 776 240
-rect 1132 207 1166 251
-rect 325 115 359 131
-rect 483 171 517 187
-rect 483 61 517 131
-rect 587 171 621 187
-rect 742 171 813 187
-rect 742 153 745 171
-rect 587 61 621 131
-rect 745 115 813 131
-rect 937 165 971 181
-rect 937 61 971 131
-rect 1095 171 1166 207
-rect 1163 131 1166 171
-rect 1095 115 1166 131
-rect 1287 171 1321 187
-rect 1287 61 1321 131
-rect 1373 171 1407 325
-rect 1502 291 1536 440
-rect 1570 479 1605 552
-rect 1570 388 1604 479
-rect 1570 372 1638 388
-rect 1570 338 1588 372
-rect 1622 338 1638 372
-rect 1735 359 1769 629
-rect 1839 757 1873 773
-rect 1839 513 1873 617
-rect 1925 757 1959 827
-rect 2011 757 2045 773
-rect 1925 601 1959 617
-rect 2010 617 2011 666
-rect 2010 539 2045 617
-rect 2010 521 2068 539
-rect 2011 505 2068 521
-rect 1839 474 1873 479
-rect 1839 440 1990 474
-rect 1956 400 1990 440
-rect 1672 325 1859 359
-rect 1893 325 1909 359
-rect 1672 303 1706 325
-rect 1635 269 1706 303
-rect 1956 291 1990 366
-rect 1373 115 1407 131
-rect 1477 171 1511 187
-rect 1477 61 1511 131
-rect 1635 171 1669 269
-rect 1739 225 1755 259
-rect 1789 225 1805 259
-rect 1839 257 1990 291
-rect 2034 439 2068 505
-rect 1635 115 1669 131
-rect 1733 165 1767 181
-rect 1733 61 1767 131
-rect 1839 171 1873 257
-rect 2034 224 2068 405
-rect 2011 190 2068 224
-rect 1839 115 1873 131
-rect 1925 171 1959 187
-rect 1925 61 1959 131
-rect 2011 171 2045 190
-rect 2011 115 2045 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 1682 861 1716 867
-rect 1682 833 1716 861
-rect 1818 861 1852 867
-rect 1818 833 1852 861
-rect 1954 861 1988 867
-rect 1954 833 1988 861
-rect 47 553 81 587
-rect 394 553 428 587
-rect 157 257 191 291
-rect 325 257 359 291
-rect 714 405 748 439
-rect 642 331 676 365
-rect 910 257 928 291
-rect 928 257 944 291
-rect 996 257 1030 291
-rect 1160 405 1194 439
-rect 1256 479 1290 513
-rect 1160 328 1194 362
-rect 1359 405 1393 439
-rect 1570 552 1605 586
-rect 1373 328 1407 362
-rect 1132 251 1166 285
-rect 1839 479 1873 513
-rect 1859 325 1893 359
-rect 1502 257 1536 291
-rect 1755 259 1789 291
-rect 1755 257 1789 259
-rect 2034 405 2068 439
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 867 2090 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1682 867
-rect 1716 833 1818 867
-rect 1852 833 1954 867
-rect 1988 833 2090 867
-rect 0 827 2090 833
-rect 35 587 93 593
-rect 380 587 439 593
-rect 1558 587 1617 592
-rect 35 553 47 587
-rect 81 553 127 587
-rect 380 553 394 587
-rect 428 586 1617 587
-rect 428 553 1570 586
-rect 35 547 93 553
-rect 380 547 439 553
-rect 1558 552 1570 553
-rect 1605 552 1617 586
-rect 1558 546 1617 552
-rect 1570 529 1605 546
-rect 1244 514 1303 519
-rect 1244 513 1475 514
-rect 1827 513 1885 519
-rect 1244 479 1256 513
-rect 1290 479 1475 513
-rect 1804 479 1839 513
-rect 1873 479 1885 513
-rect 1244 473 1303 479
-rect 1433 478 1475 479
-rect 702 439 760 445
-rect 1148 439 1206 445
-rect 1347 439 1405 445
-rect 702 405 714 439
-rect 748 405 1160 439
-rect 1194 405 1359 439
-rect 1393 405 1405 439
-rect 702 399 760 405
-rect 1148 399 1206 405
-rect 1347 399 1405 405
-rect 630 365 688 371
-rect 630 331 642 365
-rect 676 331 710 365
-rect 1143 362 1210 368
-rect 1367 362 1419 368
-rect 630 325 688 331
-rect 1143 328 1160 362
-rect 1194 328 1373 362
-rect 1407 328 1419 362
-rect 1143 322 1210 328
-rect 1367 322 1419 328
-rect 1447 359 1475 478
-rect 1827 473 1885 479
-rect 2022 439 2080 445
-rect 2022 438 2034 439
-rect 2000 405 2034 438
-rect 2068 405 2080 439
-rect 2000 404 2080 405
-rect 2022 399 2080 404
-rect 1847 359 1905 365
-rect 1447 325 1859 359
-rect 1893 325 1905 359
-rect 1847 319 1905 325
-rect 145 291 203 297
-rect 145 257 157 291
-rect 191 257 203 291
-rect 145 251 203 257
-rect 313 291 371 297
-rect 898 291 956 297
-rect 313 257 325 291
-rect 359 257 910 291
-rect 944 257 956 291
-rect 313 251 371 257
-rect 898 251 956 257
-rect 984 291 1042 297
-rect 1490 291 1548 297
-rect 984 257 996 291
-rect 1030 285 1502 291
-rect 1030 257 1132 285
-rect 984 251 1042 257
-rect 1120 251 1132 257
-rect 1166 257 1502 285
-rect 1536 257 1548 291
-rect 1166 251 1178 257
-rect 1490 251 1548 257
-rect 1743 291 1802 297
-rect 1743 257 1755 291
-rect 1789 257 1802 291
-rect 1743 251 1802 257
-rect 157 217 191 251
-rect 1126 245 1172 251
-rect 1755 217 1789 251
-rect 157 183 1789 217
-rect 0 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel viali 659 348 659 348 1 D
-port 1 n
-rlabel viali 1376 422 1376 422 1 CK
-port 2 n
-rlabel viali 1857 496 1857 496 1 QN
-port 3 n
-rlabel viali 65 570 65 570 1 RN
-port 5 n
-rlabel viali 2051 422 2051 422 1 Q
-rlabel viali 1588 570 1588 570 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__fill_1.mag b/12T_ls/sky130_osu_sc_12T_ls__fill_1.mag
deleted file mode 100644
index f230c46..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__fill_1.mag
+++ /dev/null
@@ -1,24 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095898
-<< 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 485 41 897
-<< locali >>
-rect 0 827 22 888
-rect 0 0 22 61
-<< metal1 >>
-rect 0 827 22 888
-rect 0 0 22 61
-<< labels >>
-rlabel metal1 11 855 11 855 1 vdd
-rlabel metal1 11 28 11 28 1 gnd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__fill_16.mag b/12T_ls/sky130_osu_sc_12T_ls__fill_16.mag
deleted file mode 100644
index 28a847c..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__fill_16.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095907
-<< checkpaint >>
-rect -1269 2461 1615 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1615 -1129
-<< nwell >>
-rect -9 485 355 897
-<< locali >>
-rect 0 827 352 888
-rect 0 0 352 61
-<< metal1 >>
-rect 0 827 352 888
-rect 0 0 352 61
-<< labels >>
-rlabel metal1 199 856 199 856 1 vdd
-rlabel metal1 196 30 196 30 1 gnd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__fill_2.mag b/12T_ls/sky130_osu_sc_12T_ls__fill_2.mag
deleted file mode 100644
index fbe08cb..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__fill_2.mag
+++ /dev/null
@@ -1,24 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095901
-<< 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 485 50 897
-<< locali >>
-rect 0 827 44 888
-rect 0 0 44 61
-<< metal1 >>
-rect 0 827 44 888
-rect 0 0 44 61
-<< labels >>
-rlabel metal1 22 856 22 856 1 vdd
-rlabel metal1 23 28 23 28 1 gnd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__fill_32.mag b/12T_ls/sky130_osu_sc_12T_ls__fill_32.mag
deleted file mode 100644
index c15fb7b..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__fill_32.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095910
-<< checkpaint >>
-rect -1269 2461 1967 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1967 -1129
-<< nwell >>
-rect -9 485 707 897
-<< locali >>
-rect 0 827 704 888
-rect 0 0 704 61
-<< metal1 >>
-rect 0 827 704 888
-rect 0 0 704 61
-<< labels >>
-rlabel metal1 374 854 374 854 1 vdd
-rlabel metal1 363 26 363 26 1 gnd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__fill_4.mag b/12T_ls/sky130_osu_sc_12T_ls__fill_4.mag
deleted file mode 100644
index 994a525..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__fill_4.mag
+++ /dev/null
@@ -1,22 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095903
-<< 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 485 96 897
-<< locali >>
-rect 0 827 88 888
-rect 0 0 88 61
-<< metal1 >>
-rect 0 827 88 888
-rect 0 0 88 61
-<< labels >>
-rlabel metal1 72 857 72 857 1 vdd
-rlabel metal1 71 28 71 28 1 gnd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__fill_8.mag b/12T_ls/sky130_osu_sc_12T_ls__fill_8.mag
deleted file mode 100644
index f77ad65..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__fill_8.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095905
-<< checkpaint >>
-rect -1269 2461 1439 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1439 -1129
-<< nwell >>
-rect -9 485 179 897
-<< locali >>
-rect 0 827 176 888
-rect 0 0 176 61
-<< metal1 >>
-rect 0 827 176 888
-rect 0 0 176 61
-<< labels >>
-rlabel metal1 111 859 111 859 1 vdd
-rlabel metal1 112 28 112 28 1 gnd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__inv_1.mag b/12T_ls/sky130_osu_sc_12T_ls__inv_1.mag
deleted file mode 100644
index 74c771f..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__inv_1.mag
+++ /dev/null
@@ -1,115 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864420
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 485 199 897
-<< nmos >>
-rect 80 115 110 219
-<< pmoshvt >>
-rect 80 521 110 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 398 110 521
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 219 110 332
-rect 80 89 110 115
-<< polycont >>
-rect 90 348 124 382
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 121 183 155 217
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 167 513
-rect 109 473 167 479
-rect 121 223 155 473
-rect 109 217 167 223
-rect 109 183 121 217
-rect 155 183 167 217
-rect 109 177 167 183
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 151 345 151 345 1 Y
-port 1 n
-rlabel viali 64 570 64 570 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__inv_10.mag b/12T_ls/sky130_osu_sc_12T_ls__inv_10.mag
deleted file mode 100644
index ed4cc3b..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__inv_10.mag
+++ /dev/null
@@ -1,420 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864420
-<< checkpaint >>
-rect -1269 2461 2250 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2250 -1129
-<< nwell >>
-rect -9 485 990 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-rect 596 115 626 219
-rect 682 115 712 219
-rect 768 115 798 219
-rect 854 115 884 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-rect 768 521 798 773
-rect 854 521 884 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 219
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 219
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 768 219
-rect 712 131 723 171
-rect 757 131 768 171
-rect 712 115 768 131
-rect 798 171 854 219
-rect 798 131 809 171
-rect 843 131 854 171
-rect 798 115 854 131
-rect 884 171 937 219
-rect 884 131 895 171
-rect 929 131 937 171
-rect 884 115 937 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 768 773
-rect 712 561 723 757
-rect 757 561 768 757
-rect 712 521 768 561
-rect 798 757 854 773
-rect 798 561 809 757
-rect 843 561 854 757
-rect 798 521 854 561
-rect 884 757 937 773
-rect 884 561 895 757
-rect 929 561 937 757
-rect 884 521 937 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-rect 809 131 843 171
-rect 895 131 929 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-rect 809 561 843 757
-rect 895 561 929 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 799
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 768 773 798 799
-rect 854 773 884 799
-rect 80 496 110 521
-rect 166 496 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 596 496 626 521
-rect 682 496 712 521
-rect 768 496 798 521
-rect 854 496 884 521
-rect 80 466 884 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 424 274 454 466
-rect 80 244 884 274
-rect 80 219 110 244
-rect 166 219 196 244
-rect 252 219 282 244
-rect 338 219 368 244
-rect 424 219 454 244
-rect 510 219 540 244
-rect 596 219 626 244
-rect 682 219 712 244
-rect 768 219 798 244
-rect 854 219 884 244
-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 348 124 382
-<< locali >>
-rect 0 867 990 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 990 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 293 757 327 773
-rect 293 513 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 513 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 637 757 671 773
-rect 637 513 671 561
-rect 723 757 757 827
-rect 723 545 757 561
-rect 809 757 843 773
-rect 809 513 843 561
-rect 895 757 929 827
-rect 895 545 929 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 637 171 671 183
-rect 637 115 671 131
-rect 723 171 757 187
-rect 723 61 757 131
-rect 809 171 843 183
-rect 809 115 843 131
-rect 895 171 929 187
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 293 479 327 513
-rect 465 479 499 513
-rect 637 479 671 513
-rect 809 479 843 513
-rect 121 183 155 217
-rect 293 183 327 217
-rect 465 183 499 217
-rect 637 183 671 217
-rect 809 183 843 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 867 990 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 990 867
-rect 0 827 990 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 281 513 339 519
-rect 453 513 511 519
-rect 625 513 683 519
-rect 797 513 855 519
-rect 109 479 121 513
-rect 155 479 293 513
-rect 327 479 465 513
-rect 499 479 637 513
-rect 671 479 809 513
-rect 843 479 855 513
-rect 109 473 167 479
-rect 281 473 339 479
-rect 453 473 511 479
-rect 625 473 683 479
-rect 797 473 855 479
-rect 121 223 155 473
-rect 293 223 327 473
-rect 465 223 499 473
-rect 637 223 671 473
-rect 809 223 843 473
-rect 109 217 167 223
-rect 281 217 339 223
-rect 453 217 511 223
-rect 625 217 683 223
-rect 797 217 855 223
-rect 109 183 121 217
-rect 155 183 293 217
-rect 327 183 465 217
-rect 499 183 637 217
-rect 671 183 809 217
-rect 843 183 855 217
-rect 109 177 167 183
-rect 281 177 339 183
-rect 453 177 511 183
-rect 625 177 683 183
-rect 797 177 855 183
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 152 344 152 344 1 Y
-port 1 n
-rlabel viali 64 569 64 569 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__inv_2.mag b/12T_ls/sky130_osu_sc_12T_ls__inv_2.mag
deleted file mode 100644
index 1539148..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__inv_2.mag
+++ /dev/null
@@ -1,153 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864420
-<< checkpaint >>
-rect -1269 2461 1547 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1547 -1129
-<< nwell >>
-rect -9 485 287 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 249 219
-rect 196 131 207 171
-rect 241 131 249 171
-rect 196 115 249 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 249 773
-rect 196 561 207 757
-rect 241 561 249 757
-rect 196 521 249 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 800
-rect 80 496 110 521
-rect 166 496 196 521
-rect 80 466 196 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 80 244 196 274
-rect 80 219 110 244
-rect 166 219 196 244
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 90 348 124 382
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 121 183 155 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 167 513
-rect 109 473 167 479
-rect 121 223 155 473
-rect 109 217 167 223
-rect 109 183 121 217
-rect 155 183 167 217
-rect 109 177 167 183
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 152 344 152 344 1 Y
-port 1 n
-rlabel viali 64 569 64 569 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__inv_3.mag b/12T_ls/sky130_osu_sc_12T_ls__inv_3.mag
deleted file mode 100644
index 6776742..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__inv_3.mag
+++ /dev/null
@@ -1,182 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864420
-<< checkpaint >>
-rect -1269 2461 1635 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1635 -1129
-<< nwell >>
-rect -9 485 375 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 335 219
-rect 282 131 293 171
-rect 327 131 335 171
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 335 773
-rect 282 561 293 757
-rect 327 561 335 757
-rect 282 521 335 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 496 110 521
-rect 166 496 196 521
-rect 252 496 282 521
-rect 80 466 282 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 80 244 282 274
-rect 80 219 110 244
-rect 166 219 196 244
-rect 252 219 282 244
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 90 348 124 382
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 293 757 327 773
-rect 293 513 327 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 293 479 327 513
-rect 121 183 155 217
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 281 513 339 519
-rect 109 479 121 513
-rect 155 479 293 513
-rect 327 479 339 513
-rect 109 473 167 479
-rect 281 473 339 479
-rect 121 223 155 473
-rect 293 223 327 473
-rect 109 217 167 223
-rect 281 217 339 223
-rect 109 183 121 217
-rect 155 183 293 217
-rect 327 183 339 217
-rect 109 177 167 183
-rect 281 177 339 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 152 344 152 344 1 Y
-port 1 n
-rlabel viali 64 569 64 569 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__inv_4.mag b/12T_ls/sky130_osu_sc_12T_ls__inv_4.mag
deleted file mode 100644
index 95528d6..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__inv_4.mag
+++ /dev/null
@@ -1,216 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864421
-<< checkpaint >>
-rect -1269 2461 1723 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1723 -1129
-<< nwell >>
-rect -9 485 463 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 421 219
-rect 368 131 379 171
-rect 413 131 421 171
-rect 368 115 421 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 421 773
-rect 368 561 379 757
-rect 413 561 421 757
-rect 368 521 421 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 799
-rect 80 496 110 521
-rect 166 496 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 80 466 368 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 80 244 368 274
-rect 80 219 110 244
-rect 166 219 196 244
-rect 252 219 282 244
-rect 338 219 368 244
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 90 348 124 382
-<< locali >>
-rect 0 867 462 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 462 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 293 757 327 773
-rect 293 513 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 293 479 327 513
-rect 121 183 155 217
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 462 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 462 867
-rect 0 827 462 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 281 513 339 519
-rect 109 479 121 513
-rect 155 479 293 513
-rect 327 479 339 513
-rect 109 473 167 479
-rect 281 473 339 479
-rect 121 223 155 473
-rect 293 223 327 473
-rect 109 217 167 223
-rect 281 217 339 223
-rect 109 183 121 217
-rect 155 183 293 217
-rect 327 183 339 217
-rect 109 177 167 183
-rect 281 177 339 183
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 64 569 64 569 1 A
-port 1 n
-rlabel metal1 152 344 152 344 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__inv_6.mag b/12T_ls/sky130_osu_sc_12T_ls__inv_6.mag
deleted file mode 100644
index 81851e8..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__inv_6.mag
+++ /dev/null
@@ -1,280 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864421
-<< checkpaint >>
-rect -1269 2461 1899 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1899 -1129
-<< nwell >>
-rect -9 485 639 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 593 219
-rect 540 131 551 171
-rect 585 131 593 171
-rect 540 115 593 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 593 773
-rect 540 561 551 757
-rect 585 561 593 757
-rect 540 521 593 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 799
-rect 424 773 454 799
-rect 510 773 540 799
-rect 80 496 110 521
-rect 166 496 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 80 466 540 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 424 274 454 466
-rect 80 244 540 274
-rect 80 219 110 244
-rect 166 219 196 244
-rect 252 219 282 244
-rect 338 219 368 244
-rect 424 219 454 244
-rect 510 219 540 244
-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 348 124 382
-<< locali >>
-rect 0 867 638 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 638 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 293 757 327 773
-rect 293 513 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 513 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 293 479 327 513
-rect 465 479 499 513
-rect 121 183 155 217
-rect 293 183 327 217
-rect 465 183 499 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 638 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 638 867
-rect 0 827 638 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 281 513 339 519
-rect 453 513 511 519
-rect 109 479 121 513
-rect 155 479 293 513
-rect 327 479 465 513
-rect 499 479 511 513
-rect 109 473 167 479
-rect 281 473 339 479
-rect 453 473 511 479
-rect 121 223 155 473
-rect 293 223 327 473
-rect 465 223 499 473
-rect 109 217 167 223
-rect 281 217 339 223
-rect 453 217 511 223
-rect 109 183 121 217
-rect 155 183 293 217
-rect 327 183 465 217
-rect 499 183 511 217
-rect 109 177 167 183
-rect 281 177 339 183
-rect 453 177 511 183
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 64 569 64 569 1 A
-port 1 n
-rlabel metal1 152 344 152 344 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__inv_8.mag b/12T_ls/sky130_osu_sc_12T_ls__inv_8.mag
deleted file mode 100644
index 30e1b56..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__inv_8.mag
+++ /dev/null
@@ -1,343 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864421
-<< checkpaint >>
-rect -1269 2461 2074 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2074 -1129
-<< nwell >>
-rect -9 485 814 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-rect 596 115 626 219
-rect 682 115 712 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 219
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 219
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 765 219
-rect 712 131 723 171
-rect 757 131 765 171
-rect 712 115 765 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 765 773
-rect 712 561 723 757
-rect 757 561 765 757
-rect 712 521 765 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 799
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 80 496 110 521
-rect 166 496 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 596 496 626 521
-rect 682 496 712 521
-rect 80 466 712 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 424 274 454 466
-rect 80 244 712 274
-rect 80 219 110 244
-rect 166 219 196 244
-rect 252 219 282 244
-rect 338 219 368 244
-rect 424 219 454 244
-rect 510 219 540 244
-rect 596 219 626 244
-rect 682 219 712 244
-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 348 124 382
-<< locali >>
-rect 0 867 814 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 814 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 293 757 327 773
-rect 293 513 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 513 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 637 757 671 773
-rect 637 513 671 561
-rect 723 757 757 827
-rect 723 545 757 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 637 171 671 183
-rect 637 115 671 131
-rect 723 171 757 187
-rect 723 61 757 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 814 61
-rect 0 0 814 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 293 479 327 513
-rect 465 479 499 513
-rect 637 479 671 513
-rect 121 183 155 217
-rect 293 183 327 217
-rect 465 183 499 217
-rect 637 183 671 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-<< metal1 >>
-rect 0 867 814 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 814 867
-rect 0 827 814 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 281 513 339 519
-rect 453 513 511 519
-rect 625 513 683 519
-rect 109 479 121 513
-rect 155 479 293 513
-rect 327 479 465 513
-rect 499 479 637 513
-rect 671 479 683 513
-rect 109 473 167 479
-rect 281 473 339 479
-rect 453 473 511 479
-rect 625 473 683 479
-rect 121 223 155 473
-rect 293 223 327 473
-rect 465 223 499 473
-rect 637 223 671 473
-rect 109 217 167 223
-rect 281 217 339 223
-rect 453 217 511 223
-rect 625 217 683 223
-rect 109 183 121 217
-rect 155 183 293 217
-rect 327 183 465 217
-rect 499 183 637 217
-rect 671 183 683 217
-rect 109 177 167 183
-rect 281 177 339 183
-rect 453 177 511 183
-rect 625 177 683 183
-rect 0 55 814 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 814 55
-rect 0 0 814 21
-<< labels >>
-rlabel metal1 152 344 152 344 1 Y
-port 1 n
-rlabel viali 64 569 64 569 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__inv_l.mag b/12T_ls/sky130_osu_sc_12T_ls__inv_l.mag
deleted file mode 100644
index 752c86e..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__inv_l.mag
+++ /dev/null
@@ -1,113 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864421
-<< checkpaint >>
-rect -1209 -1243 1345 2129
-<< nwell >>
-rect -9 485 199 895
-<< nmos >>
-rect 80 115 110 187
-<< pmoshvt >>
-rect 80 603 110 771
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 163 187
-rect 110 131 121 165
-rect 155 131 163 165
-rect 110 115 163 131
-<< pdiff >>
-rect 27 755 80 771
-rect 27 687 35 755
-rect 69 687 80 755
-rect 27 603 80 687
-rect 110 755 163 771
-rect 110 687 121 755
-rect 155 687 163 755
-rect 110 603 163 687
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-<< pdiffc >>
-rect 35 687 69 755
-rect 121 687 155 755
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 825 51 859
-rect 85 825 109 859
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 825 85 859
-<< poly >>
-rect 80 771 110 797
-rect 80 398 110 603
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 187 110 332
-rect 80 89 110 115
-<< polycont >>
-rect 90 348 124 382
-<< locali >>
-rect 0 865 198 886
-rect 0 825 51 865
-rect 85 825 198 865
-rect 35 755 69 825
-rect 35 671 69 687
-rect 121 755 155 771
-rect 47 382 81 553
-rect 121 513 155 687
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 165 69 181
-rect 35 61 69 131
-rect 121 165 155 257
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 859 85 865
-rect 51 831 85 859
-rect 47 553 81 587
-rect 121 479 155 513
-rect 121 257 155 291
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 865 198 886
-rect 0 831 51 865
-rect 85 831 198 865
-rect 0 825 198 831
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 167 513
-rect 109 473 167 479
-rect 121 297 155 473
-rect 109 291 167 297
-rect 109 257 121 291
-rect 155 257 167 291
-rect 109 251 167 257
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 570 64 570 1 A
-port 1 n
-rlabel metal1 151 345 151 345 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 838 68 838 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__mux2_1.mag b/12T_ls/sky130_osu_sc_12T_ls__mux2_1.mag
deleted file mode 100644
index 114b6bb..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__mux2_1.mag
+++ /dev/null
@@ -1,227 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864421
-<< checkpaint >>
-rect -1269 2461 1813 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1813 -1129
-<< nwell >>
-rect -9 485 553 897
-<< nmos >>
-rect 80 115 110 219
-rect 270 115 300 219
-rect 356 115 386 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 270 521 300 773
-rect 356 521 386 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-rect 217 171 270 219
-rect 217 131 225 171
-rect 259 131 270 171
-rect 217 115 270 131
-rect 300 171 356 219
-rect 300 131 311 171
-rect 345 131 356 171
-rect 300 115 356 131
-rect 386 171 439 219
-rect 386 131 397 171
-rect 431 131 439 171
-rect 386 115 439 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-rect 217 757 270 773
-rect 217 561 225 757
-rect 259 561 270 757
-rect 217 521 270 561
-rect 300 757 356 773
-rect 300 561 311 757
-rect 345 561 356 757
-rect 300 521 356 561
-rect 386 757 439 773
-rect 386 561 397 757
-rect 431 561 439 757
-rect 386 521 439 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 225 131 259 171
-rect 311 131 345 171
-rect 397 131 431 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 225 561 259 757
-rect 311 561 345 757
-rect 397 561 431 757
-<< 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 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 459 827 493 861
-<< poly >>
-rect 80 788 300 818
-rect 80 773 110 788
-rect 270 773 300 788
-rect 356 773 386 799
-rect 80 398 110 521
-rect 270 495 300 521
-rect 152 459 218 469
-rect 152 425 168 459
-rect 202 445 218 459
-rect 356 445 386 521
-rect 202 425 386 445
-rect 152 415 386 425
-rect 27 382 110 398
-rect 27 348 37 382
-rect 71 373 110 382
-rect 71 348 386 373
-rect 27 343 386 348
-rect 27 332 110 343
-rect 80 219 110 332
-rect 152 291 218 301
-rect 152 257 168 291
-rect 202 277 218 291
-rect 202 257 300 277
-rect 152 247 300 257
-rect 270 219 300 247
-rect 356 219 386 343
-rect 80 89 110 115
-rect 270 89 300 115
-rect 356 89 386 115
-<< polycont >>
-rect 168 425 202 459
-rect 37 348 71 382
-rect 168 257 202 291
-<< locali >>
-rect 0 867 550 888
-rect 0 827 459 867
-rect 493 827 550 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 37 382 71 553
-rect 37 332 71 348
-rect 121 475 155 561
-rect 225 757 259 773
-rect 311 757 345 773
-rect 225 527 270 561
-rect 236 513 270 527
-rect 121 459 202 475
-rect 121 425 168 459
-rect 121 409 202 425
-rect 121 307 155 409
-rect 121 291 202 307
-rect 121 257 168 291
-rect 121 241 202 257
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 241
-rect 236 205 270 479
-rect 311 365 345 561
-rect 397 757 431 773
-rect 397 439 431 561
-rect 121 115 155 131
-rect 225 171 270 205
-rect 311 171 345 183
-rect 225 115 259 131
-rect 311 115 345 131
-rect 397 171 431 405
-rect 397 115 431 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 459 861 493 867
-rect 459 833 493 861
-rect 37 553 71 587
-rect 236 479 270 513
-rect 311 331 345 365
-rect 397 405 431 439
-rect 311 183 345 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 550 888
-rect 0 833 459 867
-rect 493 833 550 867
-rect 0 827 550 833
-rect 25 587 83 593
-rect 25 553 37 587
-rect 71 553 117 587
-rect 25 547 83 553
-rect 224 513 282 519
-rect 190 479 236 513
-rect 270 479 282 513
-rect 224 473 282 479
-rect 385 439 443 445
-rect 351 405 397 439
-rect 431 405 443 439
-rect 385 399 443 405
-rect 299 365 357 371
-rect 299 331 311 365
-rect 345 331 357 365
-rect 299 325 357 331
-rect 311 223 345 325
-rect 299 217 357 223
-rect 299 183 311 217
-rect 345 183 357 217
-rect 299 177 357 183
-rect 0 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel viali 54 570 54 570 1 S0
-port 1 n
-rlabel viali 328 348 328 348 1 Y
-port 2 n
-rlabel viali 253 496 253 496 1 A0
-port 3 n
-rlabel viali 414 422 414 422 1 A1
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 476 840 476 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__nand2_1.mag b/12T_ls/sky130_osu_sc_12T_ls__nand2_1.mag
deleted file mode 100644
index bb25372..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__nand2_1.mag
+++ /dev/null
@@ -1,157 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864422
-<< checkpaint >>
-rect -1269 2461 1546 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1546 -1129
-<< nwell >>
-rect -9 485 286 897
-<< nmos >>
-rect 80 115 110 219
-rect 152 115 182 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 219
-rect 182 171 235 219
-rect 182 131 193 171
-rect 227 131 235 171
-rect 182 115 235 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 249 773
-rect 196 629 207 757
-rect 241 629 249 757
-rect 196 521 249 629
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 629 241 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 80 474 110 521
-rect 37 458 110 474
-rect 37 424 47 458
-rect 81 424 110 458
-rect 37 408 110 424
-rect 80 219 110 408
-rect 166 381 196 521
-rect 152 365 210 381
-rect 152 331 166 365
-rect 200 331 210 365
-rect 152 315 210 331
-rect 152 219 182 315
-rect 80 89 110 115
-rect 152 89 182 115
-<< polycont >>
-rect 47 424 81 458
-rect 166 331 200 365
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 458 81 553
-rect 47 408 81 424
-rect 207 757 241 827
-rect 207 613 241 629
-rect 121 439 155 561
-rect 195 365 229 479
-rect 150 331 166 365
-rect 200 331 229 365
-rect 35 171 69 183
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 47 553 81 587
-rect 121 405 155 439
-rect 195 479 229 513
-rect 35 183 69 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 115 587
-rect 35 547 93 553
-rect 183 513 241 519
-rect 161 479 195 513
-rect 229 479 241 513
-rect 183 473 241 479
-rect 109 439 167 445
-rect 109 405 121 439
-rect 155 405 167 439
-rect 109 399 167 405
-rect 23 217 81 223
-rect 121 217 155 399
-rect 23 183 35 217
-rect 69 183 155 217
-rect 23 177 81 183
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 374 136 374 1 Y
-port 1 n
-rlabel viali 64 570 64 570 1 A
-port 2 n
-rlabel viali 212 496 212 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__nand2_l.mag b/12T_ls/sky130_osu_sc_12T_ls__nand2_l.mag
deleted file mode 100644
index 75beda2..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__nand2_l.mag
+++ /dev/null
@@ -1,154 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864422
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 286 897
-<< nmos >>
-rect 80 115 110 187
-rect 152 115 182 187
-<< pmoshvt >>
-rect 80 605 110 773
-rect 166 605 196 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 115 152 187
-rect 182 165 235 187
-rect 182 131 193 165
-rect 227 131 235 165
-rect 182 115 235 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 689 35 757
-rect 69 689 80 757
-rect 27 605 80 689
-rect 110 757 166 773
-rect 110 689 121 757
-rect 155 689 166 757
-rect 110 605 166 689
-rect 196 757 249 773
-rect 196 689 207 757
-rect 241 689 249 757
-rect 196 605 249 689
-<< ndiffc >>
-rect 35 131 69 165
-rect 193 131 227 165
-<< pdiffc >>
-rect 35 689 69 757
-rect 121 689 155 757
-rect 207 689 241 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 80 548 110 605
-rect 37 532 110 548
-rect 37 498 47 532
-rect 81 498 110 532
-rect 37 482 110 498
-rect 80 187 110 482
-rect 166 398 196 605
-rect 152 382 210 398
-rect 152 348 166 382
-rect 200 348 210 382
-rect 152 332 210 348
-rect 152 187 182 332
-rect 80 89 110 115
-rect 152 89 182 115
-<< polycont >>
-rect 47 498 81 532
-rect 166 348 200 382
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 827
-rect 35 673 69 689
-rect 121 757 155 773
-rect 47 532 81 553
-rect 47 482 81 498
-rect 121 513 155 689
-rect 207 757 241 827
-rect 207 673 241 689
-rect 195 382 229 553
-rect 150 348 166 382
-rect 200 348 229 382
-rect 35 165 69 257
-rect 35 115 69 131
-rect 193 165 227 181
-rect 193 61 227 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 195 553 229 587
-rect 35 257 69 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 35 587 93 593
-rect 183 587 241 593
-rect 35 553 47 587
-rect 81 553 115 587
-rect 161 553 195 587
-rect 229 553 241 587
-rect 35 547 93 553
-rect 183 547 241 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 167 513
-rect 109 473 167 479
-rect 23 291 81 297
-rect 121 291 155 473
-rect 23 257 35 291
-rect 69 257 155 291
-rect 23 251 81 257
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 448 136 448 1 Y
-port 1 n
-rlabel viali 212 570 212 570 1 B
-port 2 n
-rlabel viali 64 570 64 570 1 A
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__nor2_1.mag b/12T_ls/sky130_osu_sc_12T_ls__nor2_1.mag
deleted file mode 100644
index 092df54..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__nor2_1.mag
+++ /dev/null
@@ -1,157 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864422
-<< checkpaint >>
-rect -1269 2461 1546 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1546 -1129
-<< nwell >>
-rect -9 485 286 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 152 521 182 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 249 219
-rect 196 131 207 171
-rect 241 131 249 171
-rect 196 115 249 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 521 152 773
-rect 182 757 235 773
-rect 182 697 193 757
-rect 227 697 235 757
-rect 182 521 235 697
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 193 697 227 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 152 773 182 799
-rect 80 355 110 521
-rect 152 488 182 521
-rect 152 472 225 488
-rect 152 438 181 472
-rect 215 438 225 472
-rect 152 422 225 438
-rect 56 339 110 355
-rect 56 305 66 339
-rect 100 305 110 339
-rect 56 289 110 305
-rect 80 219 110 289
-rect 166 219 196 422
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 181 438 215 472
-rect 66 305 100 339
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 773
-rect 193 757 227 827
-rect 193 681 227 697
-rect 35 439 69 561
-rect 113 339 147 479
-rect 181 472 215 553
-rect 181 422 215 438
-rect 50 305 66 339
-rect 100 305 147 339
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 181 553 215 587
-rect 35 405 69 439
-rect 113 479 147 513
-rect 121 183 155 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 169 587 227 593
-rect 148 553 181 587
-rect 215 553 227 587
-rect 169 547 227 553
-rect 101 513 159 519
-rect 79 479 113 513
-rect 147 479 159 513
-rect 101 473 159 479
-rect 23 439 81 445
-rect 23 405 35 439
-rect 69 405 155 439
-rect 23 399 81 405
-rect 121 223 155 405
-rect 109 217 167 223
-rect 109 183 121 217
-rect 155 183 167 217
-rect 109 177 167 183
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 137 297 137 297 1 Y
-port 1 n
-rlabel viali 130 496 130 496 1 B
-port 2 n
-rlabel viali 198 570 198 570 1 A
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__nor2_l.mag b/12T_ls/sky130_osu_sc_12T_ls__nor2_l.mag
deleted file mode 100644
index 3bc8eb9..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__nor2_l.mag
+++ /dev/null
@@ -1,154 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864422
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 286 897
-<< nmos >>
-rect 80 115 110 187
-rect 166 115 196 187
-<< pmoshvt >>
-rect 80 605 110 773
-rect 152 605 182 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 166 187
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 165 249 187
-rect 196 131 207 165
-rect 241 131 249 165
-rect 196 115 249 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 605 80 621
-rect 110 605 152 773
-rect 182 757 235 773
-rect 182 621 193 757
-rect 227 621 235 757
-rect 182 605 235 621
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-rect 207 131 241 165
-<< pdiffc >>
-rect 35 621 69 757
-rect 193 621 227 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 152 773 182 799
-rect 80 429 110 605
-rect 152 562 182 605
-rect 152 546 225 562
-rect 152 512 181 546
-rect 215 512 225 546
-rect 152 496 225 512
-rect 56 413 110 429
-rect 56 379 66 413
-rect 100 379 110 413
-rect 56 363 110 379
-rect 80 187 110 363
-rect 166 187 196 496
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 181 512 215 546
-rect 66 379 100 413
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 773
-rect 35 513 69 621
-rect 193 757 227 827
-rect 193 605 227 621
-rect 113 413 147 553
-rect 181 546 215 562
-rect 50 379 66 413
-rect 100 379 147 413
-rect 35 165 69 181
-rect 35 61 69 131
-rect 121 165 155 257
-rect 121 115 155 131
-rect 207 165 241 181
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 35 479 69 513
-rect 113 553 147 587
-rect 181 512 215 513
-rect 181 479 215 512
-rect 121 257 155 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 101 587 159 593
-rect 79 553 113 587
-rect 147 553 159 587
-rect 101 547 159 553
-rect 23 513 81 519
-rect 168 513 227 519
-rect 23 479 35 513
-rect 69 479 81 513
-rect 146 479 181 513
-rect 215 479 227 513
-rect 23 473 81 479
-rect 168 473 227 479
-rect 34 291 69 473
-rect 109 291 167 297
-rect 34 257 121 291
-rect 155 257 167 291
-rect 34 256 167 257
-rect 109 251 167 256
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel viali 130 570 130 570 1 B
-port 3 n
-rlabel metal1 48 337 48 337 1 Y
-rlabel viali 198 496 198 496 1 A
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__oai21_l.mag b/12T_ls/sky130_osu_sc_12T_ls__oai21_l.mag
deleted file mode 100644
index 07a47e1..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__oai21_l.mag
+++ /dev/null
@@ -1,194 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864422
-<< checkpaint >>
-rect -1209 -1244 1481 2131
-<< nwell >>
-rect -9 485 374 897
-<< nmos >>
-rect 80 114 110 218
-rect 166 114 196 218
-rect 252 114 282 218
-<< pmoshvt >>
-rect 80 521 110 773
-rect 152 521 182 773
-rect 250 605 280 773
-<< ndiff >>
-rect 27 170 80 218
-rect 27 130 35 170
-rect 69 130 80 170
-rect 27 114 80 130
-rect 110 164 166 218
-rect 110 130 121 164
-rect 155 130 166 164
-rect 110 114 166 130
-rect 196 170 252 218
-rect 196 130 207 170
-rect 241 130 252 170
-rect 196 114 252 130
-rect 282 189 335 218
-rect 282 130 293 189
-rect 327 130 335 189
-rect 282 114 335 130
-<< pdiff >>
-rect 27 757 80 773
-rect 27 696 35 757
-rect 69 696 80 757
-rect 27 521 80 696
-rect 110 521 152 773
-rect 182 757 250 773
-rect 182 705 193 757
-rect 227 705 250 757
-rect 182 605 250 705
-rect 280 757 333 773
-rect 280 621 291 757
-rect 325 621 333 757
-rect 280 605 333 621
-rect 182 521 235 605
-<< ndiffc >>
-rect 35 130 69 170
-rect 121 130 155 164
-rect 207 130 241 170
-rect 293 130 327 189
-<< pdiffc >>
-rect 35 696 69 757
-rect 193 705 227 757
-rect 291 621 325 757
-<< psubdiff >>
-rect 27 26 51 60
-rect 85 26 109 60
-rect 163 26 187 60
-rect 221 26 245 60
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 266 861
-<< psubdiffcont >>
-rect 51 26 85 60
-rect 187 26 221 60
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 152 773 182 799
-rect 250 773 280 799
-rect 80 489 110 521
-rect 56 473 110 489
-rect 56 439 66 473
-rect 100 439 110 473
-rect 56 423 110 439
-rect 56 274 86 423
-rect 152 375 182 521
-rect 136 365 202 375
-rect 136 331 152 365
-rect 186 331 202 365
-rect 136 321 202 331
-rect 250 333 280 605
-rect 56 243 110 274
-rect 80 218 110 243
-rect 166 218 196 321
-rect 250 317 306 333
-rect 252 283 262 317
-rect 296 283 306 317
-rect 252 267 306 283
-rect 252 218 282 267
-rect 80 88 110 114
-rect 166 88 196 114
-rect 252 88 282 114
-<< polycont >>
-rect 66 439 100 473
-rect 152 331 186 365
-rect 262 283 296 317
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 35 655 69 696
-rect 193 757 227 827
-rect 193 689 227 705
-rect 291 757 325 773
-rect 35 621 291 655
-rect 66 473 100 553
-rect 291 513 325 621
-rect 66 423 100 439
-rect 152 479 162 513
-rect 152 365 186 479
-rect 152 315 186 331
-rect 223 317 257 405
-rect 223 283 262 317
-rect 296 283 312 317
-rect 35 214 241 248
-rect 35 170 69 214
-rect 35 114 69 130
-rect 121 164 155 180
-rect 121 60 155 130
-rect 207 170 241 214
-rect 207 114 241 130
-rect 293 114 327 130
-rect 0 20 51 60
-rect 85 20 187 60
-rect 221 20 374 60
-rect 0 0 374 20
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 66 553 100 587
-rect 162 479 196 513
-rect 291 479 325 513
-rect 223 405 257 439
-rect 293 189 327 217
-rect 293 183 327 189
-rect 51 26 85 54
-rect 51 20 85 26
-rect 187 26 221 54
-rect 187 20 221 26
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 54 587 112 593
-rect 54 553 66 587
-rect 100 553 134 587
-rect 54 547 112 553
-rect 150 513 208 519
-rect 279 513 338 519
-rect 150 479 162 513
-rect 196 479 230 513
-rect 279 479 291 513
-rect 325 479 338 513
-rect 150 473 208 479
-rect 279 473 338 479
-rect 211 439 269 445
-rect 189 405 223 439
-rect 257 405 269 439
-rect 211 399 269 405
-rect 297 224 327 473
-rect 281 217 339 224
-rect 281 183 293 217
-rect 327 183 339 217
-rect 281 177 339 183
-rect 0 54 374 60
-rect 0 20 51 54
-rect 85 20 187 54
-rect 221 20 374 54
-rect 0 0 374 20
-<< labels >>
-rlabel viali 83 570 83 570 1 A0
-port 1 n
-rlabel viali 179 496 179 496 1 A1
-port 2 n
-rlabel viali 240 422 240 422 1 B0
-port 4 n
-rlabel viali 308 496 308 496 1 Y
-rlabel viali 68 47 68 47 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__oai22_l.mag b/12T_ls/sky130_osu_sc_12T_ls__oai22_l.mag
deleted file mode 100644
index b0ae9cd..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__oai22_l.mag
+++ /dev/null
@@ -1,234 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864423
-<< checkpaint >>
-rect -1209 -1243 1617 2131
-<< nwell >>
-rect -9 483 462 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 152 521 182 773
-rect 252 521 282 773
-rect 324 521 354 773
-<< ndiff >>
-rect 27 199 80 219
-rect 27 131 35 199
-rect 69 131 80 199
-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 199 252 219
-rect 196 131 207 199
-rect 241 131 252 199
-rect 196 115 252 131
-rect 282 211 338 219
-rect 282 177 293 211
-rect 327 177 338 211
-rect 282 115 338 177
-rect 368 165 421 219
-rect 368 131 379 165
-rect 413 131 421 165
-rect 368 115 421 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 651 35 757
-rect 69 651 80 757
-rect 27 521 80 651
-rect 110 521 152 773
-rect 182 757 252 773
-rect 182 583 200 757
-rect 234 583 252 757
-rect 182 521 252 583
-rect 282 521 324 773
-rect 354 757 407 773
-rect 354 651 365 757
-rect 399 651 407 757
-rect 354 521 407 651
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 165
-rect 207 131 241 199
-rect 293 177 327 211
-rect 379 131 413 165
-<< pdiffc >>
-rect 35 651 69 757
-rect 200 583 234 757
-rect 365 651 399 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 152 773 182 799
-rect 252 773 282 799
-rect 324 773 354 799
-rect 80 489 110 521
-rect 42 472 110 489
-rect 42 438 52 472
-rect 86 459 110 472
-rect 86 438 96 459
-rect 42 417 96 438
-rect 52 277 86 417
-rect 152 375 182 521
-rect 252 403 282 521
-rect 324 504 354 521
-rect 324 478 368 504
-rect 338 456 368 478
-rect 338 440 430 456
-rect 338 406 384 440
-rect 418 406 430 440
-rect 238 387 292 403
-rect 130 365 196 375
-rect 130 331 146 365
-rect 180 331 196 365
-rect 238 353 248 387
-rect 282 353 292 387
-rect 238 337 292 353
-rect 338 390 430 406
-rect 130 321 196 331
-rect 52 246 110 277
-rect 80 219 110 246
-rect 166 219 196 321
-rect 252 219 282 337
-rect 338 219 368 390
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 52 438 86 472
-rect 384 406 418 440
-rect 146 331 180 365
-rect 248 353 282 387
-<< locali >>
-rect 0 867 462 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 462 867
-rect 35 757 69 827
-rect 35 635 69 651
-rect 200 757 234 773
-rect 365 757 399 827
-rect 365 635 399 651
-rect 200 549 350 583
-rect 52 472 86 489
-rect 52 389 86 405
-rect 223 403 257 479
-rect 223 387 282 403
-rect 146 365 180 381
-rect 223 353 248 387
-rect 223 337 282 353
-rect 316 365 350 549
-rect 384 440 418 456
-rect 384 390 418 406
-rect 146 315 180 331
-rect 35 215 241 249
-rect 316 247 350 331
-rect 35 199 69 215
-rect 207 199 241 215
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 277 213 350 247
-rect 277 211 343 213
-rect 277 177 293 211
-rect 327 177 343 211
-rect 379 165 413 181
-rect 241 131 379 143
-rect 207 109 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 52 438 86 439
-rect 52 405 86 438
-rect 223 479 257 513
-rect 146 331 180 365
-rect 384 406 418 440
-rect 316 331 350 365
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 462 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 462 867
-rect 0 827 462 833
-rect 211 513 269 519
-rect 189 479 223 513
-rect 257 479 269 513
-rect 211 473 269 479
-rect 40 439 98 445
-rect 372 440 430 446
-rect 40 405 52 439
-rect 86 405 120 439
-rect 350 406 384 440
-rect 418 406 430 440
-rect 40 399 98 405
-rect 372 400 430 406
-rect 134 365 192 371
-rect 304 365 362 371
-rect 134 331 146 365
-rect 180 331 214 365
-rect 282 331 316 365
-rect 350 331 362 365
-rect 134 325 192 331
-rect 304 325 362 331
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 240 496 240 496 1 B0
-port 4 n
-rlabel viali 333 348 333 348 1 Y
-port 3 n
-rlabel viali 401 423 401 423 1 B1
-rlabel viali 163 348 163 348 1 A1
-rlabel viali 69 422 69 422 1 A0
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__or2_1.mag b/12T_ls/sky130_osu_sc_12T_ls__or2_1.mag
deleted file mode 100644
index 755d125..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__or2_1.mag
+++ /dev/null
@@ -1,188 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864423
-<< checkpaint >>
-rect -1269 2461 1634 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1634 -1129
-<< nwell >>
-rect -9 485 374 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 335 219
-rect 282 131 293 171
-rect 327 131 335 171
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 521 166 773
-rect 196 757 252 773
-rect 196 697 207 757
-rect 241 697 252 757
-rect 196 521 252 697
-rect 282 757 335 773
-rect 282 561 293 757
-rect 327 561 335 757
-rect 282 521 335 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 207 697 241 757
-rect 293 561 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 472 110 521
-rect 27 456 110 472
-rect 27 422 37 456
-rect 71 422 110 456
-rect 27 406 110 422
-rect 166 414 196 521
-rect 252 496 282 521
-rect 252 466 289 496
-rect 80 219 110 406
-rect 163 398 217 414
-rect 163 364 173 398
-rect 207 364 217 398
-rect 163 348 217 364
-rect 166 219 196 348
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 274 313 308
-rect 252 258 313 274
-rect 252 219 282 258
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 422 71 456
-rect 173 364 207 398
-rect 269 274 303 308
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 207 757 241 827
-rect 207 681 241 697
-rect 293 757 327 773
-rect 69 629 139 647
-rect 35 613 139 629
-rect 37 456 71 479
-rect 37 406 71 422
-rect 105 308 139 613
-rect 173 398 207 553
-rect 293 439 327 561
-rect 173 348 207 364
-rect 105 274 269 308
-rect 303 274 319 308
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 274
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 37 479 71 513
-rect 173 553 207 587
-rect 293 405 327 439
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 161 587 219 593
-rect 140 553 173 587
-rect 207 553 219 587
-rect 161 547 219 553
-rect 25 513 83 519
-rect 25 479 37 513
-rect 71 479 105 513
-rect 25 473 83 479
-rect 281 439 339 445
-rect 281 405 293 439
-rect 327 405 339 439
-rect 281 399 339 405
-rect 293 223 327 399
-rect 281 217 339 223
-rect 281 183 293 217
-rect 327 183 339 217
-rect 281 177 339 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 190 570 190 570 1 A
-port 2 n
-rlabel viali 54 496 54 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__or2_2.mag b/12T_ls/sky130_osu_sc_12T_ls__or2_2.mag
deleted file mode 100644
index caa68a6..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__or2_2.mag
+++ /dev/null
@@ -1,223 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864423
-<< checkpaint >>
-rect -1269 2461 1722 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1722 -1129
-<< nwell >>
-rect -9 485 462 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 421 219
-rect 368 131 379 171
-rect 413 131 421 171
-rect 368 115 421 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 521 166 773
-rect 196 757 252 773
-rect 196 697 207 757
-rect 241 697 252 757
-rect 196 521 252 697
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 421 773
-rect 368 561 379 757
-rect 413 561 421 757
-rect 368 521 421 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 207 697 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 80 472 110 521
-rect 27 456 110 472
-rect 27 422 37 456
-rect 71 422 110 456
-rect 27 406 110 422
-rect 166 414 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 252 466 368 496
-rect 80 219 110 406
-rect 163 398 217 414
-rect 163 364 173 398
-rect 207 364 217 398
-rect 163 348 217 364
-rect 166 219 196 348
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 303 274 368 288
-rect 252 258 368 274
-rect 252 219 282 258
-rect 338 219 368 258
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 37 422 71 456
-rect 173 364 207 398
-rect 269 274 303 308
-<< locali >>
-rect 0 867 462 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 462 867
-rect 35 757 69 773
-rect 207 757 241 827
-rect 207 681 241 697
-rect 293 757 327 773
-rect 69 629 139 647
-rect 35 613 139 629
-rect 37 456 71 479
-rect 37 406 71 422
-rect 105 308 139 613
-rect 173 398 207 553
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 173 348 207 364
-rect 105 274 269 308
-rect 303 274 319 308
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 274
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 37 479 71 513
-rect 173 553 207 587
-rect 293 405 327 439
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 462 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 462 867
-rect 0 827 462 833
-rect 161 587 219 593
-rect 140 553 173 587
-rect 207 553 219 587
-rect 161 547 219 553
-rect 25 513 83 519
-rect 25 479 37 513
-rect 71 479 105 513
-rect 25 473 83 479
-rect 281 439 339 445
-rect 281 405 293 439
-rect 327 405 339 439
-rect 281 399 339 405
-rect 293 223 327 399
-rect 281 217 339 223
-rect 281 183 293 217
-rect 327 183 339 217
-rect 281 177 339 183
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 190 570 190 570 1 A
-port 2 n
-rlabel viali 54 496 54 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__or2_4.mag b/12T_ls/sky130_osu_sc_12T_ls__or2_4.mag
deleted file mode 100644
index d5c6b5b..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__or2_4.mag
+++ /dev/null
@@ -1,286 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864423
-<< checkpaint >>
-rect -1269 2461 1898 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1898 -1129
-<< nwell >>
-rect -9 485 638 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 593 219
-rect 540 131 551 171
-rect 585 131 593 171
-rect 540 115 593 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 521 166 773
-rect 196 757 252 773
-rect 196 697 207 757
-rect 241 697 252 757
-rect 196 521 252 697
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 593 773
-rect 540 561 551 757
-rect 585 561 593 757
-rect 540 521 593 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 207 697 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 424 773 454 799
-rect 510 773 540 799
-rect 80 472 110 521
-rect 27 456 110 472
-rect 27 422 37 456
-rect 71 422 110 456
-rect 27 406 110 422
-rect 166 414 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 252 466 540 496
-rect 80 219 110 406
-rect 163 398 217 414
-rect 163 364 173 398
-rect 207 364 217 398
-rect 163 348 217 364
-rect 166 219 196 348
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 303 274 540 288
-rect 252 258 540 274
-rect 252 219 282 258
-rect 338 219 368 258
-rect 424 219 454 258
-rect 510 219 540 258
-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 422 71 456
-rect 173 364 207 398
-rect 269 274 303 308
-<< locali >>
-rect 0 867 638 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 638 867
-rect 35 757 69 773
-rect 207 757 241 827
-rect 207 681 241 697
-rect 293 757 327 773
-rect 69 629 139 647
-rect 35 613 139 629
-rect 37 456 71 479
-rect 37 406 71 422
-rect 105 308 139 613
-rect 173 398 207 553
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 439 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 173 348 207 364
-rect 105 274 269 308
-rect 303 274 319 308
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 274
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 37 479 71 513
-rect 173 553 207 587
-rect 293 405 327 439
-rect 465 405 499 439
-rect 293 183 327 217
-rect 465 183 499 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 638 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 638 867
-rect 0 827 638 833
-rect 161 587 219 593
-rect 140 553 173 587
-rect 207 553 219 587
-rect 161 547 219 553
-rect 25 513 83 519
-rect 25 479 37 513
-rect 71 479 105 513
-rect 25 473 83 479
-rect 281 439 339 445
-rect 453 439 511 445
-rect 281 405 293 439
-rect 327 405 465 439
-rect 499 405 511 439
-rect 281 399 339 405
-rect 453 399 511 405
-rect 293 223 327 399
-rect 465 223 499 399
-rect 281 217 339 223
-rect 453 217 511 223
-rect 281 183 293 217
-rect 327 183 465 217
-rect 499 183 511 217
-rect 281 177 339 183
-rect 453 177 511 183
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 190 570 190 570 1 A
-port 2 n
-rlabel viali 54 496 54 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__or2_8.mag b/12T_ls/sky130_osu_sc_12T_ls__or2_8.mag
deleted file mode 100644
index cea2401..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__or2_8.mag
+++ /dev/null
@@ -1,428 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864423
-<< checkpaint >>
-rect -1269 2461 2250 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2250 -1129
-<< nwell >>
-rect -9 485 990 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-rect 596 115 626 219
-rect 682 115 712 219
-rect 768 115 798 219
-rect 854 115 884 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-rect 768 521 798 773
-rect 854 521 884 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 219
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 219
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 768 219
-rect 712 131 723 171
-rect 757 131 768 171
-rect 712 115 768 131
-rect 798 171 854 219
-rect 798 131 809 171
-rect 843 131 854 171
-rect 798 115 854 131
-rect 884 171 937 219
-rect 884 131 895 171
-rect 929 131 937 171
-rect 884 115 937 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 521 166 773
-rect 196 757 252 773
-rect 196 697 207 757
-rect 241 697 252 757
-rect 196 521 252 697
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 768 773
-rect 712 561 723 757
-rect 757 561 768 757
-rect 712 521 768 561
-rect 798 757 854 773
-rect 798 561 809 757
-rect 843 561 854 757
-rect 798 521 854 561
-rect 884 757 937 773
-rect 884 561 895 757
-rect 929 561 937 757
-rect 884 521 937 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-rect 809 131 843 171
-rect 895 131 929 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 207 697 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-rect 809 561 843 757
-rect 895 561 929 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 768 773 798 799
-rect 854 773 884 799
-rect 80 472 110 521
-rect 27 456 110 472
-rect 27 422 37 456
-rect 71 422 110 456
-rect 27 406 110 422
-rect 166 414 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 596 496 626 521
-rect 682 496 712 521
-rect 768 496 798 521
-rect 854 496 884 521
-rect 252 466 884 496
-rect 80 219 110 406
-rect 163 398 217 414
-rect 163 364 173 398
-rect 207 364 217 398
-rect 163 348 217 364
-rect 166 219 196 348
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 596 288 626 466
-rect 303 274 884 288
-rect 252 258 884 274
-rect 252 219 282 258
-rect 338 219 368 258
-rect 424 219 454 258
-rect 510 219 540 258
-rect 596 219 626 258
-rect 682 219 712 258
-rect 768 219 798 258
-rect 854 219 884 258
-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 422 71 456
-rect 173 364 207 398
-rect 269 274 303 308
-<< locali >>
-rect 0 867 990 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 990 867
-rect 35 757 69 773
-rect 207 757 241 827
-rect 207 681 241 697
-rect 293 757 327 773
-rect 69 629 139 647
-rect 35 613 139 629
-rect 37 456 71 479
-rect 37 406 71 422
-rect 105 308 139 613
-rect 173 398 207 553
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 439 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 637 757 671 773
-rect 637 439 671 561
-rect 723 757 757 827
-rect 723 545 757 561
-rect 809 757 843 773
-rect 809 439 843 561
-rect 895 757 929 827
-rect 895 545 929 561
-rect 173 348 207 364
-rect 105 274 269 308
-rect 303 274 319 308
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 274
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 637 171 671 183
-rect 637 115 671 131
-rect 723 171 757 187
-rect 723 61 757 131
-rect 809 171 843 183
-rect 809 115 843 131
-rect 895 171 929 187
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 37 479 71 513
-rect 173 553 207 587
-rect 293 405 327 439
-rect 465 405 499 439
-rect 637 405 671 439
-rect 809 405 843 439
-rect 293 183 327 217
-rect 465 183 499 217
-rect 637 183 671 217
-rect 809 183 843 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 867 990 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 990 867
-rect 0 827 990 833
-rect 161 587 219 593
-rect 140 553 173 587
-rect 207 553 219 587
-rect 161 547 219 553
-rect 25 513 83 519
-rect 25 479 37 513
-rect 71 479 105 513
-rect 25 473 83 479
-rect 281 439 339 445
-rect 453 439 511 445
-rect 625 439 683 445
-rect 797 439 855 445
-rect 281 405 293 439
-rect 327 405 465 439
-rect 499 405 637 439
-rect 671 405 809 439
-rect 843 405 855 439
-rect 281 399 339 405
-rect 453 399 511 405
-rect 625 399 683 405
-rect 797 399 855 405
-rect 293 223 327 399
-rect 465 223 499 399
-rect 637 223 671 399
-rect 809 223 843 399
-rect 281 217 339 223
-rect 453 217 511 223
-rect 625 217 683 223
-rect 797 217 855 223
-rect 281 183 293 217
-rect 327 183 465 217
-rect 499 183 637 217
-rect 671 183 683 217
-rect 712 183 809 217
-rect 843 183 855 217
-rect 281 177 339 183
-rect 453 177 511 183
-rect 625 177 683 183
-rect 797 177 855 183
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 190 570 190 570 1 A
-port 2 n
-rlabel viali 54 496 54 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__or2_l.mag b/12T_ls/sky130_osu_sc_12T_ls__or2_l.mag
deleted file mode 100644
index 17b21b4..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__or2_l.mag
+++ /dev/null
@@ -1,184 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864424
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 374 897
-<< nmos >>
-rect 80 115 110 187
-rect 166 115 196 187
-rect 252 115 282 187
-<< pmoshvt >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 252 605 282 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 166 187
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 165 252 187
-rect 196 131 207 165
-rect 241 131 252 165
-rect 196 115 252 131
-rect 282 165 335 187
-rect 282 131 293 165
-rect 327 131 335 165
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 689 35 757
-rect 69 689 80 757
-rect 27 605 80 689
-rect 110 605 166 773
-rect 196 757 252 773
-rect 196 689 207 757
-rect 241 689 252 757
-rect 196 605 252 689
-rect 282 757 335 773
-rect 282 689 293 757
-rect 327 689 335 757
-rect 282 605 335 689
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-rect 207 131 241 165
-rect 293 131 327 165
-<< pdiffc >>
-rect 35 689 69 757
-rect 207 689 241 757
-rect 293 689 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 546 110 605
-rect 27 530 110 546
-rect 27 496 37 530
-rect 71 496 110 530
-rect 27 480 110 496
-rect 166 488 196 605
-rect 252 567 282 605
-rect 252 540 289 567
-rect 80 187 110 480
-rect 163 472 217 488
-rect 163 438 173 472
-rect 207 438 217 472
-rect 163 422 217 438
-rect 166 187 196 422
-rect 259 398 289 540
-rect 259 382 313 398
-rect 259 362 269 382
-rect 252 348 269 362
-rect 303 348 313 382
-rect 252 332 313 348
-rect 252 187 282 332
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 496 71 530
-rect 173 438 207 472
-rect 269 348 303 382
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 35 621 69 689
-rect 207 757 241 827
-rect 207 673 241 689
-rect 293 757 327 773
-rect 35 587 139 621
-rect 37 530 71 546
-rect 105 382 139 587
-rect 293 513 327 689
-rect 173 472 207 479
-rect 173 422 207 438
-rect 105 348 269 382
-rect 303 348 319 382
-rect 35 165 69 181
-rect 35 61 69 131
-rect 121 165 155 348
-rect 121 115 155 131
-rect 207 165 241 181
-rect 207 61 241 131
-rect 293 165 327 257
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 37 496 71 513
-rect 37 479 71 496
-rect 173 479 207 513
-rect 293 479 327 513
-rect 293 257 327 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 25 513 83 519
-rect 161 513 219 519
-rect 281 513 339 519
-rect 25 479 37 513
-rect 71 479 105 513
-rect 161 479 173 513
-rect 207 479 240 513
-rect 281 479 293 513
-rect 327 479 339 513
-rect 25 473 83 479
-rect 161 473 219 479
-rect 281 473 339 479
-rect 293 297 327 473
-rect 281 291 339 297
-rect 281 257 293 291
-rect 327 257 339 291
-rect 281 251 339 257
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 422 311 422 1 Y
-port 1 n
-rlabel viali 190 496 190 496 1 A
-rlabel viali 54 496 54 496 1 B
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__tbufi_1.mag b/12T_ls/sky130_osu_sc_12T_ls__tbufi_1.mag
deleted file mode 100644
index 72e5ac8..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__tbufi_1.mag
+++ /dev/null
@@ -1,187 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864424
-<< checkpaint >>
-rect -1269 2461 1635 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1635 -1129
-<< nwell >>
-rect -9 485 375 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 238 115 268 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 238 521 268 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 115 238 219
-rect 268 171 321 219
-rect 268 131 279 171
-rect 313 131 321 171
-rect 268 115 321 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 521 238 773
-rect 268 757 321 773
-rect 268 561 279 757
-rect 313 561 321 757
-rect 268 521 321 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 279 131 313 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 629 155 757
-rect 279 561 313 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 80 506 110 521
-rect 39 476 110 506
-rect 39 264 69 476
-rect 166 433 196 521
-rect 133 417 196 433
-rect 133 383 143 417
-rect 177 383 196 417
-rect 133 367 196 383
-rect 238 355 268 521
-rect 238 339 292 355
-rect 111 291 165 307
-rect 111 264 121 291
-rect 39 257 121 264
-rect 155 264 165 291
-rect 238 305 248 339
-rect 282 305 292 339
-rect 238 289 292 305
-rect 155 257 196 264
-rect 39 234 196 257
-rect 80 219 110 234
-rect 166 219 196 234
-rect 238 219 268 289
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 143 383 177 417
-rect 121 257 155 291
-rect 248 305 282 339
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 613 155 629
-rect 279 757 313 773
-rect 35 417 69 561
-rect 143 417 177 433
-rect 35 383 143 417
-rect 35 171 69 383
-rect 143 367 177 383
-rect 211 339 245 553
-rect 279 439 313 561
-rect 211 305 248 339
-rect 282 305 298 339
-rect 103 257 121 291
-rect 155 257 171 291
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 279 171 313 183
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 211 553 245 587
-rect 279 405 313 439
-rect 121 257 155 291
-rect 279 183 313 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 199 587 257 593
-rect 177 553 211 587
-rect 245 553 257 587
-rect 199 547 257 553
-rect 109 513 167 519
-rect 109 479 189 513
-rect 109 473 167 479
-rect 121 297 155 473
-rect 267 439 325 445
-rect 267 405 279 439
-rect 313 405 325 439
-rect 267 399 325 405
-rect 109 291 167 297
-rect 109 257 121 291
-rect 155 257 167 291
-rect 109 251 167 257
-rect 279 223 313 399
-rect 267 217 325 223
-rect 267 183 279 217
-rect 313 183 325 217
-rect 267 177 325 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 268 305 268 1 Y
-port 1 n
-rlabel viali 228 570 228 570 1 A
-port 2 n
-rlabel metal1 138 496 138 496 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__tbufi_l.mag b/12T_ls/sky130_osu_sc_12T_ls__tbufi_l.mag
deleted file mode 100644
index 7f86ebf..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__tbufi_l.mag
+++ /dev/null
@@ -1,183 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864424
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 375 897
-<< nmos >>
-rect 80 115 110 187
-rect 166 115 196 187
-rect 238 115 268 187
-<< pmoshvt >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 238 605 268 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 166 187
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 115 238 187
-rect 268 165 321 187
-rect 268 131 279 165
-rect 313 131 321 165
-rect 268 115 321 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 605 80 621
-rect 110 757 166 773
-rect 110 621 121 757
-rect 155 621 166 757
-rect 110 605 166 621
-rect 196 605 238 773
-rect 268 757 321 773
-rect 268 621 279 757
-rect 313 621 321 757
-rect 268 605 321 621
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-rect 279 131 313 165
-<< pdiffc >>
-rect 35 621 69 757
-rect 121 621 155 757
-rect 279 621 313 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 80 580 110 605
-rect 39 550 110 580
-rect 39 338 69 550
-rect 166 507 196 605
-rect 133 491 196 507
-rect 133 457 143 491
-rect 177 457 196 491
-rect 133 441 196 457
-rect 238 429 268 605
-rect 238 413 292 429
-rect 111 365 165 381
-rect 111 338 121 365
-rect 39 331 121 338
-rect 155 338 165 365
-rect 238 379 248 413
-rect 282 379 292 413
-rect 238 363 292 379
-rect 155 331 196 338
-rect 39 308 196 331
-rect 80 187 110 308
-rect 166 187 196 308
-rect 238 187 268 363
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 143 457 177 491
-rect 121 331 155 365
-rect 248 379 282 413
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 35 491 69 621
-rect 121 757 155 827
-rect 121 605 155 621
-rect 279 757 313 773
-rect 143 491 177 507
-rect 35 457 143 491
-rect 35 165 69 457
-rect 143 441 177 457
-rect 211 413 245 553
-rect 279 513 313 621
-rect 211 379 248 413
-rect 282 379 298 413
-rect 103 331 121 365
-rect 155 331 171 365
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 279 165 313 257
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 211 553 245 587
-rect 279 479 313 513
-rect 121 331 155 365
-rect 279 257 313 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 199 587 257 593
-rect 177 553 211 587
-rect 245 553 257 587
-rect 199 547 257 553
-rect 109 513 167 519
-rect 267 513 325 519
-rect 109 479 189 513
-rect 267 479 279 513
-rect 313 479 325 513
-rect 109 473 167 479
-rect 267 473 325 479
-rect 121 371 155 473
-rect 109 365 167 371
-rect 109 331 121 365
-rect 155 331 167 365
-rect 109 325 167 331
-rect 279 297 313 473
-rect 267 291 325 297
-rect 267 257 279 291
-rect 313 257 325 291
-rect 267 251 325 257
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 342 305 342 1 Y
-port 1 n
-rlabel metal1 138 496 138 496 1 OE
-rlabel viali 228 570 228 570 1 A
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__tiehi.mag b/12T_ls/sky130_osu_sc_12T_ls__tiehi.mag
deleted file mode 100644
index 1b4d68c..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__tiehi.mag
+++ /dev/null
@@ -1,101 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864424
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 485 199 897
-<< nmos >>
-rect 80 115 110 219
-<< pmoshvt >>
-rect 80 521 110 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 561 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 337 110 521
-rect 80 321 134 337
-rect 80 287 90 321
-rect 124 287 134 321
-rect 80 271 134 287
-rect 80 219 110 271
-rect 80 89 110 115
-<< polycont >>
-rect 90 287 124 321
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 827
-rect 35 545 69 561
-rect 121 757 155 773
-rect 121 513 155 561
-rect 74 287 90 321
-rect 124 287 155 321
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 287
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 121 479 155 513
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 94 513 167 519
-rect 94 479 121 513
-rect 155 479 167 513
-rect 94 473 167 479
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 138 496 138 496 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__tielo.mag b/12T_ls/sky130_osu_sc_12T_ls__tielo.mag
deleted file mode 100644
index 84586b4..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__tielo.mag
+++ /dev/null
@@ -1,101 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864424
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 485 199 897
-<< nmos >>
-rect 80 115 110 219
-<< pmoshvt >>
-rect 80 521 110 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 561 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 469 110 521
-rect 80 453 134 469
-rect 80 419 90 453
-rect 124 419 134 453
-rect 80 403 134 419
-rect 80 219 110 403
-rect 80 89 110 115
-<< polycont >>
-rect 90 419 124 453
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 827
-rect 35 545 69 561
-rect 121 757 155 773
-rect 121 453 155 561
-rect 74 419 90 453
-rect 124 419 155 453
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 257
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 121 257 155 291
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 94 291 167 297
-rect 94 257 121 291
-rect 155 257 167 291
-rect 94 251 167 257
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 138 274 138 274 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__tnbufi_1.mag b/12T_ls/sky130_osu_sc_12T_ls__tnbufi_1.mag
deleted file mode 100644
index 6a8487c..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__tnbufi_1.mag
+++ /dev/null
@@ -1,182 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864425
-<< checkpaint >>
-rect -1269 2461 1635 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1635 -1129
-<< nwell >>
-rect -9 485 375 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 238 115 268 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 238 521 268 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 115 238 219
-rect 268 171 321 219
-rect 268 131 279 171
-rect 313 131 321 171
-rect 268 115 321 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 521 238 773
-rect 268 757 321 773
-rect 268 561 279 757
-rect 313 561 321 757
-rect 268 521 321 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 279 131 313 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 629 155 757
-rect 279 561 313 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 80 506 110 521
-rect 166 506 196 521
-rect 39 476 196 506
-rect 39 264 69 476
-rect 111 474 165 476
-rect 111 440 121 474
-rect 155 440 165 474
-rect 111 424 165 440
-rect 111 356 196 372
-rect 111 322 121 356
-rect 155 322 196 356
-rect 111 306 196 322
-rect 39 234 110 264
-rect 80 219 110 234
-rect 166 219 196 306
-rect 238 355 268 521
-rect 238 339 292 355
-rect 238 305 248 339
-rect 282 305 292 339
-rect 238 289 292 305
-rect 238 219 268 289
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 121 440 155 474
-rect 121 322 155 356
-rect 248 305 282 339
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 613 155 629
-rect 279 757 313 773
-rect 35 356 69 561
-rect 121 474 155 479
-rect 121 424 155 440
-rect 121 356 155 372
-rect 35 322 121 356
-rect 35 171 69 322
-rect 121 306 155 322
-rect 211 339 245 553
-rect 279 439 313 561
-rect 211 305 248 339
-rect 282 305 298 339
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 279 171 313 183
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 211 553 245 587
-rect 121 479 155 513
-rect 279 405 313 439
-rect 279 183 313 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 199 587 257 593
-rect 177 553 211 587
-rect 245 553 257 587
-rect 199 547 257 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 189 513
-rect 109 473 167 479
-rect 267 439 325 445
-rect 267 405 279 439
-rect 313 405 325 439
-rect 267 399 325 405
-rect 279 223 313 399
-rect 267 217 325 223
-rect 267 183 279 217
-rect 313 183 325 217
-rect 267 177 325 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 268 305 268 1 Y
-port 1 n
-rlabel viali 228 570 228 570 1 A
-port 2 n
-rlabel viali 138 496 138 496 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__tnbufi_l.mag b/12T_ls/sky130_osu_sc_12T_ls__tnbufi_l.mag
deleted file mode 100644
index 3ba6f49..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__tnbufi_l.mag
+++ /dev/null
@@ -1,182 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864425
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 375 897
-<< nmos >>
-rect 80 115 110 187
-rect 166 115 196 187
-rect 238 115 268 187
-<< pmoshvt >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 238 605 268 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 166 187
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 115 238 187
-rect 268 165 321 187
-rect 268 131 279 165
-rect 313 131 321 165
-rect 268 115 321 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 605 80 621
-rect 110 757 166 773
-rect 110 621 121 757
-rect 155 621 166 757
-rect 110 605 166 621
-rect 196 605 238 773
-rect 268 757 321 773
-rect 268 621 279 757
-rect 313 621 321 757
-rect 268 605 321 621
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-rect 279 131 313 165
-<< pdiffc >>
-rect 35 621 69 757
-rect 121 621 155 757
-rect 279 621 313 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 80 580 110 605
-rect 166 580 196 605
-rect 39 550 196 580
-rect 39 337 69 550
-rect 111 548 165 550
-rect 111 514 121 548
-rect 155 514 165 548
-rect 111 498 165 514
-rect 111 429 196 445
-rect 111 395 121 429
-rect 155 395 196 429
-rect 111 379 196 395
-rect 39 308 110 337
-rect 40 307 110 308
-rect 80 187 110 307
-rect 166 187 196 379
-rect 238 429 268 605
-rect 238 413 292 429
-rect 238 379 248 413
-rect 282 379 292 413
-rect 238 363 292 379
-rect 238 187 268 363
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 121 514 155 548
-rect 121 395 155 429
-rect 248 379 282 413
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 35 430 69 621
-rect 121 757 155 827
-rect 121 605 155 621
-rect 279 757 313 773
-rect 279 587 313 621
-rect 121 548 155 564
-rect 121 513 155 514
-rect 121 430 155 445
-rect 35 429 155 430
-rect 35 395 121 429
-rect 35 165 69 395
-rect 121 379 155 395
-rect 245 405 248 413
-rect 211 379 248 405
-rect 282 379 298 413
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 279 165 313 257
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 279 553 313 587
-rect 121 479 155 513
-rect 211 405 245 439
-rect 279 257 313 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 266 587 325 593
-rect 266 553 279 587
-rect 313 553 325 587
-rect 266 547 325 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 189 513
-rect 109 473 167 479
-rect 199 439 257 445
-rect 199 438 211 439
-rect 177 405 211 438
-rect 245 405 257 439
-rect 177 404 257 405
-rect 199 399 257 404
-rect 285 297 319 547
-rect 267 291 325 297
-rect 267 257 279 291
-rect 313 257 325 291
-rect 267 251 325 257
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 342 305 342 1 Y
-port 1 n
-rlabel viali 228 423 228 423 1 A
-rlabel viali 138 497 138 497 1 OE
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__xnor2_l.mag b/12T_ls/sky130_osu_sc_12T_ls__xnor2_l.mag
deleted file mode 100644
index cface76..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__xnor2_l.mag
+++ /dev/null
@@ -1,293 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864425
-<< checkpaint >>
-rect -1209 -1243 1753 2131
-<< nwell >>
-rect -9 485 638 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 238 115 268 219
-rect 358 115 388 219
-rect 430 115 460 219
-rect 516 115 546 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 238 521 268 773
-rect 358 521 388 773
-rect 430 521 460 773
-rect 516 521 546 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-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 171 358 219
-rect 268 131 279 171
-rect 347 131 358 171
-rect 268 115 358 131
-rect 388 115 430 219
-rect 460 165 516 219
-rect 460 131 471 165
-rect 505 131 516 165
-rect 460 115 516 131
-rect 546 171 599 219
-rect 546 131 557 171
-rect 591 131 599 171
-rect 546 115 599 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 521 238 773
-rect 268 757 358 773
-rect 268 561 279 757
-rect 347 561 358 757
-rect 268 521 358 561
-rect 388 521 430 773
-rect 460 757 516 773
-rect 460 561 471 757
-rect 505 561 516 757
-rect 460 521 516 561
-rect 546 757 599 773
-rect 546 562 557 757
-rect 591 562 599 757
-rect 546 521 599 562
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 165
-rect 279 131 347 171
-rect 471 131 505 165
-rect 557 131 591 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 561 155 757
-rect 279 561 347 757
-rect 471 561 505 757
-rect 557 562 591 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 358 773 388 799
-rect 430 773 460 799
-rect 516 773 546 799
-rect 80 506 110 521
-rect 70 476 110 506
-rect 70 264 100 476
-rect 166 415 196 521
-rect 142 399 196 415
-rect 142 365 152 399
-rect 186 365 196 399
-rect 142 349 196 365
-rect 238 490 268 521
-rect 238 474 292 490
-rect 238 440 248 474
-rect 282 440 292 474
-rect 238 424 292 440
-rect 142 291 196 307
-rect 142 264 152 291
-rect 70 257 152 264
-rect 186 257 196 291
-rect 70 234 196 257
-rect 80 219 110 234
-rect 166 219 196 234
-rect 238 219 268 424
-rect 358 415 388 521
-rect 430 506 460 521
-rect 516 506 546 521
-rect 430 476 546 506
-rect 358 399 472 415
-rect 358 385 428 399
-rect 418 365 428 385
-rect 462 365 472 399
-rect 418 349 472 365
-rect 516 307 546 476
-rect 326 291 380 307
-rect 326 257 336 291
-rect 370 264 380 291
-rect 479 291 546 307
-rect 479 264 489 291
-rect 370 257 388 264
-rect 326 241 388 257
-rect 358 219 388 241
-rect 430 257 489 264
-rect 523 257 546 291
-rect 430 234 546 257
-rect 430 219 460 234
-rect 516 219 546 234
-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 365 186 399
-rect 248 440 282 474
-rect 152 257 186 291
-rect 428 365 462 399
-rect 336 257 370 291
-rect 489 257 523 291
-<< locali >>
-rect 0 867 638 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 638 867
-rect 35 757 69 773
-rect 35 399 69 561
-rect 121 757 155 827
-rect 279 757 347 773
-rect 121 545 155 561
-rect 268 587 279 593
-rect 302 553 347 561
-rect 279 545 347 553
-rect 471 757 505 827
-rect 471 545 505 561
-rect 557 757 591 773
-rect 557 474 591 562
-rect 232 440 248 474
-rect 282 440 591 474
-rect 35 365 152 399
-rect 186 365 370 399
-rect 35 171 69 365
-rect 152 291 186 307
-rect 336 291 370 365
-rect 404 365 428 399
-rect 462 365 478 399
-rect 152 241 186 257
-rect 268 187 302 257
-rect 336 241 370 257
-rect 489 291 523 307
-rect 489 241 523 257
-rect 35 115 69 131
-rect 121 165 155 181
-rect 268 171 347 187
-rect 268 153 279 171
-rect 121 61 155 131
-rect 279 115 347 131
-rect 471 165 505 181
-rect 471 61 505 131
-rect 557 171 591 440
-rect 557 115 591 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 268 561 279 587
-rect 279 561 302 587
-rect 268 553 302 561
-rect 404 331 438 365
-rect 152 257 186 291
-rect 268 257 302 291
-rect 489 257 523 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 638 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 638 867
-rect 0 827 638 833
-rect 256 587 314 593
-rect 256 553 268 587
-rect 302 553 314 587
-rect 256 547 314 553
-rect 268 297 302 547
-rect 392 365 451 371
-rect 392 331 404 365
-rect 438 331 451 365
-rect 392 325 451 331
-rect 140 291 198 297
-rect 140 257 152 291
-rect 186 257 198 291
-rect 140 251 198 257
-rect 256 291 314 297
-rect 256 257 268 291
-rect 302 257 314 291
-rect 256 251 314 257
-rect 152 217 186 251
-rect 404 217 438 325
-rect 477 291 535 297
-rect 477 257 489 291
-rect 523 257 557 291
-rect 477 251 535 257
-rect 152 183 438 217
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 506 274 506 274 1 B
-port 2 n
-rlabel metal1 284 331 284 331 1 Y
-port 3 n
-rlabel viali 169 274 169 274 1 A
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ls/sky130_osu_sc_12T_ls__xor2_l.mag b/12T_ls/sky130_osu_sc_12T_ls__xor2_l.mag
deleted file mode 100644
index bf7eba3..0000000
--- a/12T_ls/sky130_osu_sc_12T_ls__xor2_l.mag
+++ /dev/null
@@ -1,292 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864425
-<< checkpaint >>
-rect -1269 2461 1898 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1898 -1129
-<< nwell >>
-rect -9 485 638 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 238 115 268 219
-rect 358 115 388 219
-rect 430 115 460 219
-rect 516 115 546 219
-<< pmoshvt >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 238 521 268 773
-rect 358 521 388 773
-rect 430 521 460 773
-rect 516 521 546 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 115 238 219
-rect 268 171 358 219
-rect 268 131 279 171
-rect 347 131 358 171
-rect 268 115 358 131
-rect 388 115 430 219
-rect 460 171 516 219
-rect 460 131 471 171
-rect 505 131 516 171
-rect 460 115 516 131
-rect 546 171 599 219
-rect 546 131 557 171
-rect 591 131 599 171
-rect 546 115 599 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 521 238 773
-rect 268 757 358 773
-rect 268 561 279 757
-rect 347 561 358 757
-rect 268 521 358 561
-rect 388 521 430 773
-rect 460 757 516 773
-rect 460 697 471 757
-rect 505 697 516 757
-rect 460 521 516 697
-rect 546 757 599 773
-rect 546 562 557 757
-rect 591 562 599 757
-rect 546 521 599 562
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 279 131 347 171
-rect 471 131 505 171
-rect 557 131 591 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 279 561 347 757
-rect 471 697 505 757
-rect 557 562 591 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 358 773 388 799
-rect 430 773 460 799
-rect 516 773 546 799
-rect 80 506 110 521
-rect 166 506 196 521
-rect 70 476 196 506
-rect 70 259 100 476
-rect 142 474 196 476
-rect 142 440 152 474
-rect 186 440 196 474
-rect 142 424 196 440
-rect 142 366 196 382
-rect 142 332 152 366
-rect 186 332 196 366
-rect 142 316 196 332
-rect 70 234 110 259
-rect 80 219 110 234
-rect 166 219 196 316
-rect 238 307 268 521
-rect 358 490 388 521
-rect 334 474 388 490
-rect 430 506 460 521
-rect 516 506 546 521
-rect 430 476 546 506
-rect 334 440 344 474
-rect 378 440 388 474
-rect 334 424 388 440
-rect 479 474 546 476
-rect 479 440 489 474
-rect 523 440 546 474
-rect 479 424 546 440
-rect 420 365 474 381
-rect 420 336 430 365
-rect 358 331 430 336
-rect 464 331 474 365
-rect 238 291 292 307
-rect 238 257 248 291
-rect 282 257 292 291
-rect 238 241 292 257
-rect 358 306 474 331
-rect 238 219 268 241
-rect 358 219 388 306
-rect 516 264 546 424
-rect 430 234 546 264
-rect 430 219 460 234
-rect 516 219 546 234
-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 440 186 474
-rect 152 332 186 366
-rect 344 440 378 474
-rect 489 440 523 474
-rect 430 331 464 365
-rect 248 257 282 291
-<< locali >>
-rect 0 867 638 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 638 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 279 757 347 773
-rect 35 366 69 561
-rect 152 553 200 587
-rect 268 561 279 579
-rect 471 757 505 827
-rect 471 681 505 697
-rect 557 757 591 773
-rect 152 474 186 553
-rect 268 545 347 561
-rect 136 440 152 474
-rect 186 440 202 474
-rect 268 439 302 545
-rect 344 474 378 490
-rect 344 366 378 440
-rect 35 332 152 366
-rect 186 332 378 366
-rect 412 365 446 553
-rect 489 474 523 479
-rect 489 424 523 440
-rect 35 171 69 332
-rect 412 331 430 365
-rect 464 331 480 365
-rect 557 291 591 562
-rect 232 257 248 291
-rect 282 257 591 291
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 279 183 296 187
-rect 330 183 347 187
-rect 279 171 347 183
-rect 279 115 347 131
-rect 471 171 505 187
-rect 471 61 505 131
-rect 557 171 591 257
-rect 557 115 591 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 200 553 234 587
-rect 412 553 446 587
-rect 268 405 302 439
-rect 489 479 523 513
-rect 296 183 330 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 638 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 638 867
-rect 0 827 638 833
-rect 188 587 246 593
-rect 400 587 458 593
-rect 188 553 200 587
-rect 234 553 412 587
-rect 446 553 458 587
-rect 188 547 246 553
-rect 400 547 458 553
-rect 477 513 535 519
-rect 455 479 489 513
-rect 523 479 535 513
-rect 477 473 535 479
-rect 256 439 314 445
-rect 256 405 268 439
-rect 302 405 314 439
-rect 256 399 314 405
-rect 268 223 302 399
-rect 268 217 342 223
-rect 268 183 296 217
-rect 330 183 342 217
-rect 284 177 342 183
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 218 570 218 570 1 A
-port 1 n
-rlabel metal1 285 390 285 390 1 Y
-port 2 n
-rlabel viali 506 496 506 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/.magicrc b/12T_ms/.magicrc
deleted file mode 100755
index 79cac60..0000000
--- a/12T_ms/.magicrc
+++ /dev/null
@@ -1,105 +0,0 @@
-puts stdout "Sourcing design .magicrc for technology EFS8A ..."
-
-# Put grid on 0.005 pitch. This is important, as some commands don't
-# rescale the grid automatically (such as lef read?).
-
-set scalefac [tech lambda]
-if {[lindex $scalefac 1] < 2} {
- scalegrid 1 2
-}
-
-# drc off
-drc euclidean on
-
-#set PDKPATH "~/projects/efabless/tech/SkyWater/EFS8A"
-
-# loading technology
-#tech load $PDKPATH/libs.tech/magic/EFS8A.tech
-tech load ../../char/techfiles/sky130A.tech
-
-# load device generator
-#source $PDKPATH/libs.tech/magic/EFS8A.tcl
-
-# load bind keys (optional)
-# source $PDKPATH/libs.tech/magic/EFS8A-BindKeys
-
-# set units to lambda grid
-snap internal
-
-# add path to reference cells
-#set MAGPATH "${PDKPATH}/libs.ref/mag"
-#addpath ${MAGPATH}/primdev
-#addpath ${MAGPATH}/s8fmlt
-#addpath ${MAGPATH}/s8iom0
-#addpath ${MAGPATH}/scs8hd
-#addpath ${MAGPATH}/scs8hdll
-#addpath ${MAGPATH}/scs8hvl
-#addpath ${MAGPATH}/scs8hs
-#addpath ${MAGPATH}/scs8ms
-#addpath ${MAGPATH}/scs8ls
-#addpath ${MAGPATH}/scs8lp
-
-# add path to GDS cells
-
-# add path to IP from catalog. This procedure defined in the PDK script.
-catch {magic::query_mylib_ip}
-# add path to local IP from user design space. Defined in the PDK script.
-catch {magic::query_my_projects}
-
-macro Shift_G "grid 74"
-macro XK_Left "scroll l .1 w"
-macro Shift_XK_Left "scroll l 1 w"
-macro Control_XK_Left "box grow w 1"
-macro Control_Shift_XK_Left "box shrink e 1"
-macro XK_Right "scroll r .1 w"
-macro Shift_XK_Right "scroll r 1 w"
-macro Control_XK_Right "box grow e 1"
-macro Control_Shift_XK_Right "box shrink w 1"
-macro XK_Up "scroll u .1 w"
-macro Shift_XK_Up "scroll u 1 w"
-macro Control_XK_Up "box grow n 1"
-macro Control_Shift_XK_Up "box shrink s 1"
-macro XK_Down "scroll d .1 w"
-macro Shift_XK_Down "scroll d 1 w"
-macro Control_XK_Down "box grow s 1"
-macro Control_Shift_XK_Down "box shrink n 1"
-
-macro XK_Pointer_Button4 "scroll u .05 w"
-macro XK_Pointer_Button5 "scroll d .05 w"
-macro . "history redo -1"
-
-macro XK_L "select less area {ndif pdif nwell poly}"
-macro XK_K "select less area nwell"
-macro XK_J "select less area {m1 lic}"
-macro XK_H "select less area li1"
-macro Control_Shift_XK_X "rotate"
-macro Shift_XK_Pointer_Button4 "stretch N 74"
-macro Shift_XK_Pointer_Button5 "stretch S 74"
-macro Control_XK_Pointer_Button4 "stretch N 34"
-macro Control_XK_Pointer_Button5 "stretch S 34"
-macro Control_Shift_XK_Q "stretch W 88"
-macro Control_Shift_XK_R "stretch E 88"
-macro Control_Shift_XK_W "stretch N 28"
-macro Control_Shift_XK_E "stretch N 4"
-macro XK_Y "stretch N 6"
-#macro Control_Shift_XK_W "stretch S 6"
-#macro Control_Shift_XK_E "stretch S 8"
-
-macro Control_Shift_XK_Pointer_Button4 "stretch N 17"
-macro Control_Shift_XK_Pointer_Button5 "stretch S 17"
-macro Control_Shift_XK_G "select area {m1 lic}"
-macro Control_Shift_XK_F "select area {poly polycont}"
-macro Control_Shift_XK_D "select area {ndc li1}"
-macro Control_Shift_XK_S "select area ntrans"
-
-macro Shift_D "select clear; move S 10; paint m1c"
-macro Shift_F "select clear; move N 10; paint m1c"
-
-
-macro Shift_B "box height 1.0um; move S 1.655um; select area; erase; select clear; move N 1um; select area; move S 1um; select clear; box height 0.26um; move S 4.35um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.26um; select clear; box height 20um; select area; move S 0.26um"
-
-
-macro Shift_N "box height 1.74um; move S 2.395um; select area; erase; select clear; move N 1.74um; select area; move S 1.74um; select clear; box height 0.48um; move S 3.61um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.48um; select clear; box height 20um; select area; move S 0.48um"
-
-
-macro Shift_M "box height 1.02um; move S 2.015um; select area; erase; select clear; move N 1.02um; box height 1.20um; select area; move S 1.02um; select clear; box height 0.12um; move S 0.56um; select area; erase; select clear; box height 5.00um; select area; move S 0.12um; select clear; move N 0.12um; box height 0.21um; move S 2.98um; select area;erase; select clear; box height 1.105um; move S 1.105um; select area; move N 0.21um; select clear; box height 0.17um; move N 0.825um; select area; erase; move S 0.825um; box height 0.825um; select area; move N 0.17um"
diff --git a/12T_ms/sky130_osu_sc_12T_ms__addf_1.mag b/12T_ms/sky130_osu_sc_12T_ms__addf_1.mag
deleted file mode 100644
index a38aa02..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__addf_1.mag
+++ /dev/null
@@ -1,651 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864417
-<< checkpaint >>
-rect -1209 -1243 2569 2131
-<< nwell >>
-rect -9 485 1435 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 410 115 440 219
-rect 496 115 526 219
-rect 582 115 612 219
-rect 668 115 698 219
-rect 754 115 784 219
-rect 840 115 870 219
-rect 922 115 952 219
-rect 1004 115 1034 219
-rect 1102 115 1132 219
-rect 1292 115 1322 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 410 521 440 773
-rect 496 521 526 773
-rect 582 521 612 773
-rect 668 521 698 773
-rect 754 521 784 773
-rect 840 521 870 773
-rect 922 521 952 773
-rect 1004 521 1034 773
-rect 1102 521 1132 773
-rect 1292 521 1322 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-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 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 115 410 219
-rect 440 171 496 219
-rect 440 131 451 171
-rect 485 131 496 171
-rect 440 115 496 131
-rect 526 171 582 219
-rect 526 131 537 171
-rect 571 131 582 171
-rect 526 115 582 131
-rect 612 157 668 219
-rect 612 123 623 157
-rect 657 123 668 157
-rect 612 115 668 123
-rect 698 171 754 219
-rect 698 131 709 171
-rect 743 131 754 171
-rect 698 115 754 131
-rect 784 165 840 219
-rect 784 131 795 165
-rect 829 131 840 165
-rect 784 115 840 131
-rect 870 115 922 219
-rect 952 115 1004 219
-rect 1034 171 1102 219
-rect 1034 131 1045 171
-rect 1079 131 1102 171
-rect 1034 115 1102 131
-rect 1132 171 1185 219
-rect 1132 131 1143 171
-rect 1177 131 1185 171
-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 171 1375 219
-rect 1322 131 1333 171
-rect 1367 131 1375 171
-rect 1322 115 1375 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 629 293 757
-rect 327 629 338 757
-rect 282 521 338 629
-rect 368 521 410 773
-rect 440 757 496 773
-rect 440 629 451 757
-rect 485 629 496 757
-rect 440 521 496 629
-rect 526 757 582 773
-rect 526 629 537 757
-rect 571 629 582 757
-rect 526 521 582 629
-rect 612 757 668 773
-rect 612 723 623 757
-rect 657 723 668 757
-rect 612 521 668 723
-rect 698 757 754 773
-rect 698 663 709 757
-rect 743 663 754 757
-rect 698 521 754 663
-rect 784 757 840 773
-rect 784 629 795 757
-rect 829 629 840 757
-rect 784 521 840 629
-rect 870 521 922 773
-rect 952 521 1004 773
-rect 1034 757 1102 773
-rect 1034 697 1045 757
-rect 1079 697 1102 757
-rect 1034 521 1102 697
-rect 1132 757 1185 773
-rect 1132 629 1143 757
-rect 1177 629 1185 757
-rect 1132 521 1185 629
-rect 1239 757 1292 773
-rect 1239 561 1247 757
-rect 1281 561 1292 757
-rect 1239 521 1292 561
-rect 1322 757 1375 773
-rect 1322 561 1333 757
-rect 1367 561 1375 757
-rect 1322 521 1375 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 165
-rect 207 131 241 171
-rect 293 131 327 171
-rect 451 131 485 171
-rect 537 131 571 171
-rect 623 123 657 157
-rect 709 131 743 171
-rect 795 131 829 165
-rect 1045 131 1079 171
-rect 1143 131 1177 171
-rect 1247 131 1281 165
-rect 1333 131 1367 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 121 697 155 757
-rect 207 629 241 757
-rect 293 629 327 757
-rect 451 629 485 757
-rect 537 629 571 757
-rect 623 723 657 757
-rect 709 663 743 757
-rect 795 629 829 757
-rect 1045 697 1079 757
-rect 1143 629 1177 757
-rect 1247 561 1281 757
-rect 1333 561 1367 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-rect 979 827 1003 861
-rect 1037 827 1061 861
-rect 1115 827 1139 861
-rect 1173 827 1197 861
-rect 1251 827 1275 861
-rect 1309 827 1333 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-rect 1003 827 1037 861
-rect 1139 827 1173 861
-rect 1275 827 1309 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 801
-rect 338 773 368 801
-rect 410 773 440 799
-rect 496 773 526 799
-rect 582 773 612 801
-rect 668 773 698 801
-rect 754 773 784 801
-rect 840 773 870 801
-rect 922 773 952 801
-rect 1004 773 1034 801
-rect 1102 773 1132 801
-rect 1292 773 1322 801
-rect 80 381 110 521
-rect 166 489 196 521
-rect 152 473 206 489
-rect 152 439 162 473
-rect 196 439 206 473
-rect 152 423 206 439
-rect 70 365 124 381
-rect 70 331 80 365
-rect 114 331 124 365
-rect 70 315 124 331
-rect 80 219 110 315
-rect 166 219 196 423
-rect 252 381 282 521
-rect 338 423 368 521
-rect 410 496 440 521
-rect 496 496 526 521
-rect 410 466 526 496
-rect 338 407 430 423
-rect 238 365 292 381
-rect 238 331 248 365
-rect 282 331 292 365
-rect 238 315 292 331
-rect 338 373 386 407
-rect 420 373 430 407
-rect 338 357 430 373
-rect 472 363 502 466
-rect 582 364 612 521
-rect 668 455 698 521
-rect 656 439 710 455
-rect 656 405 666 439
-rect 700 405 710 439
-rect 656 389 710 405
-rect 252 219 282 315
-rect 338 219 368 357
-rect 472 347 526 363
-rect 472 313 482 347
-rect 516 313 526 347
-rect 472 271 526 313
-rect 568 348 622 364
-rect 568 314 578 348
-rect 612 314 622 348
-rect 568 298 622 314
-rect 410 241 526 271
-rect 410 219 440 241
-rect 496 219 526 241
-rect 582 219 612 298
-rect 668 219 698 389
-rect 754 324 784 521
-rect 840 460 870 521
-rect 826 444 880 460
-rect 826 410 836 444
-rect 870 410 880 444
-rect 826 394 880 410
-rect 922 417 952 521
-rect 1004 489 1034 521
-rect 1004 459 1048 489
-rect 1102 488 1132 521
-rect 922 401 976 417
-rect 742 308 796 324
-rect 742 274 752 308
-rect 786 274 796 308
-rect 742 258 796 274
-rect 754 219 784 258
-rect 840 219 870 394
-rect 922 367 932 401
-rect 966 367 976 401
-rect 922 351 976 367
-rect 922 219 952 351
-rect 1018 307 1048 459
-rect 1090 472 1144 488
-rect 1292 485 1322 521
-rect 1090 438 1100 472
-rect 1134 438 1144 472
-rect 1090 422 1144 438
-rect 1255 469 1322 485
-rect 1255 435 1265 469
-rect 1299 435 1322 469
-rect 1004 291 1058 307
-rect 1004 257 1014 291
-rect 1048 257 1058 291
-rect 1004 241 1058 257
-rect 1004 219 1034 241
-rect 1102 219 1132 422
-rect 1255 419 1322 435
-rect 1292 219 1322 419
-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 439 196 473
-rect 80 331 114 365
-rect 248 331 282 365
-rect 386 373 420 407
-rect 666 405 700 439
-rect 482 313 516 347
-rect 578 314 612 348
-rect 836 410 870 444
-rect 752 274 786 308
-rect 932 367 966 401
-rect 1100 438 1134 472
-rect 1265 435 1299 469
-rect 1014 257 1048 291
-<< locali >>
-rect 0 867 1408 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 1003 867
-rect 1037 827 1139 867
-rect 1173 827 1275 867
-rect 1309 827 1408 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 613 69 629
-rect 207 613 241 629
-rect 35 579 241 613
-rect 293 757 327 773
-rect 293 546 327 629
-rect 451 757 485 827
-rect 451 613 485 629
-rect 537 757 571 773
-rect 623 757 657 827
-rect 623 707 657 723
-rect 709 757 743 773
-rect 571 629 743 663
-rect 795 757 829 773
-rect 1045 757 1079 827
-rect 1045 681 1079 697
-rect 1143 757 1177 773
-rect 537 613 571 629
-rect 795 588 829 629
-rect 1143 588 1177 629
-rect 752 554 1100 588
-rect 752 553 812 554
-rect 293 509 350 546
-rect 80 473 114 479
-rect 80 439 162 473
-rect 196 439 212 473
-rect 248 365 282 405
-rect 64 331 80 365
-rect 114 331 130 365
-rect 248 315 282 331
-rect 316 291 350 509
-rect 386 479 444 513
-rect 386 407 420 479
-rect 386 357 420 373
-rect 578 348 612 479
-rect 752 510 787 553
-rect 650 405 666 439
-rect 700 405 716 439
-rect 466 313 482 347
-rect 516 313 532 347
-rect 752 376 786 510
-rect 836 444 870 479
-rect 1066 488 1100 554
-rect 1247 757 1281 827
-rect 1177 554 1202 571
-rect 1143 537 1202 554
-rect 1247 545 1281 561
-rect 1333 757 1367 773
-rect 1066 472 1134 488
-rect 820 410 836 444
-rect 870 410 886 444
-rect 1066 441 1100 472
-rect 1089 438 1100 441
-rect 1100 422 1134 438
-rect 932 401 966 405
-rect 752 342 879 376
-rect 932 351 966 367
-rect 1168 365 1202 537
-rect 1333 513 1367 561
-rect 578 298 612 314
-rect 736 274 752 308
-rect 786 291 810 308
-rect 35 215 241 249
-rect 35 189 70 215
-rect 35 171 69 189
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 207 171 241 215
-rect 207 114 241 131
-rect 293 223 350 257
-rect 293 171 327 223
-rect 537 206 743 240
-rect 293 114 327 131
-rect 451 171 485 187
-rect 451 61 485 131
-rect 537 171 571 206
-rect 709 171 743 206
-rect 845 190 879 342
-rect 1014 291 1048 331
-rect 1143 331 1202 365
-rect 1265 469 1299 485
-rect 998 257 1014 291
-rect 1048 257 1064 291
-rect 1014 256 1048 257
-rect 537 114 571 131
-rect 607 123 623 157
-rect 657 123 673 157
-rect 623 61 657 123
-rect 709 114 743 131
-rect 795 165 879 190
-rect 829 156 879 165
-rect 1045 171 1079 187
-rect 795 114 829 131
-rect 1045 61 1079 131
-rect 1143 171 1177 331
-rect 1265 291 1299 435
-rect 1245 257 1299 291
-rect 1143 115 1177 131
-rect 1247 165 1281 181
-rect 1247 61 1281 131
-rect 1333 171 1367 479
-rect 1333 115 1367 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 1003 861 1037 867
-rect 1003 833 1037 861
-rect 1139 861 1173 867
-rect 1139 833 1173 861
-rect 1275 861 1309 867
-rect 1275 833 1309 861
-rect 80 479 114 513
-rect 248 405 282 439
-rect 80 331 114 365
-rect 444 479 478 513
-rect 578 479 612 513
-rect 482 347 516 365
-rect 666 405 700 439
-rect 482 331 516 347
-rect 836 479 870 513
-rect 1143 554 1177 588
-rect 932 405 966 439
-rect 316 257 350 291
-rect 777 274 786 291
-rect 786 274 811 291
-rect 777 257 811 274
-rect 1014 331 1048 365
-rect 1211 257 1245 291
-rect 1333 479 1367 513
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 867 1408 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 1003 867
-rect 1037 833 1139 867
-rect 1173 833 1275 867
-rect 1309 833 1408 867
-rect 0 827 1408 833
-rect 1131 588 1189 594
-rect 1109 554 1143 588
-rect 1177 554 1189 588
-rect 1131 548 1189 554
-rect 68 513 126 519
-rect 432 513 490 519
-rect 566 513 624 519
-rect 824 513 882 520
-rect 1321 513 1379 519
-rect 68 479 80 513
-rect 114 479 444 513
-rect 478 479 578 513
-rect 612 479 836 513
-rect 870 479 882 513
-rect 1299 479 1333 513
-rect 1367 479 1379 513
-rect 68 473 126 479
-rect 432 473 490 479
-rect 566 473 624 479
-rect 824 472 882 479
-rect 1321 473 1379 479
-rect 236 439 296 445
-rect 650 439 717 445
-rect 920 439 978 445
-rect 236 405 248 439
-rect 282 405 666 439
-rect 700 405 932 439
-rect 966 405 978 439
-rect 236 399 296 405
-rect 650 399 717 405
-rect 920 399 978 405
-rect 68 365 126 371
-rect 470 365 528 371
-rect 1002 365 1060 371
-rect 68 331 80 365
-rect 114 331 482 365
-rect 516 331 1014 365
-rect 1048 331 1060 365
-rect 68 325 126 331
-rect 470 325 528 331
-rect 1002 325 1060 331
-rect 304 291 362 297
-rect 771 291 820 297
-rect 1199 291 1257 297
-rect 304 257 316 291
-rect 350 257 777 291
-rect 811 257 1211 291
-rect 1245 257 1257 291
-rect 304 251 362 257
-rect 771 251 820 257
-rect 1199 251 1257 257
-rect 0 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel viali 1160 571 1160 571 1 S
-port 5 n
-rlabel viali 1350 496 1350 496 1 CO
-port 6 n
-rlabel metal1 129 496 129 496 1 B
-rlabel viali 265 422 265 422 1 CI
-rlabel viali 97 348 97 348 1 A
-port 1 n
-rlabel viali 1228 274 1228 274 1 CON
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__addf_l.mag b/12T_ms/sky130_osu_sc_12T_ms__addf_l.mag
deleted file mode 100644
index ff729e5..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__addf_l.mag
+++ /dev/null
@@ -1,651 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864417
-<< checkpaint >>
-rect -1209 -1243 2569 2131
-<< nwell >>
-rect -9 485 1435 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 410 115 440 219
-rect 496 115 526 219
-rect 582 115 612 219
-rect 668 115 698 219
-rect 754 115 784 219
-rect 840 115 870 219
-rect 922 115 952 219
-rect 1004 115 1034 219
-rect 1102 115 1132 219
-rect 1292 115 1322 187
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 410 521 440 773
-rect 496 521 526 773
-rect 582 521 612 773
-rect 668 521 698 773
-rect 754 521 784 773
-rect 840 521 870 773
-rect 922 521 952 773
-rect 1004 521 1034 773
-rect 1102 521 1132 773
-rect 1292 605 1322 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-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 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 115 410 219
-rect 440 171 496 219
-rect 440 131 451 171
-rect 485 131 496 171
-rect 440 115 496 131
-rect 526 171 582 219
-rect 526 131 537 171
-rect 571 131 582 171
-rect 526 115 582 131
-rect 612 157 668 219
-rect 612 123 623 157
-rect 657 123 668 157
-rect 612 115 668 123
-rect 698 171 754 219
-rect 698 131 709 171
-rect 743 131 754 171
-rect 698 115 754 131
-rect 784 165 840 219
-rect 784 131 795 165
-rect 829 131 840 165
-rect 784 115 840 131
-rect 870 115 922 219
-rect 952 115 1004 219
-rect 1034 171 1102 219
-rect 1034 131 1045 171
-rect 1079 131 1102 171
-rect 1034 115 1102 131
-rect 1132 171 1185 219
-rect 1132 131 1143 171
-rect 1177 131 1185 171
-rect 1132 115 1185 131
-rect 1239 165 1292 187
-rect 1239 131 1247 165
-rect 1281 131 1292 165
-rect 1239 115 1292 131
-rect 1322 171 1375 187
-rect 1322 131 1333 171
-rect 1367 131 1375 171
-rect 1322 115 1375 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 629 293 757
-rect 327 629 338 757
-rect 282 521 338 629
-rect 368 521 410 773
-rect 440 757 496 773
-rect 440 629 451 757
-rect 485 629 496 757
-rect 440 521 496 629
-rect 526 757 582 773
-rect 526 629 537 757
-rect 571 629 582 757
-rect 526 521 582 629
-rect 612 757 668 773
-rect 612 723 623 757
-rect 657 723 668 757
-rect 612 521 668 723
-rect 698 757 754 773
-rect 698 663 709 757
-rect 743 663 754 757
-rect 698 521 754 663
-rect 784 757 840 773
-rect 784 629 795 757
-rect 829 629 840 757
-rect 784 521 840 629
-rect 870 521 922 773
-rect 952 521 1004 773
-rect 1034 757 1102 773
-rect 1034 697 1045 757
-rect 1079 697 1102 757
-rect 1034 521 1102 697
-rect 1132 757 1185 773
-rect 1132 629 1143 757
-rect 1177 629 1185 757
-rect 1132 521 1185 629
-rect 1239 757 1292 773
-rect 1239 617 1247 757
-rect 1281 617 1292 757
-rect 1239 605 1292 617
-rect 1322 757 1375 773
-rect 1322 617 1333 757
-rect 1367 617 1375 757
-rect 1322 605 1375 617
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 165
-rect 207 131 241 171
-rect 293 131 327 171
-rect 451 131 485 171
-rect 537 131 571 171
-rect 623 123 657 157
-rect 709 131 743 171
-rect 795 131 829 165
-rect 1045 131 1079 171
-rect 1143 131 1177 171
-rect 1247 131 1281 165
-rect 1333 131 1367 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 121 697 155 757
-rect 207 629 241 757
-rect 293 629 327 757
-rect 451 629 485 757
-rect 537 629 571 757
-rect 623 723 657 757
-rect 709 663 743 757
-rect 795 629 829 757
-rect 1045 697 1079 757
-rect 1143 629 1177 757
-rect 1247 617 1281 757
-rect 1333 617 1367 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-rect 979 827 1003 861
-rect 1037 827 1061 861
-rect 1115 827 1139 861
-rect 1173 827 1197 861
-rect 1251 827 1275 861
-rect 1309 827 1333 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-rect 1003 827 1037 861
-rect 1139 827 1173 861
-rect 1275 827 1309 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 801
-rect 338 773 368 801
-rect 410 773 440 799
-rect 496 773 526 799
-rect 582 773 612 801
-rect 668 773 698 801
-rect 754 773 784 801
-rect 840 773 870 801
-rect 922 773 952 801
-rect 1004 773 1034 801
-rect 1102 773 1132 801
-rect 1292 773 1322 801
-rect 80 381 110 521
-rect 166 489 196 521
-rect 152 473 206 489
-rect 152 439 162 473
-rect 196 439 206 473
-rect 152 423 206 439
-rect 70 365 124 381
-rect 70 331 80 365
-rect 114 331 124 365
-rect 70 315 124 331
-rect 80 219 110 315
-rect 166 219 196 423
-rect 252 381 282 521
-rect 338 423 368 521
-rect 410 496 440 521
-rect 496 496 526 521
-rect 410 466 526 496
-rect 338 407 430 423
-rect 238 365 292 381
-rect 238 331 248 365
-rect 282 331 292 365
-rect 238 315 292 331
-rect 338 373 386 407
-rect 420 373 430 407
-rect 338 357 430 373
-rect 472 363 502 466
-rect 582 364 612 521
-rect 668 455 698 521
-rect 656 439 710 455
-rect 656 405 666 439
-rect 700 405 710 439
-rect 656 389 710 405
-rect 252 219 282 315
-rect 338 219 368 357
-rect 472 347 526 363
-rect 472 313 482 347
-rect 516 313 526 347
-rect 472 271 526 313
-rect 568 348 622 364
-rect 568 314 578 348
-rect 612 314 622 348
-rect 568 298 622 314
-rect 410 241 526 271
-rect 410 219 440 241
-rect 496 219 526 241
-rect 582 219 612 298
-rect 668 219 698 389
-rect 754 324 784 521
-rect 840 460 870 521
-rect 826 444 880 460
-rect 826 410 836 444
-rect 870 410 880 444
-rect 826 394 880 410
-rect 922 417 952 521
-rect 1004 489 1034 521
-rect 1004 459 1048 489
-rect 1102 488 1132 521
-rect 922 401 976 417
-rect 742 308 796 324
-rect 742 274 752 308
-rect 786 274 796 308
-rect 742 258 796 274
-rect 754 219 784 258
-rect 840 219 870 394
-rect 922 367 932 401
-rect 966 367 976 401
-rect 922 351 976 367
-rect 922 219 952 351
-rect 1018 307 1048 459
-rect 1090 472 1144 488
-rect 1292 485 1322 605
-rect 1090 438 1100 472
-rect 1134 438 1144 472
-rect 1090 422 1144 438
-rect 1255 469 1322 485
-rect 1255 435 1265 469
-rect 1299 435 1322 469
-rect 1004 291 1058 307
-rect 1004 257 1014 291
-rect 1048 257 1058 291
-rect 1004 241 1058 257
-rect 1004 219 1034 241
-rect 1102 219 1132 422
-rect 1255 419 1322 435
-rect 1292 187 1322 419
-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 439 196 473
-rect 80 331 114 365
-rect 248 331 282 365
-rect 386 373 420 407
-rect 666 405 700 439
-rect 482 313 516 347
-rect 578 314 612 348
-rect 836 410 870 444
-rect 752 274 786 308
-rect 932 367 966 401
-rect 1100 438 1134 472
-rect 1265 435 1299 469
-rect 1014 257 1048 291
-<< locali >>
-rect 0 867 1408 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 1003 867
-rect 1037 827 1139 867
-rect 1173 827 1275 867
-rect 1309 827 1408 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 613 69 629
-rect 207 613 241 629
-rect 35 579 241 613
-rect 293 757 327 773
-rect 293 546 327 629
-rect 451 757 485 827
-rect 451 613 485 629
-rect 537 757 571 773
-rect 623 757 657 827
-rect 623 707 657 723
-rect 709 757 743 773
-rect 571 629 743 663
-rect 795 757 829 773
-rect 1045 757 1079 827
-rect 1045 681 1079 697
-rect 1143 757 1177 773
-rect 537 613 571 629
-rect 795 588 829 629
-rect 1143 588 1177 629
-rect 752 554 1100 588
-rect 752 553 812 554
-rect 293 509 350 546
-rect 80 473 114 479
-rect 80 439 162 473
-rect 196 439 212 473
-rect 248 365 282 405
-rect 64 331 80 365
-rect 114 331 130 365
-rect 248 315 282 331
-rect 316 291 350 509
-rect 386 479 444 513
-rect 386 407 420 479
-rect 386 357 420 373
-rect 578 348 612 479
-rect 752 510 787 553
-rect 650 405 666 439
-rect 700 405 716 439
-rect 466 313 482 347
-rect 516 313 532 347
-rect 752 376 786 510
-rect 836 444 870 479
-rect 1066 488 1100 554
-rect 1247 757 1281 827
-rect 1177 554 1202 571
-rect 1143 537 1202 554
-rect 1247 545 1281 617
-rect 1333 757 1367 773
-rect 1066 472 1134 488
-rect 820 410 836 444
-rect 870 410 886 444
-rect 1066 441 1100 472
-rect 1089 438 1100 441
-rect 1100 422 1134 438
-rect 932 401 966 405
-rect 752 342 879 376
-rect 932 351 966 367
-rect 1168 365 1202 537
-rect 1333 513 1367 617
-rect 578 298 612 314
-rect 736 274 752 308
-rect 786 291 810 308
-rect 35 215 241 249
-rect 35 189 70 215
-rect 35 171 69 189
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 207 171 241 215
-rect 207 114 241 131
-rect 293 223 350 257
-rect 293 171 327 223
-rect 537 206 743 240
-rect 293 114 327 131
-rect 451 171 485 187
-rect 451 61 485 131
-rect 537 171 571 206
-rect 709 171 743 206
-rect 845 190 879 342
-rect 1014 291 1048 331
-rect 1143 331 1202 365
-rect 1265 469 1299 485
-rect 998 257 1014 291
-rect 1048 257 1064 291
-rect 1014 256 1048 257
-rect 537 114 571 131
-rect 607 123 623 157
-rect 657 123 673 157
-rect 623 61 657 123
-rect 709 114 743 131
-rect 795 165 879 190
-rect 829 156 879 165
-rect 1045 171 1079 187
-rect 795 114 829 131
-rect 1045 61 1079 131
-rect 1143 171 1177 331
-rect 1265 291 1299 435
-rect 1245 257 1299 291
-rect 1143 115 1177 131
-rect 1247 165 1281 181
-rect 1247 61 1281 131
-rect 1333 171 1367 479
-rect 1333 115 1367 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 1003 861 1037 867
-rect 1003 833 1037 861
-rect 1139 861 1173 867
-rect 1139 833 1173 861
-rect 1275 861 1309 867
-rect 1275 833 1309 861
-rect 80 479 114 513
-rect 248 405 282 439
-rect 80 331 114 365
-rect 444 479 478 513
-rect 578 479 612 513
-rect 482 347 516 365
-rect 666 405 700 439
-rect 482 331 516 347
-rect 836 479 870 513
-rect 1143 554 1177 588
-rect 932 405 966 439
-rect 316 257 350 291
-rect 777 274 786 291
-rect 786 274 811 291
-rect 777 257 811 274
-rect 1014 331 1048 365
-rect 1211 257 1245 291
-rect 1333 479 1367 513
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 867 1408 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 1003 867
-rect 1037 833 1139 867
-rect 1173 833 1275 867
-rect 1309 833 1408 867
-rect 0 827 1408 833
-rect 1131 588 1189 594
-rect 1109 554 1143 588
-rect 1177 554 1189 588
-rect 1131 548 1189 554
-rect 68 513 126 519
-rect 432 513 490 519
-rect 566 513 624 519
-rect 824 513 882 520
-rect 1321 513 1379 519
-rect 68 479 80 513
-rect 114 479 444 513
-rect 478 479 578 513
-rect 612 479 836 513
-rect 870 479 882 513
-rect 1299 479 1333 513
-rect 1367 479 1379 513
-rect 68 473 126 479
-rect 432 473 490 479
-rect 566 473 624 479
-rect 824 472 882 479
-rect 1321 473 1379 479
-rect 236 439 296 445
-rect 650 439 717 445
-rect 920 439 978 445
-rect 236 405 248 439
-rect 282 405 666 439
-rect 700 405 932 439
-rect 966 405 978 439
-rect 236 399 296 405
-rect 650 399 717 405
-rect 920 399 978 405
-rect 68 365 126 371
-rect 470 365 528 371
-rect 1002 365 1060 371
-rect 68 331 80 365
-rect 114 331 482 365
-rect 516 331 1014 365
-rect 1048 331 1060 365
-rect 68 325 126 331
-rect 470 325 528 331
-rect 1002 325 1060 331
-rect 304 291 362 297
-rect 771 291 820 297
-rect 1199 291 1257 297
-rect 304 257 316 291
-rect 350 257 777 291
-rect 811 257 1211 291
-rect 1245 257 1257 291
-rect 304 251 362 257
-rect 771 251 820 257
-rect 1199 251 1257 257
-rect 0 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel viali 1160 571 1160 571 1 S
-port 5 n
-rlabel viali 1350 496 1350 496 1 CO
-port 6 n
-rlabel metal1 129 496 129 496 1 B
-rlabel viali 265 422 265 422 1 CI
-rlabel viali 97 348 97 348 1 A
-port 1 n
-rlabel viali 1228 274 1228 274 1 CON
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__addh_1.mag b/12T_ms/sky130_osu_sc_12T_ms__addh_1.mag
deleted file mode 100644
index 0ac2abc..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__addh_1.mag
+++ /dev/null
@@ -1,393 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864417
-<< checkpaint >>
-rect -1209 -1243 2025 2131
-<< nwell >>
-rect -9 485 837 897
-<< nmos >>
-rect 80 115 110 219
-rect 178 115 208 219
-rect 250 115 280 219
-rect 442 115 472 219
-rect 540 115 570 219
-rect 626 115 656 219
-rect 712 115 742 219
-<< pmos >>
-rect 80 521 110 773
-rect 178 521 208 773
-rect 264 521 294 773
-rect 362 521 392 773
-rect 552 521 582 773
-rect 638 521 668 773
-rect 710 521 740 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 178 219
-rect 110 131 133 171
-rect 167 131 178 171
-rect 110 115 178 131
-rect 208 115 250 219
-rect 280 171 333 219
-rect 280 131 291 171
-rect 325 131 333 171
-rect 280 115 333 131
-rect 389 171 442 219
-rect 389 131 397 171
-rect 431 131 442 171
-rect 389 115 442 131
-rect 472 171 540 219
-rect 472 131 495 171
-rect 529 131 540 171
-rect 472 115 540 131
-rect 570 171 626 219
-rect 570 131 581 171
-rect 615 131 626 171
-rect 570 115 626 131
-rect 656 171 712 219
-rect 656 131 667 171
-rect 701 131 712 171
-rect 656 115 712 131
-rect 742 171 795 219
-rect 742 131 753 171
-rect 787 131 795 171
-rect 742 115 795 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 178 773
-rect 110 561 133 757
-rect 167 561 178 757
-rect 110 521 178 561
-rect 208 757 264 773
-rect 208 629 219 757
-rect 253 629 264 757
-rect 208 521 264 629
-rect 294 757 362 773
-rect 294 629 305 757
-rect 339 629 362 757
-rect 294 521 362 629
-rect 392 757 445 773
-rect 392 561 403 757
-rect 437 561 445 757
-rect 392 521 445 561
-rect 499 757 552 773
-rect 499 561 507 757
-rect 541 561 552 757
-rect 499 521 552 561
-rect 582 757 638 773
-rect 582 561 593 757
-rect 627 561 638 757
-rect 582 521 638 561
-rect 668 521 710 773
-rect 740 757 796 773
-rect 740 561 751 757
-rect 785 561 796 757
-rect 740 521 796 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 133 131 167 171
-rect 291 131 325 171
-rect 397 131 431 171
-rect 495 131 529 171
-rect 581 131 615 171
-rect 667 131 701 171
-rect 753 131 787 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 133 561 167 757
-rect 219 629 253 757
-rect 305 629 339 757
-rect 403 561 437 757
-rect 507 561 541 757
-rect 593 561 627 757
-rect 751 561 785 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-<< poly >>
-rect 80 773 110 799
-rect 178 773 208 799
-rect 264 773 294 799
-rect 362 773 392 799
-rect 552 773 582 799
-rect 638 773 668 799
-rect 710 773 740 799
-rect 80 307 110 521
-rect 178 381 208 521
-rect 264 455 294 521
-rect 154 365 208 381
-rect 154 331 164 365
-rect 198 331 208 365
-rect 154 315 208 331
-rect 43 291 110 307
-rect 43 257 53 291
-rect 87 257 110 291
-rect 43 241 110 257
-rect 80 219 110 241
-rect 178 219 208 315
-rect 250 439 304 455
-rect 250 405 260 439
-rect 294 405 304 439
-rect 250 389 304 405
-rect 362 453 392 521
-rect 552 453 582 521
-rect 362 423 582 453
-rect 250 219 280 389
-rect 362 328 392 423
-rect 638 381 668 521
-rect 710 455 740 521
-rect 710 439 764 455
-rect 710 405 720 439
-rect 754 405 764 439
-rect 710 389 764 405
-rect 338 312 392 328
-rect 614 365 668 381
-rect 614 331 624 365
-rect 658 331 668 365
-rect 614 315 668 331
-rect 338 278 348 312
-rect 382 279 392 312
-rect 382 278 570 279
-rect 338 249 570 278
-rect 442 219 472 249
-rect 540 219 570 249
-rect 626 219 656 315
-rect 712 219 742 389
-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 331 198 365
-rect 53 257 87 291
-rect 260 405 294 439
-rect 720 405 754 439
-rect 624 331 658 365
-rect 348 278 382 312
-<< locali >>
-rect 0 867 836 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 836 867
-rect 35 757 69 773
-rect 35 527 69 553
-rect 133 757 167 827
-rect 133 545 167 561
-rect 219 757 253 773
-rect 219 523 253 629
-rect 305 757 339 827
-rect 305 613 339 629
-rect 403 757 437 773
-rect 219 489 362 523
-rect 260 439 294 455
-rect 260 389 294 405
-rect 148 331 164 365
-rect 198 331 214 365
-rect 328 328 362 489
-rect 403 513 437 561
-rect 507 757 541 773
-rect 403 479 418 513
-rect 328 312 382 328
-rect 328 296 348 312
-rect 37 257 53 291
-rect 87 257 110 291
-rect 291 278 348 296
-rect 291 262 382 278
-rect 35 171 69 182
-rect 35 115 69 131
-rect 133 171 167 187
-rect 133 61 167 131
-rect 291 171 325 262
-rect 418 216 452 479
-rect 507 511 541 561
-rect 593 757 627 827
-rect 593 545 627 561
-rect 751 757 785 773
-rect 751 511 785 561
-rect 507 477 785 511
-rect 507 291 541 477
-rect 704 405 720 439
-rect 754 405 770 439
-rect 608 331 624 365
-rect 658 331 674 365
-rect 541 257 667 291
-rect 291 115 325 131
-rect 397 181 452 216
-rect 397 171 431 181
-rect 397 115 431 131
-rect 495 171 529 187
-rect 495 61 529 131
-rect 581 171 615 187
-rect 667 171 701 257
-rect 615 131 667 144
-rect 753 171 787 187
-rect 701 131 753 144
-rect 581 110 787 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 35 561 69 587
-rect 35 553 69 561
-rect 260 405 294 439
-rect 164 331 198 365
-rect 418 479 452 513
-rect 110 257 144 291
-rect 35 182 69 216
-rect 720 405 754 439
-rect 624 331 658 365
-rect 507 257 541 291
-rect 667 257 701 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 867 836 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 836 867
-rect 0 827 836 833
-rect 23 587 81 593
-rect 23 553 35 587
-rect 69 553 81 587
-rect 23 547 81 553
-rect 35 222 69 547
-rect 406 513 464 519
-rect 406 479 418 513
-rect 452 479 486 513
-rect 406 473 464 479
-rect 248 439 306 445
-rect 708 439 766 445
-rect 248 405 260 439
-rect 294 405 720 439
-rect 754 405 766 439
-rect 248 404 766 405
-rect 248 399 306 404
-rect 708 399 766 404
-rect 152 366 210 371
-rect 612 366 670 371
-rect 152 365 670 366
-rect 152 331 164 365
-rect 198 331 624 365
-rect 658 331 670 365
-rect 152 325 210 331
-rect 612 325 670 331
-rect 98 291 156 297
-rect 495 291 553 297
-rect 655 291 713 297
-rect 98 257 110 291
-rect 144 257 507 291
-rect 541 257 553 291
-rect 633 257 667 291
-rect 701 257 713 291
-rect 98 251 156 257
-rect 495 251 553 257
-rect 655 251 713 257
-rect 23 216 81 222
-rect 23 182 35 216
-rect 69 182 81 216
-rect 23 176 81 182
-rect 0 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 381 50 381 1 S
-port 1 n
-rlabel viali 737 422 737 422 1 A
-port 2 n
-rlabel viali 642 348 642 348 1 B
-port 3 n
-rlabel viali 435 496 435 496 1 CO
-port 4 n
-rlabel viali 684 274 684 274 1 CON
-port 5 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__addh_l.mag b/12T_ms/sky130_osu_sc_12T_ms__addh_l.mag
deleted file mode 100644
index c390a71..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__addh_l.mag
+++ /dev/null
@@ -1,396 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864417
-<< checkpaint >>
-rect -1209 -1243 2025 2131
-<< nwell >>
-rect -9 485 837 897
-<< nmos >>
-rect 80 115 110 187
-rect 178 115 208 219
-rect 250 115 280 219
-rect 442 115 472 187
-rect 540 115 570 219
-rect 626 115 656 219
-rect 712 115 742 219
-<< pmos >>
-rect 80 606 110 773
-rect 178 521 208 773
-rect 264 521 294 773
-rect 362 605 392 773
-rect 552 521 582 773
-rect 638 521 668 773
-rect 710 521 740 773
-<< ndiff >>
-rect 125 187 178 219
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 171 178 187
-rect 110 131 133 171
-rect 167 131 178 171
-rect 110 115 178 131
-rect 208 115 250 219
-rect 280 171 333 219
-rect 487 187 540 219
-rect 280 131 291 171
-rect 325 131 333 171
-rect 280 115 333 131
-rect 389 165 442 187
-rect 389 131 397 165
-rect 431 131 442 165
-rect 389 115 442 131
-rect 472 171 540 187
-rect 472 131 495 171
-rect 529 131 540 171
-rect 472 115 540 131
-rect 570 171 626 219
-rect 570 131 581 171
-rect 615 131 626 171
-rect 570 115 626 131
-rect 656 171 712 219
-rect 656 131 667 171
-rect 701 131 712 171
-rect 656 115 712 131
-rect 742 171 795 219
-rect 742 131 753 171
-rect 787 131 795 171
-rect 742 115 795 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 606 80 621
-rect 110 757 178 773
-rect 110 606 133 757
-rect 125 561 133 606
-rect 167 561 178 757
-rect 125 521 178 561
-rect 208 757 264 773
-rect 208 629 219 757
-rect 253 629 264 757
-rect 208 521 264 629
-rect 294 757 362 773
-rect 294 629 305 757
-rect 339 629 362 757
-rect 294 605 362 629
-rect 392 757 445 773
-rect 392 621 403 757
-rect 437 621 445 757
-rect 392 605 445 621
-rect 499 757 552 773
-rect 294 521 347 605
-rect 499 561 507 757
-rect 541 561 552 757
-rect 499 521 552 561
-rect 582 757 638 773
-rect 582 561 593 757
-rect 627 561 638 757
-rect 582 521 638 561
-rect 668 521 710 773
-rect 740 757 796 773
-rect 740 561 751 757
-rect 785 561 796 757
-rect 740 521 796 561
-<< ndiffc >>
-rect 35 131 69 165
-rect 133 131 167 171
-rect 291 131 325 171
-rect 397 131 431 165
-rect 495 131 529 171
-rect 581 131 615 171
-rect 667 131 701 171
-rect 753 131 787 171
-<< pdiffc >>
-rect 35 621 69 757
-rect 133 561 167 757
-rect 219 629 253 757
-rect 305 629 339 757
-rect 403 621 437 757
-rect 507 561 541 757
-rect 593 561 627 757
-rect 751 561 785 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-<< poly >>
-rect 80 773 110 799
-rect 178 773 208 799
-rect 264 773 294 799
-rect 362 773 392 799
-rect 552 773 582 799
-rect 638 773 668 799
-rect 710 773 740 799
-rect 80 307 110 606
-rect 178 381 208 521
-rect 264 455 294 521
-rect 154 365 208 381
-rect 154 331 164 365
-rect 198 331 208 365
-rect 154 315 208 331
-rect 43 291 110 307
-rect 43 257 53 291
-rect 87 257 110 291
-rect 43 241 110 257
-rect 80 187 110 241
-rect 178 219 208 315
-rect 250 439 304 455
-rect 250 405 260 439
-rect 294 405 304 439
-rect 250 389 304 405
-rect 362 453 392 605
-rect 552 453 582 521
-rect 362 423 582 453
-rect 250 219 280 389
-rect 362 328 392 423
-rect 638 381 668 521
-rect 710 455 740 521
-rect 710 439 764 455
-rect 710 405 720 439
-rect 754 405 764 439
-rect 710 389 764 405
-rect 338 312 392 328
-rect 614 365 668 381
-rect 614 331 624 365
-rect 658 331 668 365
-rect 614 315 668 331
-rect 338 278 348 312
-rect 382 279 392 312
-rect 382 278 570 279
-rect 338 249 570 278
-rect 442 187 472 249
-rect 540 219 570 249
-rect 626 219 656 315
-rect 712 219 742 389
-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 331 198 365
-rect 53 257 87 291
-rect 260 405 294 439
-rect 720 405 754 439
-rect 624 331 658 365
-rect 348 278 382 312
-<< locali >>
-rect 0 867 836 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 836 867
-rect 35 757 69 773
-rect 35 587 69 621
-rect 133 757 167 827
-rect 133 545 167 561
-rect 219 757 253 773
-rect 219 523 253 629
-rect 305 757 339 827
-rect 305 613 339 629
-rect 403 757 437 773
-rect 219 489 362 523
-rect 260 439 294 455
-rect 260 389 294 405
-rect 148 331 164 365
-rect 198 331 214 365
-rect 328 328 362 489
-rect 403 513 437 621
-rect 507 757 541 773
-rect 403 479 418 513
-rect 328 312 382 328
-rect 328 296 348 312
-rect 37 257 53 291
-rect 87 257 110 291
-rect 291 278 348 296
-rect 291 262 382 278
-rect 35 165 69 182
-rect 35 115 69 131
-rect 133 171 167 187
-rect 133 61 167 131
-rect 291 171 325 262
-rect 418 216 452 479
-rect 507 511 541 561
-rect 593 757 627 827
-rect 593 545 627 561
-rect 751 757 785 773
-rect 751 511 785 561
-rect 507 477 785 511
-rect 507 291 541 477
-rect 704 405 720 439
-rect 754 405 770 439
-rect 608 331 624 365
-rect 658 331 674 365
-rect 541 257 667 291
-rect 291 115 325 131
-rect 397 181 452 216
-rect 397 165 431 181
-rect 397 115 431 131
-rect 495 171 529 187
-rect 495 61 529 131
-rect 581 171 615 187
-rect 667 171 701 257
-rect 615 131 667 144
-rect 753 171 787 187
-rect 701 131 753 144
-rect 581 110 787 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 35 553 69 587
-rect 260 405 294 439
-rect 164 331 198 365
-rect 418 479 452 513
-rect 110 257 144 291
-rect 35 182 69 216
-rect 720 405 754 439
-rect 624 331 658 365
-rect 507 257 541 291
-rect 667 257 701 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 867 836 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 836 867
-rect 0 827 836 833
-rect 23 587 81 593
-rect 23 553 35 587
-rect 69 553 81 587
-rect 23 547 81 553
-rect 35 222 69 547
-rect 406 513 464 519
-rect 406 479 418 513
-rect 452 479 486 513
-rect 406 473 464 479
-rect 248 439 306 445
-rect 708 439 766 445
-rect 248 405 260 439
-rect 294 405 720 439
-rect 754 405 766 439
-rect 248 404 766 405
-rect 248 399 306 404
-rect 708 399 766 404
-rect 152 366 210 371
-rect 612 366 670 371
-rect 152 365 670 366
-rect 152 331 164 365
-rect 198 331 624 365
-rect 658 331 670 365
-rect 152 325 210 331
-rect 612 325 670 331
-rect 98 291 156 297
-rect 495 291 553 297
-rect 655 291 713 297
-rect 98 257 110 291
-rect 144 257 507 291
-rect 541 257 553 291
-rect 633 257 667 291
-rect 701 257 713 291
-rect 98 251 156 257
-rect 495 251 553 257
-rect 655 251 713 257
-rect 23 216 81 222
-rect 23 182 35 216
-rect 69 182 81 216
-rect 23 176 81 182
-rect 0 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 381 50 381 1 S
-port 1 n
-rlabel viali 737 422 737 422 1 A
-port 2 n
-rlabel viali 642 348 642 348 1 B
-port 3 n
-rlabel viali 435 496 435 496 1 CO
-port 4 n
-rlabel viali 684 274 684 274 1 CON
-port 5 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__and2_1.mag b/12T_ms/sky130_osu_sc_12T_ms__and2_1.mag
deleted file mode 100644
index 0089c69..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__and2_1.mag
+++ /dev/null
@@ -1,188 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864417
-<< checkpaint >>
-rect -1269 2461 1634 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1634 -1129
-<< nwell >>
-rect -9 485 374 897
-<< nmos >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 252 115 282 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 219
-rect 182 171 252 219
-rect 182 131 193 171
-rect 227 131 252 171
-rect 182 115 252 131
-rect 282 171 335 219
-rect 282 131 293 171
-rect 327 131 335 171
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 335 773
-rect 282 561 293 757
-rect 327 561 335 757
-rect 282 521 335 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-rect 293 131 327 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 629 155 757
-rect 207 629 241 757
-rect 293 561 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 490 110 521
-rect 27 474 110 490
-rect 27 440 37 474
-rect 71 440 110 474
-rect 27 424 110 440
-rect 80 219 110 424
-rect 166 422 196 521
-rect 252 496 282 521
-rect 252 466 289 496
-rect 152 406 217 422
-rect 152 372 173 406
-rect 207 372 217 406
-rect 152 356 217 372
-rect 152 219 182 356
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 274 313 308
-rect 252 258 313 274
-rect 252 219 282 258
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 440 71 474
-rect 173 372 207 406
-rect 269 274 303 308
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 105 629 121 647
-rect 105 613 155 629
-rect 207 757 241 827
-rect 207 613 241 629
-rect 293 757 327 773
-rect 37 474 71 553
-rect 37 424 71 440
-rect 105 308 139 613
-rect 173 406 207 479
-rect 293 439 327 561
-rect 173 356 207 372
-rect 35 274 269 308
-rect 303 274 319 308
-rect 35 171 69 274
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 37 553 71 587
-rect 173 479 207 513
-rect 293 405 327 439
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 25 587 83 593
-rect 25 553 37 587
-rect 71 553 105 587
-rect 25 547 83 553
-rect 161 513 219 519
-rect 140 479 173 513
-rect 207 479 219 513
-rect 161 473 219 479
-rect 281 439 339 445
-rect 281 405 293 439
-rect 327 405 339 439
-rect 281 399 339 405
-rect 293 223 327 399
-rect 281 217 339 223
-rect 281 183 293 217
-rect 327 183 339 217
-rect 281 177 339 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 55 570 55 570 1 A
-port 2 n
-rlabel viali 191 496 191 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__and2_2.mag b/12T_ms/sky130_osu_sc_12T_ms__and2_2.mag
deleted file mode 100644
index 927414f..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__and2_2.mag
+++ /dev/null
@@ -1,223 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864418
-<< checkpaint >>
-rect -1269 2461 1722 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1722 -1129
-<< nwell >>
-rect -9 485 462 897
-<< nmos >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 252 115 282 219
-rect 338 115 368 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 219
-rect 182 171 252 219
-rect 182 131 193 171
-rect 227 131 252 171
-rect 182 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 421 219
-rect 368 131 379 171
-rect 413 131 421 171
-rect 368 115 421 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 421 773
-rect 368 561 379 757
-rect 413 561 421 757
-rect 368 521 421 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-rect 293 131 327 171
-rect 379 131 413 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 629 155 757
-rect 207 629 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 80 490 110 521
-rect 27 474 110 490
-rect 27 440 37 474
-rect 71 440 110 474
-rect 27 424 110 440
-rect 80 219 110 424
-rect 166 422 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 252 466 368 496
-rect 152 406 217 422
-rect 152 372 173 406
-rect 207 372 217 406
-rect 152 356 217 372
-rect 152 219 182 356
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 303 274 368 288
-rect 252 258 368 274
-rect 252 219 282 258
-rect 338 219 368 258
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 37 440 71 474
-rect 173 372 207 406
-rect 269 274 303 308
-<< locali >>
-rect 0 867 462 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 462 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 105 629 121 647
-rect 105 613 155 629
-rect 207 757 241 827
-rect 207 613 241 629
-rect 293 757 327 773
-rect 37 474 71 553
-rect 37 424 71 440
-rect 105 308 139 613
-rect 173 406 207 479
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 173 356 207 372
-rect 35 274 269 308
-rect 303 274 319 308
-rect 35 171 69 274
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 37 553 71 587
-rect 173 479 207 513
-rect 293 405 327 439
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 462 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 462 867
-rect 0 827 462 833
-rect 25 587 83 593
-rect 25 553 37 587
-rect 71 553 105 587
-rect 25 547 83 553
-rect 161 513 219 519
-rect 140 479 173 513
-rect 207 479 219 513
-rect 161 473 219 479
-rect 281 439 339 445
-rect 281 405 293 439
-rect 327 405 339 439
-rect 281 399 339 405
-rect 293 223 327 399
-rect 281 217 339 223
-rect 281 183 293 217
-rect 327 183 339 217
-rect 281 177 339 183
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 191 496 191 496 1 B
-port 1 n
-rlabel viali 55 570 55 570 1 A
-port 2 n
-rlabel metal1 311 348 311 348 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__and2_4.mag b/12T_ms/sky130_osu_sc_12T_ms__and2_4.mag
deleted file mode 100644
index 3859349..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__and2_4.mag
+++ /dev/null
@@ -1,286 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864418
-<< checkpaint >>
-rect -1269 2461 1898 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1898 -1129
-<< nwell >>
-rect -9 485 638 897
-<< nmos >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 219
-rect 182 171 252 219
-rect 182 131 193 171
-rect 227 131 252 171
-rect 182 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 593 219
-rect 540 131 551 171
-rect 585 131 593 171
-rect 540 115 593 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 593 773
-rect 540 561 551 757
-rect 585 561 593 757
-rect 540 521 593 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 629 155 757
-rect 207 629 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 424 773 454 799
-rect 510 773 540 799
-rect 80 490 110 521
-rect 27 474 110 490
-rect 27 440 37 474
-rect 71 440 110 474
-rect 27 424 110 440
-rect 80 219 110 424
-rect 166 422 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 252 466 540 496
-rect 152 406 217 422
-rect 152 372 173 406
-rect 207 372 217 406
-rect 152 356 217 372
-rect 152 219 182 356
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 303 274 540 288
-rect 252 258 540 274
-rect 252 219 282 258
-rect 338 219 368 258
-rect 424 219 454 258
-rect 510 219 540 258
-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 440 71 474
-rect 173 372 207 406
-rect 269 274 303 308
-<< locali >>
-rect 0 867 638 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 638 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 105 629 121 647
-rect 105 613 155 629
-rect 207 757 241 827
-rect 207 613 241 629
-rect 293 757 327 773
-rect 37 474 71 553
-rect 37 424 71 440
-rect 105 308 139 613
-rect 173 406 207 479
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 439 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 173 356 207 372
-rect 35 274 269 308
-rect 303 274 319 308
-rect 35 171 69 274
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 37 553 71 587
-rect 173 479 207 513
-rect 293 405 327 439
-rect 465 405 499 439
-rect 293 183 327 217
-rect 465 183 499 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 638 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 638 867
-rect 0 827 638 833
-rect 25 587 83 593
-rect 25 553 37 587
-rect 71 553 105 587
-rect 25 547 83 553
-rect 161 513 219 519
-rect 140 479 173 513
-rect 207 479 219 513
-rect 161 473 219 479
-rect 281 439 339 445
-rect 453 439 511 445
-rect 281 405 293 439
-rect 327 405 465 439
-rect 499 405 511 439
-rect 281 399 339 405
-rect 453 399 511 405
-rect 293 223 327 399
-rect 465 223 499 399
-rect 281 217 339 223
-rect 453 217 511 223
-rect 281 183 293 217
-rect 327 183 465 217
-rect 499 183 511 217
-rect 281 177 339 183
-rect 453 177 511 183
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 55 570 55 570 1 A
-port 2 n
-rlabel viali 191 496 191 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__and2_6.mag b/12T_ms/sky130_osu_sc_12T_ms__and2_6.mag
deleted file mode 100644
index 94c37cb..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__and2_6.mag
+++ /dev/null
@@ -1,315 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604092967
-<< checkpaint >>
-rect -1269 2461 2074 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2074 -1129
-<< nwell >>
-rect -9 485 814 897
-<< nmos >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-rect 596 115 626 219
-rect 682 115 712 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 219
-rect 182 171 252 219
-rect 182 131 193 171
-rect 227 131 252 171
-rect 182 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 219
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 219
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 765 219
-rect 712 131 723 171
-rect 757 131 765 171
-rect 712 115 765 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 765 773
-rect 712 561 723 757
-rect 757 561 765 757
-rect 712 521 765 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 629 155 757
-rect 207 629 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 80 490 110 521
-rect 20 474 110 490
-rect 20 440 30 474
-rect 64 440 110 474
-rect 20 424 110 440
-rect 80 219 110 424
-rect 166 423 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 596 496 626 521
-rect 682 496 712 521
-rect 252 466 712 496
-rect 152 406 210 423
-rect 152 372 166 406
-rect 200 372 210 406
-rect 152 356 210 372
-rect 152 219 182 356
-rect 252 324 282 466
-rect 252 308 306 324
-rect 252 274 262 308
-rect 296 288 306 308
-rect 596 288 626 466
-rect 296 274 712 288
-rect 252 258 712 274
-rect 252 219 282 258
-rect 338 219 368 258
-rect 424 219 454 258
-rect 510 219 540 258
-rect 596 219 626 258
-rect 682 219 712 258
-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 440 64 474
-rect 166 372 200 406
-rect 262 274 296 308
-<< locali >>
-rect 0 861 814 888
-rect 0 827 51 861
-rect 85 827 187 861
-rect 221 827 323 861
-rect 357 827 459 861
-rect 493 827 595 861
-rect 629 827 814 861
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 98 629 121 647
-rect 98 613 155 629
-rect 207 757 241 827
-rect 207 613 241 629
-rect 293 757 327 773
-rect 30 474 64 553
-rect 30 424 64 440
-rect 98 308 132 613
-rect 166 406 200 479
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 439 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 637 757 671 773
-rect 637 439 671 561
-rect 723 757 757 827
-rect 723 545 757 561
-rect 166 356 200 372
-rect 35 274 262 308
-rect 296 274 312 308
-rect 35 171 69 274
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 637 171 671 183
-rect 637 115 671 131
-rect 723 171 757 187
-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 553 64 587
-rect 166 479 200 513
-rect 293 405 327 439
-rect 465 405 499 439
-rect 637 405 671 439
-rect 293 183 327 217
-rect 465 183 499 217
-rect 637 183 671 217
-<< metal1 >>
-rect 0 827 814 888
-rect 18 587 76 593
-rect 18 553 30 587
-rect 64 553 98 587
-rect 18 547 76 553
-rect 154 513 212 519
-rect 132 479 166 513
-rect 200 479 212 513
-rect 154 473 212 479
-rect 281 439 339 445
-rect 453 439 511 445
-rect 625 439 683 445
-rect 281 405 293 439
-rect 327 405 465 439
-rect 499 405 637 439
-rect 671 405 683 439
-rect 281 399 339 405
-rect 453 399 511 405
-rect 625 399 683 405
-rect 293 223 327 399
-rect 465 223 499 399
-rect 637 223 671 399
-rect 281 217 339 223
-rect 453 217 511 223
-rect 625 217 683 223
-rect 281 183 293 217
-rect 327 183 465 217
-rect 499 183 637 217
-rect 671 183 683 217
-rect 281 177 339 183
-rect 453 177 511 183
-rect 625 177 683 183
-rect 0 0 814 61
-<< labels >>
-rlabel viali 184 496 184 496 1 B
-port 1 n
-rlabel viali 48 570 48 570 1 A
-port 2 n
-rlabel metal1 311 348 311 348 1 Y
-port 3 n
-rlabel metal1 68 844 68 844 1 vdd
-rlabel metal1 68 44 68 44 1 gnd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__and2_8.mag b/12T_ms/sky130_osu_sc_12T_ms__and2_8.mag
deleted file mode 100644
index 8acc988..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__and2_8.mag
+++ /dev/null
@@ -1,428 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864418
-<< checkpaint >>
-rect -1269 2461 2250 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2250 -1129
-<< nwell >>
-rect -9 485 990 897
-<< nmos >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-rect 596 115 626 219
-rect 682 115 712 219
-rect 768 115 798 219
-rect 854 115 884 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-rect 768 521 798 773
-rect 854 521 884 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 219
-rect 182 171 252 219
-rect 182 131 193 171
-rect 227 131 252 171
-rect 182 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 219
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 219
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 768 219
-rect 712 131 723 171
-rect 757 131 768 171
-rect 712 115 768 131
-rect 798 171 854 219
-rect 798 131 809 171
-rect 843 131 854 171
-rect 798 115 854 131
-rect 884 171 937 219
-rect 884 131 895 171
-rect 929 131 937 171
-rect 884 115 937 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 757 252 773
-rect 196 629 207 757
-rect 241 629 252 757
-rect 196 521 252 629
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 768 773
-rect 712 561 723 757
-rect 757 561 768 757
-rect 712 521 768 561
-rect 798 757 854 773
-rect 798 561 809 757
-rect 843 561 854 757
-rect 798 521 854 561
-rect 884 757 937 773
-rect 884 561 895 757
-rect 929 561 937 757
-rect 884 521 937 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-rect 809 131 843 171
-rect 895 131 929 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 629 155 757
-rect 207 629 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-rect 809 561 843 757
-rect 895 561 929 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 768 773 798 799
-rect 854 773 884 799
-rect 80 490 110 521
-rect 27 474 110 490
-rect 27 440 37 474
-rect 71 440 110 474
-rect 27 424 110 440
-rect 80 219 110 424
-rect 166 422 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 596 496 626 521
-rect 682 496 712 521
-rect 768 496 798 521
-rect 854 496 884 521
-rect 252 466 884 496
-rect 152 406 217 422
-rect 152 372 173 406
-rect 207 372 217 406
-rect 152 356 217 372
-rect 152 219 182 356
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 596 288 626 466
-rect 303 274 884 288
-rect 252 258 884 274
-rect 252 219 282 258
-rect 338 219 368 258
-rect 424 219 454 258
-rect 510 219 540 258
-rect 596 219 626 258
-rect 682 219 712 258
-rect 768 219 798 258
-rect 854 219 884 258
-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 440 71 474
-rect 173 372 207 406
-rect 269 274 303 308
-<< locali >>
-rect 0 867 990 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 990 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 105 629 121 647
-rect 105 613 155 629
-rect 207 757 241 827
-rect 207 613 241 629
-rect 293 757 327 773
-rect 37 474 71 553
-rect 37 424 71 440
-rect 105 308 139 613
-rect 173 406 207 479
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 439 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 637 757 671 773
-rect 637 439 671 561
-rect 723 757 757 827
-rect 723 545 757 561
-rect 809 757 843 773
-rect 809 439 843 561
-rect 895 757 929 827
-rect 895 545 929 561
-rect 173 356 207 372
-rect 35 274 269 308
-rect 303 274 319 308
-rect 35 171 69 274
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 637 171 671 183
-rect 637 115 671 131
-rect 723 171 757 187
-rect 723 61 757 131
-rect 809 171 843 183
-rect 809 115 843 131
-rect 895 171 929 187
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 37 553 71 587
-rect 173 479 207 513
-rect 293 405 327 439
-rect 465 405 499 439
-rect 637 405 671 439
-rect 809 405 843 439
-rect 293 183 327 217
-rect 465 183 499 217
-rect 637 183 671 217
-rect 809 183 843 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 867 990 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 990 867
-rect 0 827 990 833
-rect 25 587 83 593
-rect 25 553 37 587
-rect 71 553 105 587
-rect 25 547 83 553
-rect 161 513 219 519
-rect 140 479 173 513
-rect 207 479 219 513
-rect 161 473 219 479
-rect 281 439 339 445
-rect 453 439 511 445
-rect 625 439 683 445
-rect 797 439 855 445
-rect 281 405 293 439
-rect 327 405 465 439
-rect 499 405 637 439
-rect 671 405 809 439
-rect 843 405 855 439
-rect 281 399 339 405
-rect 453 399 511 405
-rect 625 399 683 405
-rect 797 399 855 405
-rect 293 223 327 399
-rect 465 223 499 399
-rect 637 223 671 399
-rect 809 223 843 399
-rect 281 217 339 223
-rect 453 217 511 223
-rect 625 217 683 223
-rect 797 217 855 223
-rect 281 183 293 217
-rect 327 183 465 217
-rect 499 183 637 217
-rect 671 183 683 217
-rect 712 183 809 217
-rect 843 183 855 217
-rect 281 177 339 183
-rect 453 177 511 183
-rect 625 177 683 183
-rect 797 177 855 183
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel viali 191 496 191 496 1 B
-port 1 n
-rlabel viali 55 570 55 570 1 A
-port 2 n
-rlabel metal1 311 348 311 348 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__and2_l.mag b/12T_ms/sky130_osu_sc_12T_ms__and2_l.mag
deleted file mode 100644
index 23b839e..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__and2_l.mag
+++ /dev/null
@@ -1,183 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864418
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 374 897
-<< nmos >>
-rect 80 115 110 187
-rect 152 115 182 187
-rect 252 115 282 187
-<< pmos >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 252 605 282 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 115 152 187
-rect 182 165 252 187
-rect 182 131 193 165
-rect 227 131 252 165
-rect 182 115 252 131
-rect 282 165 335 187
-rect 282 131 293 165
-rect 327 131 335 165
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 605 80 621
-rect 110 757 166 773
-rect 110 621 121 757
-rect 155 621 166 757
-rect 110 605 166 621
-rect 196 757 252 773
-rect 196 621 207 757
-rect 241 621 252 757
-rect 196 605 252 621
-rect 282 757 335 773
-rect 282 621 293 757
-rect 327 621 335 757
-rect 282 605 335 621
-<< ndiffc >>
-rect 35 131 69 165
-rect 193 131 227 165
-rect 293 131 327 165
-<< pdiffc >>
-rect 35 621 69 757
-rect 121 621 155 757
-rect 207 621 241 757
-rect 293 621 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 565 110 605
-rect 27 549 110 565
-rect 27 515 37 549
-rect 71 515 110 549
-rect 27 499 110 515
-rect 80 187 110 499
-rect 166 496 196 605
-rect 252 570 282 605
-rect 252 540 289 570
-rect 152 479 217 496
-rect 152 445 173 479
-rect 207 445 217 479
-rect 152 429 217 445
-rect 152 187 182 429
-rect 259 398 289 540
-rect 259 368 313 398
-rect 259 348 269 368
-rect 252 334 269 348
-rect 303 334 313 368
-rect 252 318 313 334
-rect 252 187 282 318
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 515 71 549
-rect 173 445 207 479
-rect 269 334 303 368
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 827
-rect 121 757 155 773
-rect 35 605 69 621
-rect 105 621 121 639
-rect 105 605 155 621
-rect 207 757 241 827
-rect 207 605 241 621
-rect 293 757 327 773
-rect 37 549 71 565
-rect 37 513 71 515
-rect 105 368 139 605
-rect 293 513 327 621
-rect 173 429 207 445
-rect 35 334 269 368
-rect 303 334 319 368
-rect 35 165 69 334
-rect 35 115 69 131
-rect 193 165 227 181
-rect 193 61 227 131
-rect 293 165 327 257
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 37 479 71 513
-rect 173 479 207 513
-rect 293 479 327 513
-rect 293 257 327 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 25 513 83 519
-rect 161 513 219 519
-rect 281 513 339 519
-rect 25 479 37 513
-rect 71 479 104 513
-rect 161 479 173 513
-rect 207 479 241 513
-rect 281 479 293 513
-rect 327 479 339 513
-rect 25 473 83 479
-rect 161 473 219 479
-rect 281 473 339 479
-rect 293 297 327 473
-rect 281 291 339 297
-rect 281 257 293 291
-rect 327 257 339 291
-rect 281 251 339 257
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel viali 54 497 54 497 1 A
-rlabel metal1 311 422 311 422 1 Y
-port 1 n
-rlabel viali 190 496 190 496 1 B
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__ant.mag b/12T_ms/sky130_osu_sc_12T_ms__ant.mag
deleted file mode 100644
index 538b57c..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__ant.mag
+++ /dev/null
@@ -1,103 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864419
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 485 199 897
-<< nmos >>
-rect 80 115 110 219
-<< pmos >>
-rect 80 521 110 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 561 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 455 110 521
-rect 35 439 110 455
-rect 35 405 47 439
-rect 81 405 110 439
-rect 35 389 110 405
-rect 80 219 110 389
-rect 80 89 110 115
-<< polycont >>
-rect 47 405 81 439
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 773
-rect 35 439 69 561
-rect 121 757 155 827
-rect 121 545 155 561
-rect 31 405 47 439
-rect 81 405 97 439
-rect 35 321 69 405
-rect 35 287 155 321
-rect 35 171 69 287
-rect 35 115 69 131
-rect 121 171 155 287
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 47 405 81 439
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 35 439 108 445
-rect 35 405 47 439
-rect 81 405 108 439
-rect 35 399 108 405
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 422 64 422 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__antfill.mag b/12T_ms/sky130_osu_sc_12T_ms__antfill.mag
deleted file mode 100644
index bfa70aa..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__antfill.mag
+++ /dev/null
@@ -1,60 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864419
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 485 199 897
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 439 69 773
-rect 121 545 155 827
-rect 31 405 47 439
-rect 81 405 97 439
-rect 35 321 69 405
-rect 35 287 155 321
-rect 35 115 69 287
-rect 121 115 155 287
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 47 405 81 439
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 35 439 108 445
-rect 35 405 47 439
-rect 81 405 108 439
-rect 35 399 108 405
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 422 64 422 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__aoi21_l.mag b/12T_ms/sky130_osu_sc_12T_ms__aoi21_l.mag
deleted file mode 100644
index 5a08cf3..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__aoi21_l.mag
+++ /dev/null
@@ -1,199 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864419
-<< checkpaint >>
-rect -1209 -1244 1481 2131
-<< nwell >>
-rect -10 485 374 897
-<< nmos >>
-rect 80 114 110 218
-rect 152 114 182 218
-rect 250 114 280 186
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-<< ndiff >>
-rect 27 164 80 218
-rect 27 130 35 164
-rect 69 130 80 164
-rect 27 114 80 130
-rect 110 114 152 218
-rect 182 186 233 218
-rect 182 164 250 186
-rect 182 130 193 164
-rect 227 130 250 164
-rect 182 114 250 130
-rect 280 164 333 186
-rect 280 130 291 164
-rect 325 130 333 164
-rect 280 114 333 130
-<< pdiff >>
-rect 27 757 80 773
-rect 27 696 35 757
-rect 69 696 80 757
-rect 27 521 80 696
-rect 110 757 166 773
-rect 110 696 121 757
-rect 155 696 166 757
-rect 110 521 166 696
-rect 196 757 252 773
-rect 196 697 207 757
-rect 241 697 252 757
-rect 196 521 252 697
-rect 282 757 335 773
-rect 282 643 293 757
-rect 327 643 335 757
-rect 282 521 335 643
-<< ndiffc >>
-rect 35 130 69 164
-rect 193 130 227 164
-rect 291 130 325 164
-<< pdiffc >>
-rect 35 696 69 757
-rect 121 696 155 757
-rect 207 697 241 757
-rect 293 643 327 757
-<< psubdiff >>
-rect 27 26 51 60
-rect 85 26 109 60
-rect 163 26 187 60
-rect 221 26 245 60
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 26 85 60
-rect 187 26 221 60
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 484 110 521
-rect 44 474 110 484
-rect 44 440 60 474
-rect 94 440 110 474
-rect 44 430 110 440
-rect 44 274 74 430
-rect 166 388 196 521
-rect 252 504 282 521
-rect 252 474 309 504
-rect 134 372 196 388
-rect 134 338 146 372
-rect 180 338 196 372
-rect 134 322 196 338
-rect 44 242 110 274
-rect 80 218 110 242
-rect 152 218 182 322
-rect 279 309 309 474
-rect 279 293 333 309
-rect 279 275 289 293
-rect 250 259 289 275
-rect 323 259 333 293
-rect 250 243 333 259
-rect 250 186 280 243
-rect 80 88 110 114
-rect 152 88 182 114
-rect 250 88 280 114
-<< polycont >>
-rect 60 440 94 474
-rect 146 338 180 372
-rect 289 259 323 293
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 35 646 69 696
-rect 121 757 155 827
-rect 121 680 155 696
-rect 207 757 241 773
-rect 207 646 241 697
-rect 35 612 241 646
-rect 293 757 327 773
-rect 60 474 94 490
-rect 60 439 94 440
-rect 128 388 162 479
-rect 128 372 180 388
-rect 128 338 146 372
-rect 128 322 180 338
-rect 216 293 250 405
-rect 293 365 327 643
-rect 216 259 289 293
-rect 323 259 339 293
-rect 193 217 227 218
-rect 35 164 69 186
-rect 35 60 69 130
-rect 193 164 227 183
-rect 193 114 227 130
-rect 291 164 325 180
-rect 291 60 325 130
-rect 0 20 51 60
-rect 85 20 187 60
-rect 221 20 374 60
-rect 0 0 374 20
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 60 405 94 439
-rect 128 479 162 513
-rect 216 405 250 439
-rect 293 331 327 365
-rect 193 183 227 217
-rect 51 26 85 54
-rect 51 20 85 26
-rect 187 26 221 54
-rect 187 20 221 26
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 116 513 174 519
-rect 116 479 128 513
-rect 162 479 196 513
-rect 116 473 174 479
-rect 48 439 106 445
-rect 204 439 262 445
-rect 48 405 60 439
-rect 94 405 128 439
-rect 182 405 216 439
-rect 250 405 262 439
-rect 48 399 106 405
-rect 204 399 262 405
-rect 281 365 339 371
-rect 281 331 293 365
-rect 327 331 339 365
-rect 281 325 339 331
-rect 181 218 233 223
-rect 293 218 327 325
-rect 181 217 327 218
-rect 181 183 193 217
-rect 227 183 327 217
-rect 181 177 233 183
-rect 291 60 325 61
-rect 0 54 374 60
-rect 0 20 51 54
-rect 85 20 187 54
-rect 221 20 374 54
-rect 0 0 374 20
-<< labels >>
-rlabel viali 145 496 145 496 1 A1
-port 4 n
-rlabel metal1 310 318 310 318 1 Y
-port 3 n
-rlabel viali 77 422 77 422 1 A0
-rlabel viali 233 422 233 422 1 B0
-rlabel viali 68 47 68 47 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__aoi22_l.mag b/12T_ms/sky130_osu_sc_12T_ms__aoi22_l.mag
deleted file mode 100644
index 16d6aab..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__aoi22_l.mag
+++ /dev/null
@@ -1,239 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864419
-<< checkpaint >>
-rect -1209 -1243 1617 2131
-<< nwell >>
-rect -9 485 462 897
-<< nmos >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 252 115 282 219
-rect 324 115 354 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 219
-rect 182 171 252 219
-rect 182 131 200 171
-rect 234 131 252 171
-rect 182 115 252 131
-rect 282 115 324 219
-rect 354 171 407 219
-rect 354 131 365 171
-rect 399 131 407 171
-rect 354 115 407 131
-<< pdiff >>
-rect 27 732 80 773
-rect 27 663 35 732
-rect 69 663 80 732
-rect 27 521 80 663
-rect 110 765 166 773
-rect 110 697 121 765
-rect 155 697 166 765
-rect 110 521 166 697
-rect 196 732 252 773
-rect 196 663 207 732
-rect 241 663 252 732
-rect 196 521 252 663
-rect 282 698 338 773
-rect 282 629 293 698
-rect 327 629 338 698
-rect 282 521 338 629
-rect 368 732 421 773
-rect 368 664 379 732
-rect 413 664 421 732
-rect 368 521 421 664
-<< ndiffc >>
-rect 35 131 69 171
-rect 200 131 234 171
-rect 365 131 399 171
-<< pdiffc >>
-rect 35 663 69 732
-rect 121 697 155 765
-rect 207 663 241 732
-rect 293 629 327 698
-rect 379 664 413 732
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 799
-rect 80 484 110 521
-rect 44 474 110 484
-rect 44 440 60 474
-rect 94 440 110 474
-rect 44 430 110 440
-rect 44 274 74 430
-rect 166 418 196 521
-rect 152 388 196 418
-rect 116 372 182 388
-rect 116 338 128 372
-rect 162 338 182 372
-rect 116 322 182 338
-rect 44 242 110 274
-rect 80 219 110 242
-rect 152 219 182 322
-rect 252 317 282 521
-rect 338 381 368 521
-rect 338 365 416 381
-rect 338 338 370 365
-rect 224 301 282 317
-rect 224 267 234 301
-rect 268 267 282 301
-rect 224 251 282 267
-rect 252 219 282 251
-rect 324 331 370 338
-rect 404 331 416 365
-rect 324 315 416 331
-rect 324 308 368 315
-rect 324 219 354 308
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-rect 324 89 354 115
-<< polycont >>
-rect 60 440 94 474
-rect 128 338 162 372
-rect 234 267 268 301
-rect 370 331 404 365
-<< locali >>
-rect 0 867 462 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 462 867
-rect 121 765 155 827
-rect 35 732 69 748
-rect 121 680 155 697
-rect 207 748 413 782
-rect 207 732 241 748
-rect 35 646 69 663
-rect 379 732 413 748
-rect 207 646 241 663
-rect 35 612 241 646
-rect 293 698 327 714
-rect 379 648 413 664
-rect 293 570 327 629
-rect 293 536 336 570
-rect 60 474 94 490
-rect 60 439 94 440
-rect 128 372 162 479
-rect 128 322 162 338
-rect 216 317 250 405
-rect 216 301 268 317
-rect 216 267 234 301
-rect 234 251 268 267
-rect 302 291 336 536
-rect 370 365 404 381
-rect 370 315 404 331
-rect 35 171 69 187
-rect 35 61 69 131
-rect 200 171 234 183
-rect 200 115 234 131
-rect 365 171 399 187
-rect 365 61 399 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 60 405 94 439
-rect 128 479 162 513
-rect 216 405 250 439
-rect 370 331 404 365
-rect 302 257 336 291
-rect 200 183 234 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 462 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 462 867
-rect 0 827 462 833
-rect 116 513 174 519
-rect 116 479 128 513
-rect 162 479 196 513
-rect 116 473 174 479
-rect 48 439 106 445
-rect 204 439 262 445
-rect 48 405 60 439
-rect 94 405 127 439
-rect 204 405 216 439
-rect 250 405 284 439
-rect 48 399 106 405
-rect 204 399 262 405
-rect 358 365 416 371
-rect 336 331 370 365
-rect 404 331 416 365
-rect 358 325 416 331
-rect 290 291 348 297
-rect 290 257 302 291
-rect 336 257 348 291
-rect 290 251 348 257
-rect 188 217 246 223
-rect 304 217 338 251
-rect 188 183 200 217
-rect 234 183 338 217
-rect 188 177 246 183
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 233 422 233 422 1 B0
-port 2 n
-rlabel viali 145 496 145 496 1 A1
-port 4 n
-rlabel metal1 321 244 321 244 1 Y
-port 3 n
-rlabel viali 77 422 77 422 1 A0
-rlabel viali 387 348 387 348 1 B1
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__buf_1.mag b/12T_ms/sky130_osu_sc_12T_ms__buf_1.mag
deleted file mode 100644
index 88756e9..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__buf_1.mag
+++ /dev/null
@@ -1,158 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864419
-<< checkpaint >>
-rect -1269 2461 1548 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1548 -1129
-<< nwell >>
-rect -9 485 288 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 249 219
-rect 196 131 207 171
-rect 241 131 249 171
-rect 196 115 249 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 249 773
-rect 196 561 207 757
-rect 241 561 249 757
-rect 196 521 249 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 207 561 241 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 80 433 110 521
-rect 166 506 196 521
-rect 166 476 251 506
-rect 80 417 154 433
-rect 80 383 110 417
-rect 144 383 154 417
-rect 80 367 154 383
-rect 80 219 110 367
-rect 221 324 251 476
-rect 166 308 251 324
-rect 166 274 176 308
-rect 210 274 251 308
-rect 166 258 251 274
-rect 166 219 196 258
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 110 383 144 417
-rect 176 274 210 308
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 308 69 561
-rect 110 417 144 553
-rect 207 513 241 561
-rect 110 367 144 383
-rect 176 308 210 324
-rect 35 274 176 308
-rect 35 171 69 274
-rect 176 258 210 274
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 207 171 241 183
-rect 207 115 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 110 553 144 587
-rect 207 479 241 513
-rect 207 183 241 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 98 587 156 593
-rect 64 553 110 587
-rect 144 553 156 587
-rect 98 547 156 553
-rect 195 513 253 519
-rect 195 479 207 513
-rect 241 479 253 513
-rect 195 473 253 479
-rect 207 223 241 473
-rect 195 217 253 223
-rect 195 183 207 217
-rect 241 183 253 217
-rect 195 177 253 183
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel viali 127 570 127 570 1 A
-port 1 n
-rlabel metal1 213 359 213 359 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__buf_2.mag b/12T_ms/sky130_osu_sc_12T_ms__buf_2.mag
deleted file mode 100644
index b62ddbd..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__buf_2.mag
+++ /dev/null
@@ -1,179 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864420
-<< checkpaint >>
-rect -1269 2461 1636 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1636 -1129
-<< nwell >>
-rect -9 485 376 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 335 219
-rect 282 131 293 171
-rect 327 131 335 171
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 335 773
-rect 282 561 293 757
-rect 327 561 335 757
-rect 282 521 335 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 800
-rect 80 433 110 521
-rect 166 506 196 521
-rect 252 506 282 521
-rect 166 476 282 506
-rect 80 417 154 433
-rect 80 383 110 417
-rect 144 383 154 417
-rect 80 367 154 383
-rect 80 219 110 367
-rect 221 324 251 476
-rect 166 308 251 324
-rect 166 274 176 308
-rect 210 288 251 308
-rect 210 274 282 288
-rect 166 258 282 274
-rect 166 219 196 258
-rect 252 219 282 258
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 110 383 144 417
-rect 176 274 210 308
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 308 69 561
-rect 110 417 144 553
-rect 207 513 241 561
-rect 293 757 327 827
-rect 293 545 327 561
-rect 110 367 144 383
-rect 176 308 210 324
-rect 35 274 176 308
-rect 35 171 69 274
-rect 176 258 210 274
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 207 171 241 183
-rect 207 115 241 131
-rect 293 171 327 187
-rect 293 61 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 110 553 144 587
-rect 207 479 241 513
-rect 207 183 241 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 98 587 156 593
-rect 64 553 110 587
-rect 144 553 156 587
-rect 98 547 156 553
-rect 195 513 253 519
-rect 195 479 207 513
-rect 241 479 253 513
-rect 195 473 253 479
-rect 207 223 241 473
-rect 195 217 253 223
-rect 195 183 207 217
-rect 241 183 253 217
-rect 195 177 253 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel viali 127 570 127 570 1 A
-port 1 n
-rlabel metal1 211 358 211 358 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__buf_4.mag b/12T_ms/sky130_osu_sc_12T_ms__buf_4.mag
deleted file mode 100644
index 856ef00..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__buf_4.mag
+++ /dev/null
@@ -1,244 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864420
-<< checkpaint >>
-rect -1269 2461 1812 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1812 -1129
-<< nwell >>
-rect -9 485 552 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 507 219
-rect 454 131 465 171
-rect 499 131 507 171
-rect 454 115 507 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 507 773
-rect 454 561 465 757
-rect 499 561 507 757
-rect 454 521 507 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 800
-rect 338 773 368 799
-rect 424 773 454 799
-rect 80 433 110 521
-rect 166 506 196 521
-rect 252 506 282 521
-rect 338 506 368 521
-rect 424 506 454 521
-rect 166 476 454 506
-rect 80 417 154 433
-rect 80 383 110 417
-rect 144 383 154 417
-rect 80 367 154 383
-rect 80 219 110 367
-rect 221 324 251 476
-rect 166 308 251 324
-rect 166 274 176 308
-rect 210 288 251 308
-rect 210 274 454 288
-rect 166 258 454 274
-rect 166 219 196 258
-rect 252 219 282 258
-rect 338 219 368 258
-rect 424 219 454 258
-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 383 144 417
-rect 176 274 210 308
-<< locali >>
-rect 0 867 550 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 550 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 308 69 561
-rect 110 417 144 553
-rect 207 513 241 561
-rect 293 757 327 827
-rect 293 545 327 561
-rect 379 757 413 773
-rect 379 513 413 561
-rect 465 757 499 827
-rect 465 545 499 561
-rect 110 367 144 383
-rect 176 308 210 324
-rect 35 274 176 308
-rect 35 171 69 274
-rect 176 258 210 274
-rect 35 115 69 131
-rect 121 171 155 187
-rect 35 61 69 62
-rect 121 61 155 131
-rect 207 171 241 183
-rect 207 115 241 131
-rect 293 171 327 187
-rect 207 61 241 62
-rect 293 61 327 131
-rect 379 171 413 183
-rect 379 115 413 131
-rect 465 171 499 187
-rect 465 61 499 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 110 553 144 587
-rect 207 479 241 513
-rect 379 479 413 513
-rect 207 183 241 217
-rect 379 183 413 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 550 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 550 867
-rect 0 827 550 833
-rect 98 587 156 593
-rect 64 553 110 587
-rect 144 553 156 587
-rect 98 547 156 553
-rect 195 513 253 519
-rect 367 513 425 519
-rect 195 479 207 513
-rect 241 479 379 513
-rect 413 479 425 513
-rect 195 473 253 479
-rect 367 473 425 479
-rect 207 223 241 473
-rect 379 223 413 473
-rect 195 217 253 223
-rect 367 217 425 223
-rect 195 183 207 217
-rect 241 183 379 217
-rect 413 183 425 217
-rect 195 177 253 183
-rect 367 177 425 183
-rect 0 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel viali 127 570 127 570 1 A
-port 1 n
-rlabel metal1 211 358 211 358 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__buf_6.mag b/12T_ms/sky130_osu_sc_12T_ms__buf_6.mag
deleted file mode 100644
index 1c31430..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__buf_6.mag
+++ /dev/null
@@ -1,286 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604093984
-<< checkpaint >>
-rect -1269 2461 1988 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1988 -1129
-<< nwell >>
-rect -9 485 728 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-rect 596 115 626 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 219
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 679 219
-rect 626 131 637 171
-rect 671 131 679 171
-rect 626 115 679 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 679 773
-rect 626 561 637 757
-rect 671 561 679 757
-rect 626 521 679 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 800
-rect 338 773 368 799
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 80 433 110 521
-rect 166 506 196 521
-rect 252 506 282 521
-rect 338 506 368 521
-rect 424 506 454 521
-rect 510 506 540 521
-rect 596 506 626 521
-rect 166 476 626 506
-rect 80 417 154 433
-rect 80 383 110 417
-rect 144 383 154 417
-rect 80 367 154 383
-rect 80 219 110 367
-rect 221 324 251 476
-rect 166 308 251 324
-rect 166 274 176 308
-rect 210 288 251 308
-rect 510 288 540 476
-rect 210 274 626 288
-rect 166 258 626 274
-rect 166 219 196 258
-rect 252 219 282 258
-rect 338 219 368 258
-rect 424 219 454 258
-rect 510 219 540 258
-rect 596 219 626 258
-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 383 144 417
-rect 176 274 210 308
-<< locali >>
-rect 0 861 726 888
-rect 0 827 51 861
-rect 85 827 187 861
-rect 221 827 323 861
-rect 357 827 459 861
-rect 493 827 595 861
-rect 629 827 726 861
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 308 69 561
-rect 110 417 144 553
-rect 207 513 241 561
-rect 293 757 327 827
-rect 293 545 327 561
-rect 379 757 413 773
-rect 379 513 413 561
-rect 465 757 499 827
-rect 465 545 499 561
-rect 551 757 585 773
-rect 551 513 585 561
-rect 637 757 671 827
-rect 637 545 671 561
-rect 110 367 144 383
-rect 176 308 210 324
-rect 35 274 176 308
-rect 35 171 69 274
-rect 176 258 210 274
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 207 171 241 183
-rect 207 115 241 131
-rect 293 171 327 187
-rect 293 61 327 131
-rect 379 171 413 183
-rect 379 115 413 131
-rect 465 171 499 187
-rect 465 61 499 131
-rect 551 171 585 183
-rect 551 115 585 131
-rect 637 171 671 187
-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 553 144 587
-rect 207 479 241 513
-rect 379 479 413 513
-rect 551 479 585 513
-rect 207 183 241 217
-rect 379 183 413 217
-rect 551 183 585 217
-<< metal1 >>
-rect 0 827 726 888
-rect 98 587 156 593
-rect 64 553 110 587
-rect 144 553 156 587
-rect 98 547 156 553
-rect 195 513 253 519
-rect 367 513 425 519
-rect 539 513 597 519
-rect 195 479 207 513
-rect 241 479 379 513
-rect 413 479 551 513
-rect 585 479 597 513
-rect 195 473 253 479
-rect 367 473 425 479
-rect 539 473 597 479
-rect 207 223 241 473
-rect 379 223 413 473
-rect 551 223 585 473
-rect 195 217 253 223
-rect 367 217 425 223
-rect 539 217 597 223
-rect 195 183 207 217
-rect 241 183 379 217
-rect 413 183 551 217
-rect 585 183 597 217
-rect 195 177 253 183
-rect 367 177 425 183
-rect 539 177 597 183
-rect 0 0 726 61
-<< labels >>
-rlabel viali 127 570 127 570 1 A
-port 1 n
-rlabel metal1 211 358 211 358 1 Y
-port 2 n
-rlabel metal1 68 844 68 844 1 vdd
-rlabel metal1 68 44 68 44 1 gnd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__buf_8.mag b/12T_ms/sky130_osu_sc_12T_ms__buf_8.mag
deleted file mode 100644
index 5df5ae1..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__buf_8.mag
+++ /dev/null
@@ -1,383 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864420
-<< checkpaint >>
-rect -1269 2461 2164 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2164 -1129
-<< nwell >>
-rect -9 485 904 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-rect 596 115 626 219
-rect 682 115 712 219
-rect 768 115 798 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-rect 768 521 798 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 219
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 219
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 768 219
-rect 712 131 723 171
-rect 757 131 768 171
-rect 712 115 768 131
-rect 798 171 851 219
-rect 798 131 809 171
-rect 843 131 851 171
-rect 798 115 851 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 768 773
-rect 712 561 723 757
-rect 757 561 768 757
-rect 712 521 768 561
-rect 798 757 851 773
-rect 798 561 809 757
-rect 843 561 851 757
-rect 798 521 851 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-rect 809 131 843 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-rect 809 561 843 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 800
-rect 338 773 368 799
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 768 773 798 799
-rect 80 433 110 521
-rect 166 506 196 521
-rect 252 506 282 521
-rect 338 506 368 521
-rect 424 506 454 521
-rect 510 506 540 521
-rect 596 506 626 521
-rect 682 506 712 521
-rect 768 506 798 521
-rect 166 476 798 506
-rect 80 417 154 433
-rect 80 383 110 417
-rect 144 383 154 417
-rect 80 367 154 383
-rect 80 219 110 367
-rect 221 324 251 476
-rect 166 308 251 324
-rect 166 274 176 308
-rect 210 288 251 308
-rect 510 288 540 476
-rect 210 274 798 288
-rect 166 258 798 274
-rect 166 219 196 258
-rect 252 219 282 258
-rect 338 219 368 258
-rect 424 219 454 258
-rect 510 219 540 258
-rect 596 219 626 258
-rect 682 219 712 258
-rect 768 219 798 258
-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 383 144 417
-rect 176 274 210 308
-<< locali >>
-rect 0 867 902 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 902 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 207 757 241 773
-rect 35 308 69 561
-rect 110 417 144 553
-rect 207 513 241 561
-rect 293 757 327 827
-rect 293 545 327 561
-rect 379 757 413 773
-rect 379 513 413 561
-rect 465 757 499 827
-rect 465 545 499 561
-rect 551 757 585 773
-rect 551 513 585 561
-rect 637 757 671 827
-rect 637 545 671 561
-rect 723 757 757 773
-rect 723 513 757 561
-rect 809 757 843 827
-rect 809 545 843 561
-rect 110 367 144 383
-rect 176 308 210 324
-rect 35 274 176 308
-rect 35 171 69 274
-rect 176 258 210 274
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 207 171 241 183
-rect 207 115 241 131
-rect 293 171 327 187
-rect 293 61 327 131
-rect 379 171 413 183
-rect 379 115 413 131
-rect 465 171 499 187
-rect 465 61 499 131
-rect 551 171 585 183
-rect 551 115 585 131
-rect 637 171 671 187
-rect 637 61 671 131
-rect 723 171 757 183
-rect 723 115 757 131
-rect 809 171 843 187
-rect 809 61 843 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 902 61
-rect 0 0 902 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 110 553 144 587
-rect 207 479 241 513
-rect 379 479 413 513
-rect 551 479 585 513
-rect 723 479 757 513
-rect 207 183 241 217
-rect 379 183 413 217
-rect 551 183 585 217
-rect 723 183 757 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 867 902 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 902 867
-rect 0 827 902 833
-rect 98 587 156 593
-rect 64 553 110 587
-rect 144 553 156 587
-rect 98 547 156 553
-rect 195 513 253 519
-rect 367 513 425 519
-rect 539 513 597 519
-rect 711 513 769 519
-rect 195 479 207 513
-rect 241 479 379 513
-rect 413 479 551 513
-rect 585 479 723 513
-rect 757 479 769 513
-rect 195 473 253 479
-rect 367 473 425 479
-rect 539 473 597 479
-rect 711 473 769 479
-rect 207 223 241 473
-rect 379 223 413 473
-rect 551 223 585 473
-rect 723 223 757 473
-rect 195 217 253 223
-rect 367 217 425 223
-rect 539 217 597 223
-rect 711 217 769 223
-rect 195 183 207 217
-rect 241 183 379 217
-rect 413 183 551 217
-rect 585 183 723 217
-rect 757 183 769 217
-rect 195 177 253 183
-rect 367 177 425 183
-rect 539 177 597 183
-rect 711 177 769 183
-rect 0 55 902 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 902 55
-rect 0 0 902 21
-<< labels >>
-rlabel viali 127 570 127 570 1 A
-port 1 n
-rlabel metal1 211 358 211 358 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__buf_l.mag b/12T_ms/sky130_osu_sc_12T_ms__buf_l.mag
deleted file mode 100644
index e0f601a..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__buf_l.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864420
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 288 897
-<< nmos >>
-rect 80 115 110 187
-rect 166 115 196 187
-<< pmos >>
-rect 80 605 110 773
-rect 166 605 196 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 166 187
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 165 249 187
-rect 196 131 207 165
-rect 241 131 249 165
-rect 196 115 249 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 605 80 621
-rect 110 757 166 773
-rect 110 621 121 757
-rect 155 621 166 757
-rect 110 605 166 621
-rect 196 757 249 773
-rect 196 621 207 757
-rect 241 621 249 757
-rect 196 605 249 621
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-rect 207 131 241 165
-<< pdiffc >>
-rect 35 621 69 757
-rect 121 621 155 757
-rect 207 621 241 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 80 507 110 605
-rect 166 580 196 605
-rect 166 550 251 580
-rect 80 491 154 507
-rect 80 457 110 491
-rect 144 457 154 491
-rect 80 441 154 457
-rect 80 187 110 441
-rect 221 398 251 550
-rect 166 382 251 398
-rect 166 348 176 382
-rect 210 348 251 382
-rect 166 332 251 348
-rect 166 187 196 332
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 110 457 144 491
-rect 176 348 210 382
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 773
-rect 35 382 69 621
-rect 121 757 155 827
-rect 121 605 155 621
-rect 207 757 241 773
-rect 207 587 241 621
-rect 110 441 144 457
-rect 176 382 210 398
-rect 35 348 176 382
-rect 35 165 69 348
-rect 176 332 210 348
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 207 165 241 257
-rect 207 115 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 207 553 241 587
-rect 110 491 144 513
-rect 110 479 144 491
-rect 207 257 241 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 195 587 253 593
-rect 195 553 207 587
-rect 241 553 253 587
-rect 195 547 253 553
-rect 98 513 156 519
-rect 64 479 110 513
-rect 144 479 156 513
-rect 98 473 156 479
-rect 207 297 241 547
-rect 195 291 253 297
-rect 195 257 207 291
-rect 241 257 253 291
-rect 195 251 253 257
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 214 430 214 430 1 Y
-port 2 n
-rlabel viali 127 496 127 496 1 A
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__decap_1.mag b/12T_ms/sky130_osu_sc_12T_ms__decap_1.mag
deleted file mode 100644
index f7ffe21..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__decap_1.mag
+++ /dev/null
@@ -1,83 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864421
-<< checkpaint >>
-rect -1209 -1243 1345 2131
-<< nwell >>
-rect -9 365 199 897
-<< nmos >>
-rect 80 115 110 263
-<< pmos >>
-rect 80 601 110 773
-<< ndiff >>
-rect 27 200 80 263
-rect 27 131 35 200
-rect 69 131 80 200
-rect 27 115 80 131
-rect 110 200 163 263
-rect 110 131 121 200
-rect 155 131 163 200
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 601 80 621
-rect 110 757 163 773
-rect 110 621 121 757
-rect 155 621 163 757
-rect 110 601 163 621
-<< ndiffc >>
-rect 35 131 69 200
-rect 121 131 155 200
-<< pdiffc >>
-rect 35 621 69 757
-rect 121 621 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 263 110 601
-rect 80 80 110 115
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 827
-rect 35 605 69 621
-rect 121 757 155 827
-rect 121 605 155 621
-rect 35 200 69 216
-rect 35 61 69 131
-rect 121 200 155 216
-rect 121 61 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__decap_l.mag b/12T_ms/sky130_osu_sc_12T_ms__decap_l.mag
deleted file mode 100644
index 0ccc841..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__decap_l.mag
+++ /dev/null
@@ -1,83 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864421
-<< checkpaint >>
-rect -1209 -1243 1345 2131
-<< nwell >>
-rect -9 365 199 897
-<< nmos >>
-rect 80 115 110 217
-<< pmos >>
-rect 80 673 110 773
-<< ndiff >>
-rect 27 191 80 217
-rect 27 131 35 191
-rect 69 131 80 191
-rect 27 115 80 131
-rect 110 191 163 217
-rect 110 131 121 191
-rect 155 131 163 191
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 689 35 757
-rect 69 689 80 757
-rect 27 673 80 689
-rect 110 757 163 773
-rect 110 689 121 757
-rect 155 689 163 757
-rect 110 673 163 689
-<< ndiffc >>
-rect 35 131 69 191
-rect 121 131 155 191
-<< pdiffc >>
-rect 35 689 69 757
-rect 121 689 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 217 110 673
-rect 80 80 110 115
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 827
-rect 35 673 69 689
-rect 121 757 155 827
-rect 121 673 155 689
-rect 35 191 69 207
-rect 35 61 69 131
-rect 121 191 155 207
-rect 121 61 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__dff_1.mag b/12T_ms/sky130_osu_sc_12T_ms__dff_1.mag
deleted file mode 100644
index 69ab1fb..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__dff_1.mag
+++ /dev/null
@@ -1,658 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864421
-<< checkpaint >>
-rect -1209 -1243 2569 2131
-<< nwell >>
-rect -9 485 1456 897
-<< nmos >>
-rect 85 115 115 219
-rect 171 115 201 219
-rect 243 115 273 219
-rect 363 115 393 219
-rect 435 115 465 219
-rect 521 115 551 219
-rect 593 115 623 219
-rect 713 115 743 219
-rect 785 115 815 219
-rect 871 115 901 219
-rect 1061 115 1091 219
-rect 1251 115 1281 219
-rect 1337 115 1367 219
-<< pmos >>
-rect 85 521 115 773
-rect 171 521 201 773
-rect 243 521 273 773
-rect 363 521 393 773
-rect 435 521 465 773
-rect 521 521 551 773
-rect 593 521 623 773
-rect 713 521 743 773
-rect 785 521 815 773
-rect 871 521 901 773
-rect 1061 521 1091 773
-rect 1251 521 1281 773
-rect 1337 521 1367 773
-<< ndiff >>
-rect 32 171 85 219
-rect 32 131 40 171
-rect 74 131 85 171
-rect 32 115 85 131
-rect 115 171 171 219
-rect 115 131 126 171
-rect 160 131 171 171
-rect 115 115 171 131
-rect 201 115 243 219
-rect 273 171 363 219
-rect 273 131 284 171
-rect 352 131 363 171
-rect 273 115 363 131
-rect 393 115 435 219
-rect 465 165 521 219
-rect 465 131 476 165
-rect 510 131 521 165
-rect 465 115 521 131
-rect 551 115 593 219
-rect 623 171 713 219
-rect 623 131 634 171
-rect 702 131 713 171
-rect 623 115 713 131
-rect 743 115 785 219
-rect 815 171 871 219
-rect 815 131 826 171
-rect 860 131 871 171
-rect 815 115 871 131
-rect 901 171 954 219
-rect 901 131 912 171
-rect 946 131 954 171
-rect 901 115 954 131
-rect 1008 171 1061 219
-rect 1008 131 1016 171
-rect 1050 131 1061 171
-rect 1008 115 1061 131
-rect 1091 171 1144 219
-rect 1091 131 1102 171
-rect 1136 131 1144 171
-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 757 85 773
-rect 32 561 40 757
-rect 74 561 85 757
-rect 32 521 85 561
-rect 115 757 171 773
-rect 115 629 126 757
-rect 160 629 171 757
-rect 115 521 171 629
-rect 201 521 243 773
-rect 273 757 363 773
-rect 273 561 284 757
-rect 352 561 363 757
-rect 273 521 363 561
-rect 393 521 435 773
-rect 465 757 521 773
-rect 465 629 476 757
-rect 510 629 521 757
-rect 465 521 521 629
-rect 551 521 593 773
-rect 623 757 713 773
-rect 623 629 634 757
-rect 702 629 713 757
-rect 623 521 713 629
-rect 743 521 785 773
-rect 815 757 871 773
-rect 815 595 826 757
-rect 860 595 871 757
-rect 815 521 871 595
-rect 901 757 954 773
-rect 901 561 912 757
-rect 946 561 954 757
-rect 901 521 954 561
-rect 1008 757 1061 773
-rect 1008 629 1016 757
-rect 1050 629 1061 757
-rect 1008 521 1061 629
-rect 1091 757 1144 773
-rect 1091 561 1102 757
-rect 1136 561 1144 757
-rect 1091 521 1144 561
-rect 1198 757 1251 773
-rect 1198 689 1206 757
-rect 1240 689 1251 757
-rect 1198 521 1251 689
-rect 1281 757 1337 773
-rect 1281 689 1292 757
-rect 1326 689 1337 757
-rect 1281 521 1337 689
-rect 1367 757 1420 773
-rect 1367 689 1378 757
-rect 1412 689 1420 757
-rect 1367 521 1420 689
-<< ndiffc >>
-rect 40 131 74 171
-rect 126 131 160 171
-rect 284 131 352 171
-rect 476 131 510 165
-rect 634 131 702 171
-rect 826 131 860 171
-rect 912 131 946 171
-rect 1016 131 1050 171
-rect 1102 131 1136 171
-rect 1206 131 1240 165
-rect 1292 131 1326 165
-rect 1378 131 1412 165
-<< pdiffc >>
-rect 40 561 74 757
-rect 126 629 160 757
-rect 284 561 352 757
-rect 476 629 510 757
-rect 634 629 702 757
-rect 826 595 860 757
-rect 912 561 946 757
-rect 1016 629 1050 757
-rect 1102 561 1136 757
-rect 1206 689 1240 757
-rect 1292 689 1326 757
-rect 1378 689 1412 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-rect 979 827 1003 861
-rect 1037 827 1061 861
-rect 1115 827 1139 861
-rect 1173 827 1197 861
-rect 1251 827 1275 861
-rect 1309 827 1333 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-rect 1003 827 1037 861
-rect 1139 827 1173 861
-rect 1275 827 1309 861
-<< poly >>
-rect 85 773 115 799
-rect 171 773 201 799
-rect 243 773 273 799
-rect 363 773 393 799
-rect 435 773 465 799
-rect 521 773 551 799
-rect 593 773 623 799
-rect 713 773 743 799
-rect 785 773 815 799
-rect 871 773 901 799
-rect 1061 773 1091 799
-rect 1251 773 1281 799
-rect 1337 773 1367 799
-rect 85 490 115 521
-rect 75 474 129 490
-rect 75 440 85 474
-rect 119 440 129 474
-rect 75 424 129 440
-rect 75 278 105 424
-rect 171 381 201 521
-rect 243 490 273 521
-rect 243 474 297 490
-rect 243 440 253 474
-rect 287 440 297 474
-rect 243 424 297 440
-rect 171 365 225 381
-rect 363 379 393 521
-rect 435 484 465 521
-rect 521 484 551 521
-rect 435 474 551 484
-rect 435 440 467 474
-rect 501 440 551 474
-rect 435 430 551 440
-rect 593 381 623 521
-rect 713 490 743 521
-rect 689 474 743 490
-rect 689 440 699 474
-rect 733 440 743 474
-rect 689 424 743 440
-rect 785 381 815 521
-rect 871 490 901 521
-rect 871 474 942 490
-rect 871 460 898 474
-rect 882 440 898 460
-rect 932 440 942 474
-rect 882 424 942 440
-rect 593 379 743 381
-rect 171 331 181 365
-rect 215 331 225 365
-rect 171 315 225 331
-rect 267 365 743 379
-rect 267 349 699 365
-rect 75 248 115 278
-rect 85 219 115 248
-rect 171 219 201 315
-rect 267 271 297 349
-rect 689 331 699 349
-rect 733 331 743 365
-rect 689 315 743 331
-rect 243 241 297 271
-rect 339 291 393 307
-rect 339 257 349 291
-rect 383 257 393 291
-rect 339 241 393 257
-rect 243 219 273 241
-rect 363 219 393 241
-rect 435 291 551 301
-rect 435 257 467 291
-rect 501 257 551 291
-rect 435 247 551 257
-rect 435 219 465 247
-rect 521 219 551 247
-rect 593 291 647 307
-rect 593 257 603 291
-rect 637 257 647 291
-rect 593 241 647 257
-rect 593 219 623 241
-rect 713 219 743 315
-rect 785 365 839 381
-rect 785 331 795 365
-rect 829 331 839 365
-rect 785 315 839 331
-rect 785 219 815 315
-rect 882 271 912 424
-rect 1061 307 1091 521
-rect 1251 498 1281 521
-rect 1241 472 1281 498
-rect 1241 381 1271 472
-rect 1337 436 1367 521
-rect 1216 365 1271 381
-rect 1313 420 1367 436
-rect 1313 386 1323 420
-rect 1357 386 1367 420
-rect 1313 370 1367 386
-rect 1216 331 1226 365
-rect 1260 331 1271 365
-rect 1216 315 1271 331
-rect 1240 308 1271 315
-rect 871 241 912 271
-rect 1008 291 1091 307
-rect 1008 257 1018 291
-rect 1052 257 1091 291
-rect 1008 241 1091 257
-rect 1241 284 1271 308
-rect 1241 254 1281 284
-rect 871 219 901 241
-rect 1061 219 1091 241
-rect 1251 219 1281 254
-rect 1337 219 1367 370
-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 440 119 474
-rect 253 440 287 474
-rect 467 440 501 474
-rect 699 440 733 474
-rect 898 440 932 474
-rect 181 331 215 365
-rect 699 331 733 365
-rect 349 257 383 291
-rect 467 257 501 291
-rect 603 257 637 291
-rect 795 331 829 365
-rect 1323 386 1357 420
-rect 1226 331 1260 365
-rect 1018 257 1052 291
-<< locali >>
-rect 0 867 1452 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 1003 867
-rect 1037 827 1139 867
-rect 1173 827 1275 867
-rect 1309 827 1452 867
-rect 40 757 74 773
-rect 17 561 40 573
-rect 126 757 160 827
-rect 126 613 160 629
-rect 284 757 352 773
-rect 17 539 74 561
-rect 476 757 510 827
-rect 476 613 510 629
-rect 634 757 702 773
-rect 352 561 355 579
-rect 284 558 355 561
-rect 634 558 702 629
-rect 17 291 51 539
-rect 108 524 355 558
-rect 535 524 702 558
-rect 826 757 860 827
-rect 826 549 860 595
-rect 912 757 946 773
-rect 1016 757 1050 827
-rect 1016 613 1050 629
-rect 1102 757 1136 773
-rect 912 558 946 561
-rect 912 524 1000 558
-rect 108 490 142 524
-rect 85 474 142 490
-rect 119 440 142 474
-rect 85 424 142 440
-rect 17 257 40 291
-rect 17 236 74 257
-rect 108 274 142 424
-rect 253 474 287 490
-rect 253 439 287 440
-rect 467 474 501 490
-rect 287 405 383 439
-rect 181 365 215 381
-rect 181 315 215 331
-rect 349 291 383 405
-rect 467 291 501 440
-rect 108 240 315 274
-rect 535 291 569 524
-rect 699 474 733 490
-rect 699 439 733 440
-rect 603 405 699 439
-rect 829 479 830 513
-rect 603 291 637 405
-rect 795 365 830 479
-rect 898 474 932 490
-rect 898 439 932 440
-rect 966 365 1000 524
-rect 683 331 699 365
-rect 733 331 749 365
-rect 829 345 830 365
-rect 795 315 829 331
-rect 946 331 1000 365
-rect 912 325 1000 331
-rect 1102 365 1136 561
-rect 1206 757 1240 773
-rect 1206 439 1240 689
-rect 1292 757 1326 827
-rect 1292 673 1326 689
-rect 1378 757 1412 773
-rect 1378 635 1412 689
-rect 1377 576 1412 635
-rect 1377 513 1411 576
-rect 1411 479 1435 513
-rect 1240 420 1357 439
-rect 1240 405 1323 420
-rect 1102 331 1226 365
-rect 1260 331 1276 365
-rect 1323 349 1357 386
-rect 349 241 383 257
-rect 467 241 501 257
-rect 603 241 637 257
-rect 671 285 705 291
-rect 40 171 74 236
-rect 281 187 315 240
-rect 671 207 705 251
-rect 40 115 74 131
-rect 126 171 160 187
-rect 281 171 352 187
-rect 281 153 284 171
-rect 126 61 160 131
-rect 284 115 352 131
-rect 476 165 510 181
-rect 476 61 510 131
-rect 634 171 705 207
-rect 702 131 705 171
-rect 634 115 705 131
-rect 826 171 860 187
-rect 826 61 860 131
-rect 912 171 946 325
-rect 1002 257 1018 291
-rect 1052 257 1068 291
-rect 912 115 946 131
-rect 1016 171 1050 187
-rect 1016 61 1050 131
-rect 1102 171 1136 331
-rect 1323 297 1358 349
-rect 1102 115 1136 131
-rect 1206 263 1358 297
-rect 1206 165 1240 263
-rect 1401 231 1435 479
-rect 1378 197 1435 231
-rect 1206 115 1240 131
-rect 1292 165 1326 181
-rect 1292 61 1326 131
-rect 1378 165 1412 197
-rect 1378 115 1412 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 1003 861 1037 867
-rect 1003 833 1037 861
-rect 1139 861 1173 867
-rect 1139 833 1173 861
-rect 1275 861 1309 867
-rect 1275 833 1309 861
-rect 40 257 74 291
-rect 253 405 287 439
-rect 181 331 215 365
-rect 449 257 467 291
-rect 467 257 483 291
-rect 535 257 569 291
-rect 699 405 733 439
-rect 795 479 829 513
-rect 898 405 932 439
-rect 699 331 733 365
-rect 912 331 946 365
-rect 1377 479 1411 513
-rect 1206 405 1240 439
-rect 1226 331 1260 365
-rect 671 251 705 285
-rect 1018 257 1052 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 867 1452 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 1003 867
-rect 1037 833 1139 867
-rect 1173 833 1275 867
-rect 1309 833 1452 867
-rect 0 827 1452 833
-rect 783 513 841 519
-rect 1365 513 1424 519
-rect 783 479 795 513
-rect 829 479 1016 513
-rect 1344 479 1377 513
-rect 1411 479 1424 513
-rect 783 473 841 479
-rect 241 439 299 445
-rect 687 439 745 445
-rect 886 439 944 445
-rect 241 405 253 439
-rect 287 405 699 439
-rect 733 405 898 439
-rect 932 405 944 439
-rect 241 399 299 405
-rect 687 399 745 405
-rect 886 399 944 405
-rect 169 365 227 371
-rect 687 365 745 371
-rect 169 331 181 365
-rect 215 331 249 365
-rect 683 331 699 365
-rect 733 359 745 365
-rect 900 365 958 371
-rect 900 359 912 365
-rect 733 331 912 359
-rect 946 331 958 365
-rect 987 365 1016 479
-rect 1365 473 1424 479
-rect 1194 439 1252 445
-rect 1194 438 1206 439
-rect 1173 405 1206 438
-rect 1240 405 1252 439
-rect 1173 404 1252 405
-rect 1194 399 1252 404
-rect 1216 365 1272 371
-rect 987 331 1226 365
-rect 1260 331 1272 365
-rect 169 325 227 331
-rect 687 325 745 331
-rect 900 325 958 331
-rect 1216 325 1272 331
-rect 28 291 86 297
-rect 437 291 495 297
-rect 28 257 40 291
-rect 74 257 449 291
-rect 483 257 495 291
-rect 28 251 86 257
-rect 437 251 495 257
-rect 523 291 581 297
-rect 1006 291 1064 297
-rect 523 257 535 291
-rect 569 285 1018 291
-rect 569 257 671 285
-rect 523 251 581 257
-rect 659 251 671 257
-rect 705 257 1018 285
-rect 1052 257 1064 291
-rect 705 251 717 257
-rect 1006 251 1064 257
-rect 665 245 711 251
-rect 0 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel viali 198 348 198 348 1 D
-port 1 n
-rlabel viali 915 422 915 422 1 CK
-port 4 n
-rlabel viali 1223 422 1223 422 1 ON
-rlabel viali 1394 496 1394 496 1 Q
-rlabel viali 68 49 68 49 1 gnd
-rlabel viali 68 841 68 841 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__dff_l.mag b/12T_ms/sky130_osu_sc_12T_ms__dff_l.mag
deleted file mode 100644
index adced0a..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__dff_l.mag
+++ /dev/null
@@ -1,658 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864421
-<< checkpaint >>
-rect -1209 -1243 2569 2131
-<< nwell >>
-rect -9 485 1456 897
-<< nmos >>
-rect 85 115 115 219
-rect 171 115 201 219
-rect 243 115 273 219
-rect 363 115 393 219
-rect 435 115 465 219
-rect 521 115 551 219
-rect 593 115 623 219
-rect 713 115 743 219
-rect 785 115 815 219
-rect 871 115 901 219
-rect 1061 115 1091 219
-rect 1251 115 1281 187
-rect 1337 115 1367 187
-<< pmos >>
-rect 85 521 115 773
-rect 171 521 201 773
-rect 243 521 273 773
-rect 363 521 393 773
-rect 435 521 465 773
-rect 521 521 551 773
-rect 593 521 623 773
-rect 713 521 743 773
-rect 785 521 815 773
-rect 871 521 901 773
-rect 1061 521 1091 773
-rect 1251 605 1281 773
-rect 1337 605 1367 773
-<< ndiff >>
-rect 32 171 85 219
-rect 32 131 40 171
-rect 74 131 85 171
-rect 32 115 85 131
-rect 115 171 171 219
-rect 115 131 126 171
-rect 160 131 171 171
-rect 115 115 171 131
-rect 201 115 243 219
-rect 273 171 363 219
-rect 273 131 284 171
-rect 352 131 363 171
-rect 273 115 363 131
-rect 393 115 435 219
-rect 465 165 521 219
-rect 465 131 476 165
-rect 510 131 521 165
-rect 465 115 521 131
-rect 551 115 593 219
-rect 623 171 713 219
-rect 623 131 634 171
-rect 702 131 713 171
-rect 623 115 713 131
-rect 743 115 785 219
-rect 815 171 871 219
-rect 815 131 826 171
-rect 860 131 871 171
-rect 815 115 871 131
-rect 901 171 954 219
-rect 901 131 912 171
-rect 946 131 954 171
-rect 901 115 954 131
-rect 1008 171 1061 219
-rect 1008 131 1016 171
-rect 1050 131 1061 171
-rect 1008 115 1061 131
-rect 1091 171 1144 219
-rect 1091 131 1102 171
-rect 1136 131 1144 171
-rect 1091 115 1144 131
-rect 1198 165 1251 187
-rect 1198 131 1206 165
-rect 1240 131 1251 165
-rect 1198 115 1251 131
-rect 1281 165 1337 187
-rect 1281 131 1292 165
-rect 1326 131 1337 165
-rect 1281 115 1337 131
-rect 1367 165 1420 187
-rect 1367 131 1378 165
-rect 1412 131 1420 165
-rect 1367 115 1420 131
-<< pdiff >>
-rect 32 757 85 773
-rect 32 561 40 757
-rect 74 561 85 757
-rect 32 521 85 561
-rect 115 757 171 773
-rect 115 629 126 757
-rect 160 629 171 757
-rect 115 521 171 629
-rect 201 521 243 773
-rect 273 757 363 773
-rect 273 561 284 757
-rect 352 561 363 757
-rect 273 521 363 561
-rect 393 521 435 773
-rect 465 757 521 773
-rect 465 629 476 757
-rect 510 629 521 757
-rect 465 521 521 629
-rect 551 521 593 773
-rect 623 757 713 773
-rect 623 629 634 757
-rect 702 629 713 757
-rect 623 521 713 629
-rect 743 521 785 773
-rect 815 757 871 773
-rect 815 595 826 757
-rect 860 595 871 757
-rect 815 521 871 595
-rect 901 757 954 773
-rect 901 561 912 757
-rect 946 561 954 757
-rect 901 521 954 561
-rect 1008 757 1061 773
-rect 1008 629 1016 757
-rect 1050 629 1061 757
-rect 1008 521 1061 629
-rect 1091 757 1144 773
-rect 1091 561 1102 757
-rect 1136 561 1144 757
-rect 1198 757 1251 773
-rect 1198 689 1206 757
-rect 1240 689 1251 757
-rect 1198 605 1251 689
-rect 1281 757 1337 773
-rect 1281 689 1292 757
-rect 1326 689 1337 757
-rect 1281 605 1337 689
-rect 1367 757 1420 773
-rect 1367 689 1378 757
-rect 1412 689 1420 757
-rect 1367 605 1420 689
-rect 1091 521 1144 561
-<< ndiffc >>
-rect 40 131 74 171
-rect 126 131 160 171
-rect 284 131 352 171
-rect 476 131 510 165
-rect 634 131 702 171
-rect 826 131 860 171
-rect 912 131 946 171
-rect 1016 131 1050 171
-rect 1102 131 1136 171
-rect 1206 131 1240 165
-rect 1292 131 1326 165
-rect 1378 131 1412 165
-<< pdiffc >>
-rect 40 561 74 757
-rect 126 629 160 757
-rect 284 561 352 757
-rect 476 629 510 757
-rect 634 629 702 757
-rect 826 595 860 757
-rect 912 561 946 757
-rect 1016 629 1050 757
-rect 1102 561 1136 757
-rect 1206 689 1240 757
-rect 1292 689 1326 757
-rect 1378 689 1412 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-rect 979 827 1003 861
-rect 1037 827 1061 861
-rect 1115 827 1139 861
-rect 1173 827 1197 861
-rect 1251 827 1275 861
-rect 1309 827 1333 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-rect 1003 827 1037 861
-rect 1139 827 1173 861
-rect 1275 827 1309 861
-<< poly >>
-rect 85 773 115 799
-rect 171 773 201 799
-rect 243 773 273 799
-rect 363 773 393 799
-rect 435 773 465 799
-rect 521 773 551 799
-rect 593 773 623 799
-rect 713 773 743 799
-rect 785 773 815 799
-rect 871 773 901 799
-rect 1061 773 1091 799
-rect 1251 773 1281 799
-rect 1337 773 1367 799
-rect 1251 525 1281 605
-rect 85 490 115 521
-rect 75 474 129 490
-rect 75 440 85 474
-rect 119 440 129 474
-rect 75 424 129 440
-rect 75 278 105 424
-rect 171 381 201 521
-rect 243 490 273 521
-rect 243 474 297 490
-rect 243 440 253 474
-rect 287 440 297 474
-rect 243 424 297 440
-rect 171 365 225 381
-rect 363 379 393 521
-rect 435 484 465 521
-rect 521 484 551 521
-rect 435 474 551 484
-rect 435 440 467 474
-rect 501 440 551 474
-rect 435 430 551 440
-rect 593 381 623 521
-rect 713 490 743 521
-rect 689 474 743 490
-rect 689 440 699 474
-rect 733 440 743 474
-rect 689 424 743 440
-rect 785 381 815 521
-rect 871 490 901 521
-rect 871 474 942 490
-rect 871 460 898 474
-rect 882 440 898 460
-rect 932 440 942 474
-rect 882 424 942 440
-rect 593 379 743 381
-rect 171 331 181 365
-rect 215 331 225 365
-rect 171 315 225 331
-rect 267 365 743 379
-rect 267 349 699 365
-rect 75 248 115 278
-rect 85 219 115 248
-rect 171 219 201 315
-rect 267 271 297 349
-rect 689 331 699 349
-rect 733 331 743 365
-rect 689 315 743 331
-rect 243 241 297 271
-rect 339 291 393 307
-rect 339 257 349 291
-rect 383 257 393 291
-rect 339 241 393 257
-rect 243 219 273 241
-rect 363 219 393 241
-rect 435 291 551 301
-rect 435 257 467 291
-rect 501 257 551 291
-rect 435 247 551 257
-rect 435 219 465 247
-rect 521 219 551 247
-rect 593 291 647 307
-rect 593 257 603 291
-rect 637 257 647 291
-rect 593 241 647 257
-rect 593 219 623 241
-rect 713 219 743 315
-rect 785 365 839 381
-rect 785 331 795 365
-rect 829 331 839 365
-rect 785 315 839 331
-rect 785 219 815 315
-rect 882 271 912 424
-rect 1061 307 1091 521
-rect 1241 495 1281 525
-rect 1241 381 1271 495
-rect 1337 436 1367 605
-rect 1216 365 1271 381
-rect 1313 420 1367 436
-rect 1313 386 1323 420
-rect 1357 386 1367 420
-rect 1313 370 1367 386
-rect 1216 331 1226 365
-rect 1260 331 1271 365
-rect 1216 315 1271 331
-rect 1240 308 1271 315
-rect 871 241 912 271
-rect 1008 291 1091 307
-rect 1008 257 1018 291
-rect 1052 257 1091 291
-rect 1008 241 1091 257
-rect 1241 284 1271 308
-rect 1241 254 1281 284
-rect 871 219 901 241
-rect 1061 219 1091 241
-rect 1251 187 1281 254
-rect 1337 187 1367 370
-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 440 119 474
-rect 253 440 287 474
-rect 467 440 501 474
-rect 699 440 733 474
-rect 898 440 932 474
-rect 181 331 215 365
-rect 699 331 733 365
-rect 349 257 383 291
-rect 467 257 501 291
-rect 603 257 637 291
-rect 795 331 829 365
-rect 1323 386 1357 420
-rect 1226 331 1260 365
-rect 1018 257 1052 291
-<< locali >>
-rect 0 867 1452 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 1003 867
-rect 1037 827 1139 867
-rect 1173 827 1275 867
-rect 1309 827 1452 867
-rect 40 757 74 773
-rect 17 561 40 573
-rect 126 757 160 827
-rect 126 613 160 629
-rect 284 757 352 773
-rect 17 539 74 561
-rect 476 757 510 827
-rect 476 613 510 629
-rect 634 757 702 773
-rect 352 561 355 579
-rect 284 558 355 561
-rect 634 558 702 629
-rect 17 291 51 539
-rect 108 524 355 558
-rect 535 524 702 558
-rect 826 757 860 827
-rect 826 549 860 595
-rect 912 757 946 773
-rect 1016 757 1050 827
-rect 1016 613 1050 629
-rect 1102 757 1136 773
-rect 912 558 946 561
-rect 912 524 1000 558
-rect 108 490 142 524
-rect 85 474 142 490
-rect 119 440 142 474
-rect 85 424 142 440
-rect 17 257 40 291
-rect 17 236 74 257
-rect 108 274 142 424
-rect 253 474 287 490
-rect 253 439 287 440
-rect 467 474 501 490
-rect 287 405 383 439
-rect 181 365 215 381
-rect 181 315 215 331
-rect 349 291 383 405
-rect 467 291 501 440
-rect 108 240 315 274
-rect 535 291 569 524
-rect 699 474 733 490
-rect 699 439 733 440
-rect 603 405 699 439
-rect 829 479 830 513
-rect 603 291 637 405
-rect 795 365 830 479
-rect 898 474 932 490
-rect 898 439 932 440
-rect 966 365 1000 524
-rect 683 331 699 365
-rect 733 331 749 365
-rect 829 345 830 365
-rect 795 315 829 331
-rect 946 331 1000 365
-rect 912 325 1000 331
-rect 1102 365 1136 561
-rect 1206 757 1240 773
-rect 1206 439 1240 689
-rect 1292 757 1326 827
-rect 1292 673 1326 689
-rect 1378 757 1412 773
-rect 1378 635 1412 689
-rect 1377 576 1412 635
-rect 1377 513 1411 576
-rect 1411 479 1435 513
-rect 1240 420 1357 439
-rect 1240 405 1323 420
-rect 1102 331 1226 365
-rect 1260 331 1276 365
-rect 1323 349 1357 386
-rect 349 241 383 257
-rect 467 241 501 257
-rect 603 241 637 257
-rect 671 285 705 291
-rect 40 171 74 236
-rect 281 187 315 240
-rect 671 207 705 251
-rect 40 115 74 131
-rect 126 171 160 187
-rect 281 171 352 187
-rect 281 153 284 171
-rect 126 61 160 131
-rect 284 115 352 131
-rect 476 165 510 181
-rect 476 61 510 131
-rect 634 171 705 207
-rect 702 131 705 171
-rect 634 115 705 131
-rect 826 171 860 187
-rect 826 61 860 131
-rect 912 171 946 325
-rect 1002 257 1018 291
-rect 1052 257 1068 291
-rect 912 115 946 131
-rect 1016 171 1050 187
-rect 1016 61 1050 131
-rect 1102 171 1136 331
-rect 1323 297 1358 349
-rect 1102 115 1136 131
-rect 1206 263 1358 297
-rect 1206 165 1240 263
-rect 1401 231 1435 479
-rect 1378 197 1435 231
-rect 1206 115 1240 131
-rect 1292 165 1326 181
-rect 1292 61 1326 131
-rect 1378 165 1412 197
-rect 1378 115 1412 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 1003 861 1037 867
-rect 1003 833 1037 861
-rect 1139 861 1173 867
-rect 1139 833 1173 861
-rect 1275 861 1309 867
-rect 1275 833 1309 861
-rect 40 257 74 291
-rect 253 405 287 439
-rect 181 331 215 365
-rect 449 257 467 291
-rect 467 257 483 291
-rect 535 257 569 291
-rect 699 405 733 439
-rect 795 479 829 513
-rect 898 405 932 439
-rect 699 331 733 365
-rect 912 331 946 365
-rect 1377 479 1411 513
-rect 1206 405 1240 439
-rect 1226 331 1260 365
-rect 671 251 705 285
-rect 1018 257 1052 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 867 1452 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 1003 867
-rect 1037 833 1139 867
-rect 1173 833 1275 867
-rect 1309 833 1452 867
-rect 0 827 1452 833
-rect 783 513 841 519
-rect 1365 513 1424 519
-rect 783 479 795 513
-rect 829 479 1016 513
-rect 1344 479 1377 513
-rect 1411 479 1424 513
-rect 783 473 841 479
-rect 241 439 299 445
-rect 687 439 745 445
-rect 886 439 944 445
-rect 241 405 253 439
-rect 287 405 699 439
-rect 733 405 898 439
-rect 932 405 944 439
-rect 241 399 299 405
-rect 687 399 745 405
-rect 886 399 944 405
-rect 169 365 227 371
-rect 687 365 745 371
-rect 169 331 181 365
-rect 215 331 249 365
-rect 683 331 699 365
-rect 733 359 745 365
-rect 900 365 958 371
-rect 900 359 912 365
-rect 733 331 912 359
-rect 946 331 958 365
-rect 987 365 1016 479
-rect 1365 473 1424 479
-rect 1194 439 1252 445
-rect 1194 438 1206 439
-rect 1173 405 1206 438
-rect 1240 405 1252 439
-rect 1173 404 1252 405
-rect 1194 399 1252 404
-rect 1216 365 1272 371
-rect 987 331 1226 365
-rect 1260 331 1272 365
-rect 169 325 227 331
-rect 687 325 745 331
-rect 900 325 958 331
-rect 1216 325 1272 331
-rect 28 291 86 297
-rect 437 291 495 297
-rect 28 257 40 291
-rect 74 257 449 291
-rect 483 257 495 291
-rect 28 251 86 257
-rect 437 251 495 257
-rect 523 291 581 297
-rect 1006 291 1064 297
-rect 523 257 535 291
-rect 569 285 1018 291
-rect 569 257 671 285
-rect 523 251 581 257
-rect 659 251 671 257
-rect 705 257 1018 285
-rect 1052 257 1064 291
-rect 705 251 717 257
-rect 1006 251 1064 257
-rect 665 245 711 251
-rect 0 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel viali 198 348 198 348 1 D
-port 1 n
-rlabel viali 915 422 915 422 1 CK
-port 4 n
-rlabel viali 1223 422 1223 422 1 ON
-rlabel viali 1394 496 1394 496 1 Q
-rlabel viali 68 49 68 49 1 gnd
-rlabel viali 68 841 68 841 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__dffr_1.mag b/12T_ms/sky130_osu_sc_12T_ms__dffr_1.mag
deleted file mode 100644
index 8d16a25..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__dffr_1.mag
+++ /dev/null
@@ -1,838 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864421
-<< checkpaint >>
-rect -1210 -1243 3112 2131
-<< nwell >>
-rect -10 485 1917 897
-<< nmos >>
-rect 80 115 110 219
-rect 270 115 300 187
-rect 356 115 386 187
-rect 546 115 576 219
-rect 618 115 648 219
-rect 738 115 768 219
-rect 810 115 840 219
-rect 896 115 926 219
-rect 968 115 998 219
-rect 1088 115 1118 219
-rect 1160 115 1190 219
-rect 1246 115 1276 219
-rect 1436 115 1466 187
-rect 1522 115 1552 187
-rect 1712 115 1742 219
-rect 1798 115 1828 219
-<< pmos >>
-rect 80 521 110 773
-rect 270 605 300 773
-rect 342 605 372 773
-rect 546 521 576 773
-rect 618 521 648 773
-rect 738 521 768 773
-rect 810 521 840 773
-rect 896 521 926 773
-rect 968 521 998 773
-rect 1088 521 1118 773
-rect 1160 521 1190 773
-rect 1246 521 1276 773
-rect 1436 605 1466 773
-rect 1508 605 1538 773
-rect 1712 521 1742 773
-rect 1798 521 1828 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-rect 217 165 270 187
-rect 217 131 225 165
-rect 259 131 270 165
-rect 217 115 270 131
-rect 300 165 356 187
-rect 300 131 311 165
-rect 345 131 356 165
-rect 300 115 356 131
-rect 386 165 439 187
-rect 386 131 397 165
-rect 431 131 439 165
-rect 386 115 439 131
-rect 493 171 546 219
-rect 493 131 501 171
-rect 535 131 546 171
-rect 493 115 546 131
-rect 576 115 618 219
-rect 648 171 738 219
-rect 648 131 659 171
-rect 727 131 738 171
-rect 648 115 738 131
-rect 768 115 810 219
-rect 840 165 896 219
-rect 840 131 851 165
-rect 885 131 896 165
-rect 840 115 896 131
-rect 926 115 968 219
-rect 998 171 1088 219
-rect 998 131 1009 171
-rect 1077 131 1088 171
-rect 998 115 1088 131
-rect 1118 115 1160 219
-rect 1190 171 1246 219
-rect 1190 131 1201 171
-rect 1235 131 1246 171
-rect 1190 115 1246 131
-rect 1276 171 1329 219
-rect 1276 131 1287 171
-rect 1321 131 1329 171
-rect 1276 115 1329 131
-rect 1383 165 1436 187
-rect 1383 131 1391 165
-rect 1425 131 1436 165
-rect 1383 115 1436 131
-rect 1466 165 1522 187
-rect 1466 131 1477 165
-rect 1511 131 1522 165
-rect 1466 115 1522 131
-rect 1552 165 1605 187
-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 758 80 773
-rect 27 697 35 758
-rect 69 697 80 758
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 560 121 757
-rect 155 560 163 757
-rect 217 757 270 773
-rect 217 621 225 757
-rect 259 621 270 757
-rect 217 605 270 621
-rect 300 605 342 773
-rect 372 757 425 773
-rect 372 621 383 757
-rect 417 621 425 757
-rect 372 605 425 621
-rect 493 757 546 773
-rect 493 629 501 757
-rect 535 629 546 757
-rect 110 521 163 560
-rect 493 521 546 629
-rect 576 521 618 773
-rect 648 757 738 773
-rect 648 561 659 757
-rect 727 561 738 757
-rect 648 521 738 561
-rect 768 521 810 773
-rect 840 757 896 773
-rect 840 629 851 757
-rect 885 629 896 757
-rect 840 521 896 629
-rect 926 521 968 773
-rect 998 757 1088 773
-rect 998 629 1009 757
-rect 1077 629 1088 757
-rect 998 521 1088 629
-rect 1118 521 1160 773
-rect 1190 757 1246 773
-rect 1190 595 1201 757
-rect 1235 595 1246 757
-rect 1190 521 1246 595
-rect 1276 757 1329 773
-rect 1276 561 1287 757
-rect 1321 561 1329 757
-rect 1383 757 1436 773
-rect 1383 621 1391 757
-rect 1425 621 1436 757
-rect 1383 605 1436 621
-rect 1466 605 1508 773
-rect 1538 757 1591 773
-rect 1538 621 1549 757
-rect 1583 621 1591 757
-rect 1538 605 1591 621
-rect 1659 757 1712 773
-rect 1659 617 1667 757
-rect 1701 617 1712 757
-rect 1276 521 1329 561
-rect 1659 521 1712 617
-rect 1742 757 1798 773
-rect 1742 617 1753 757
-rect 1787 617 1798 757
-rect 1742 521 1798 617
-rect 1828 757 1881 773
-rect 1828 617 1839 757
-rect 1873 617 1881 757
-rect 1828 521 1881 617
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 225 131 259 165
-rect 311 131 345 165
-rect 397 131 431 165
-rect 501 131 535 171
-rect 659 131 727 171
-rect 851 131 885 165
-rect 1009 131 1077 171
-rect 1201 131 1235 171
-rect 1287 131 1321 171
-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 697 69 758
-rect 121 560 155 757
-rect 225 621 259 757
-rect 383 621 417 757
-rect 501 629 535 757
-rect 659 561 727 757
-rect 851 629 885 757
-rect 1009 629 1077 757
-rect 1201 595 1235 757
-rect 1287 561 1321 757
-rect 1391 621 1425 757
-rect 1549 621 1583 757
-rect 1667 617 1701 757
-rect 1753 617 1787 757
-rect 1839 617 1873 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-rect 1658 827 1682 861
-rect 1716 827 1740 861
-rect 1794 827 1818 861
-rect 1852 827 1876 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-rect 1682 827 1716 861
-rect 1818 827 1852 861
-<< poly >>
-rect 80 773 110 799
-rect 270 773 300 799
-rect 342 773 372 799
-rect 546 773 576 799
-rect 618 773 648 799
-rect 738 773 768 799
-rect 810 773 840 799
-rect 896 773 926 799
-rect 968 773 998 799
-rect 1088 773 1118 799
-rect 1160 773 1190 799
-rect 1246 773 1276 799
-rect 1436 773 1466 799
-rect 1508 773 1538 799
-rect 1712 773 1742 799
-rect 1798 773 1828 799
-rect 80 398 110 521
-rect 79 382 133 398
-rect 79 348 89 382
-rect 123 348 133 382
-rect 79 332 133 348
-rect 79 331 110 332
-rect 80 219 110 331
-rect 270 275 300 605
-rect 342 508 372 605
-rect 342 492 415 508
-rect 342 458 371 492
-rect 405 458 415 492
-rect 342 442 415 458
-rect 217 259 300 275
-rect 217 225 227 259
-rect 261 225 300 259
-rect 217 209 300 225
-rect 270 187 300 209
-rect 356 187 386 442
-rect 546 381 576 521
-rect 618 490 648 521
-rect 618 474 672 490
-rect 618 440 628 474
-rect 662 440 672 474
-rect 618 424 672 440
-rect 546 365 600 381
-rect 738 379 768 521
-rect 810 484 840 521
-rect 896 484 926 521
-rect 810 474 926 484
-rect 810 440 842 474
-rect 876 440 926 474
-rect 810 430 926 440
-rect 968 379 998 521
-rect 1088 490 1118 521
-rect 1064 474 1118 490
-rect 1064 440 1074 474
-rect 1108 440 1118 474
-rect 1064 424 1118 440
-rect 1160 451 1190 521
-rect 1246 490 1276 521
-rect 1246 474 1317 490
-rect 1246 460 1273 474
-rect 1160 421 1196 451
-rect 1257 440 1273 460
-rect 1307 440 1317 474
-rect 1257 424 1317 440
-rect 1166 387 1196 421
-rect 546 331 556 365
-rect 590 331 600 365
-rect 546 315 600 331
-rect 642 365 1124 379
-rect 642 349 1074 365
-rect 546 219 576 315
-rect 642 271 672 349
-rect 1064 325 1074 349
-rect 1108 325 1124 365
-rect 618 241 672 271
-rect 714 291 768 307
-rect 714 257 724 291
-rect 758 257 768 291
-rect 714 241 768 257
-rect 618 219 648 241
-rect 738 219 768 241
-rect 810 291 926 301
-rect 810 257 842 291
-rect 876 257 926 291
-rect 810 247 926 257
-rect 810 219 840 247
-rect 896 219 926 247
-rect 968 291 1022 307
-rect 1064 304 1124 325
-rect 1166 371 1220 387
-rect 1166 337 1176 371
-rect 1210 337 1220 371
-rect 1166 321 1220 337
-rect 968 257 978 291
-rect 1012 257 1022 291
-rect 968 241 1022 257
-rect 968 219 998 241
-rect 1088 219 1118 304
-rect 1166 273 1196 321
-rect 1160 241 1196 273
-rect 1262 271 1292 424
-rect 1436 307 1466 605
-rect 1246 241 1292 271
-rect 1399 291 1466 307
-rect 1399 257 1409 291
-rect 1443 257 1466 291
-rect 1508 304 1538 605
-rect 1712 505 1742 521
-rect 1702 475 1742 505
-rect 1702 381 1732 475
-rect 1798 416 1828 521
-rect 1677 365 1732 381
-rect 1677 331 1687 365
-rect 1721 331 1732 365
-rect 1774 400 1828 416
-rect 1774 366 1784 400
-rect 1818 366 1828 400
-rect 1774 350 1828 366
-rect 1677 315 1732 331
-rect 1508 275 1552 304
-rect 1399 241 1466 257
-rect 1160 219 1190 241
-rect 1246 219 1276 241
-rect 1436 187 1466 241
-rect 1522 259 1605 275
-rect 1522 225 1561 259
-rect 1595 225 1605 259
-rect 1702 264 1732 315
-rect 1702 234 1742 264
-rect 1522 209 1605 225
-rect 1712 219 1742 234
-rect 1798 219 1828 350
-rect 1522 187 1552 209
-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 348 123 382
-rect 371 458 405 492
-rect 227 225 261 259
-rect 628 440 662 474
-rect 842 440 876 474
-rect 1074 440 1108 474
-rect 1273 440 1307 474
-rect 556 331 590 365
-rect 1074 325 1108 365
-rect 724 257 758 291
-rect 842 257 876 291
-rect 1176 337 1210 371
-rect 978 257 1012 291
-rect 1409 257 1443 291
-rect 1687 331 1721 365
-rect 1784 366 1818 400
-rect 1561 225 1595 259
-<< locali >>
-rect 0 867 1914 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1682 867
-rect 1716 827 1818 867
-rect 1852 827 1914 867
-rect 35 758 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 398 81 553
-rect 121 469 155 560
-rect 225 757 259 773
-rect 121 435 191 469
-rect 47 382 123 398
-rect 47 348 89 382
-rect 89 332 123 348
-rect 157 259 191 435
-rect 225 379 259 621
-rect 383 757 417 827
-rect 383 605 417 621
-rect 501 757 535 827
-rect 501 613 535 629
-rect 659 757 727 773
-rect 851 757 885 827
-rect 851 613 885 629
-rect 1009 757 1077 773
-rect 659 558 727 561
-rect 1009 558 1077 629
-rect 1201 757 1235 827
-rect 1201 579 1235 595
-rect 1287 757 1321 773
-rect 405 524 727 558
-rect 910 524 1077 558
-rect 1391 757 1425 773
-rect 1549 757 1583 827
-rect 1425 621 1511 626
-rect 1391 592 1511 621
-rect 1549 605 1583 621
-rect 1667 757 1701 773
-rect 1287 558 1321 561
-rect 1287 524 1377 558
-rect 405 508 439 524
-rect 371 492 439 508
-rect 405 458 439 492
-rect 371 442 439 458
-rect 225 345 345 379
-rect 311 291 345 345
-rect 157 239 227 259
-rect 121 225 227 239
-rect 261 225 277 259
-rect 121 205 191 225
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 205
-rect 121 115 155 131
-rect 225 165 259 181
-rect 225 61 259 131
-rect 311 165 345 257
-rect 405 294 439 442
-rect 628 474 662 490
-rect 628 439 662 440
-rect 842 474 876 490
-rect 662 405 758 439
-rect 556 365 590 381
-rect 556 315 590 331
-rect 405 274 440 294
-rect 724 291 758 405
-rect 842 291 876 440
-rect 405 240 690 274
-rect 724 241 758 257
-rect 842 241 876 257
-rect 910 291 944 524
-rect 1074 474 1108 490
-rect 1074 439 1108 440
-rect 910 241 944 257
-rect 978 405 1074 439
-rect 1170 405 1204 479
-rect 1273 474 1307 490
-rect 1273 439 1307 440
-rect 978 291 1012 405
-rect 1170 371 1210 405
-rect 1058 325 1074 365
-rect 1108 325 1124 365
-rect 1341 365 1377 524
-rect 1176 321 1210 337
-rect 1289 331 1377 365
-rect 1287 325 1377 331
-rect 1477 365 1511 592
-rect 1667 513 1701 617
-rect 1753 757 1787 827
-rect 1753 545 1787 617
-rect 1839 757 1873 773
-rect 1839 587 1873 617
-rect 1872 570 1873 587
-rect 1872 553 1896 570
-rect 1839 536 1896 553
-rect 1667 474 1701 479
-rect 1667 440 1818 474
-rect 1784 400 1818 440
-rect 1477 331 1687 365
-rect 1721 331 1737 365
-rect 978 241 1012 257
-rect 656 187 690 240
-rect 1046 207 1080 257
-rect 311 115 345 131
-rect 397 165 431 181
-rect 397 61 431 131
-rect 501 171 535 187
-rect 656 171 727 187
-rect 656 153 659 171
-rect 501 61 535 131
-rect 659 115 727 131
-rect 851 165 885 181
-rect 851 61 885 131
-rect 1009 171 1080 207
-rect 1077 131 1080 171
-rect 1009 115 1080 131
-rect 1201 171 1235 187
-rect 1201 61 1235 131
-rect 1287 171 1321 325
-rect 1409 291 1443 307
-rect 1409 241 1443 257
-rect 1287 115 1321 131
-rect 1391 165 1425 181
-rect 1391 61 1425 131
-rect 1477 165 1511 331
-rect 1784 291 1818 366
-rect 1545 225 1561 259
-rect 1595 225 1611 259
-rect 1667 257 1818 291
-rect 1477 115 1511 131
-rect 1563 165 1597 181
-rect 1563 61 1597 131
-rect 1667 165 1701 257
-rect 1862 224 1896 536
-rect 1839 190 1896 224
-rect 1667 115 1701 131
-rect 1753 165 1787 181
-rect 1753 61 1787 131
-rect 1839 165 1873 190
-rect 1839 115 1873 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 1682 861 1716 867
-rect 1682 833 1716 861
-rect 1818 861 1852 867
-rect 1818 833 1852 861
-rect 47 553 81 587
-rect 227 259 261 291
-rect 227 257 261 259
-rect 311 257 345 291
-rect 628 405 662 439
-rect 556 331 590 365
-rect 824 257 842 291
-rect 842 257 858 291
-rect 910 257 944 291
-rect 1074 405 1108 439
-rect 1170 479 1204 513
-rect 1273 405 1307 439
-rect 1074 331 1108 365
-rect 1255 331 1289 365
-rect 1838 553 1872 587
-rect 1667 479 1701 513
-rect 1687 331 1721 365
-rect 1046 257 1080 291
-rect 1409 257 1443 291
-rect 1561 259 1595 291
-rect 1561 257 1595 259
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 867 1914 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1682 867
-rect 1716 833 1818 867
-rect 1852 833 1914 867
-rect 0 827 1914 833
-rect 35 587 93 593
-rect 1826 587 1884 593
-rect 35 553 47 587
-rect 81 586 121 587
-rect 81 553 127 586
-rect 1804 553 1838 587
-rect 1872 553 1884 587
-rect 35 547 93 553
-rect 1826 547 1884 553
-rect 1158 513 1216 519
-rect 1655 513 1713 519
-rect 1158 479 1170 513
-rect 1204 479 1383 513
-rect 1632 479 1667 513
-rect 1701 479 1713 513
-rect 1158 473 1216 479
-rect 616 439 674 445
-rect 1062 439 1120 445
-rect 1261 439 1319 445
-rect 616 405 628 439
-rect 662 405 1074 439
-rect 1108 405 1273 439
-rect 1307 405 1319 439
-rect 616 399 674 405
-rect 1062 399 1120 405
-rect 1261 399 1319 405
-rect 544 365 602 371
-rect 1062 365 1120 371
-rect 1243 365 1302 371
-rect 544 331 556 365
-rect 590 331 624 365
-rect 1062 331 1074 365
-rect 1108 331 1255 365
-rect 1289 331 1302 365
-rect 544 325 602 331
-rect 1062 325 1120 331
-rect 1243 325 1302 331
-rect 1347 365 1383 479
-rect 1655 473 1713 479
-rect 1675 365 1733 371
-rect 1347 331 1687 365
-rect 1721 331 1733 365
-rect 1347 330 1733 331
-rect 1675 325 1733 330
-rect 217 291 271 303
-rect 217 257 227 291
-rect 261 257 271 291
-rect 217 251 271 257
-rect 299 291 356 299
-rect 812 291 870 297
-rect 299 257 311 291
-rect 345 257 824 291
-rect 858 257 870 291
-rect 227 217 261 251
-rect 299 250 356 257
-rect 812 251 870 257
-rect 898 291 956 297
-rect 1036 291 1088 297
-rect 1397 291 1455 297
-rect 898 257 910 291
-rect 944 257 1046 291
-rect 1080 257 1409 291
-rect 1443 257 1455 291
-rect 898 251 956 257
-rect 1036 251 1088 257
-rect 1397 251 1455 257
-rect 1549 291 1607 297
-rect 1549 257 1561 291
-rect 1595 257 1607 291
-rect 1549 251 1607 257
-rect 1561 217 1595 251
-rect 227 183 1595 217
-rect 0 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel viali 65 570 65 570 1 RN
-port 1 n
-rlabel viali 1855 570 1855 570 1 Q
-port 4 n
-rlabel viali 1685 496 1685 496 1 QN
-port 5 n
-rlabel viali 573 348 573 348 1 D
-port 2 n
-rlabel viali 1290 422 1290 422 1 CK
-port 3 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__dffr_l.mag b/12T_ms/sky130_osu_sc_12T_ms__dffr_l.mag
deleted file mode 100644
index 438de36..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__dffr_l.mag
+++ /dev/null
@@ -1,838 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864422
-<< checkpaint >>
-rect -1210 -1243 3112 2131
-<< nwell >>
-rect -10 485 1917 897
-<< nmos >>
-rect 80 115 110 219
-rect 270 115 300 187
-rect 356 115 386 187
-rect 546 115 576 219
-rect 618 115 648 219
-rect 738 115 768 219
-rect 810 115 840 219
-rect 896 115 926 219
-rect 968 115 998 219
-rect 1088 115 1118 219
-rect 1160 115 1190 219
-rect 1246 115 1276 219
-rect 1436 115 1466 187
-rect 1522 115 1552 187
-rect 1712 115 1742 187
-rect 1798 115 1828 187
-<< pmos >>
-rect 80 521 110 773
-rect 270 605 300 773
-rect 342 605 372 773
-rect 546 521 576 773
-rect 618 521 648 773
-rect 738 521 768 773
-rect 810 521 840 773
-rect 896 521 926 773
-rect 968 521 998 773
-rect 1088 521 1118 773
-rect 1160 521 1190 773
-rect 1246 521 1276 773
-rect 1436 605 1466 773
-rect 1508 605 1538 773
-rect 1712 605 1742 773
-rect 1798 605 1828 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-rect 217 165 270 187
-rect 217 131 225 165
-rect 259 131 270 165
-rect 217 115 270 131
-rect 300 165 356 187
-rect 300 131 311 165
-rect 345 131 356 165
-rect 300 115 356 131
-rect 386 165 439 187
-rect 386 131 397 165
-rect 431 131 439 165
-rect 386 115 439 131
-rect 493 171 546 219
-rect 493 131 501 171
-rect 535 131 546 171
-rect 493 115 546 131
-rect 576 115 618 219
-rect 648 171 738 219
-rect 648 131 659 171
-rect 727 131 738 171
-rect 648 115 738 131
-rect 768 115 810 219
-rect 840 165 896 219
-rect 840 131 851 165
-rect 885 131 896 165
-rect 840 115 896 131
-rect 926 115 968 219
-rect 998 171 1088 219
-rect 998 131 1009 171
-rect 1077 131 1088 171
-rect 998 115 1088 131
-rect 1118 115 1160 219
-rect 1190 171 1246 219
-rect 1190 131 1201 171
-rect 1235 131 1246 171
-rect 1190 115 1246 131
-rect 1276 171 1329 219
-rect 1276 131 1287 171
-rect 1321 131 1329 171
-rect 1276 115 1329 131
-rect 1383 165 1436 187
-rect 1383 131 1391 165
-rect 1425 131 1436 165
-rect 1383 115 1436 131
-rect 1466 165 1522 187
-rect 1466 131 1477 165
-rect 1511 131 1522 165
-rect 1466 115 1522 131
-rect 1552 165 1605 187
-rect 1552 131 1563 165
-rect 1597 131 1605 165
-rect 1552 115 1605 131
-rect 1659 165 1712 187
-rect 1659 131 1667 165
-rect 1701 131 1712 165
-rect 1659 115 1712 131
-rect 1742 165 1798 187
-rect 1742 131 1753 165
-rect 1787 131 1798 165
-rect 1742 115 1798 131
-rect 1828 165 1881 187
-rect 1828 131 1839 165
-rect 1873 131 1881 165
-rect 1828 115 1881 131
-<< pdiff >>
-rect 27 758 80 773
-rect 27 697 35 758
-rect 69 697 80 758
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 560 121 757
-rect 155 560 163 757
-rect 217 757 270 773
-rect 217 621 225 757
-rect 259 621 270 757
-rect 217 605 270 621
-rect 300 605 342 773
-rect 372 757 425 773
-rect 372 621 383 757
-rect 417 621 425 757
-rect 372 605 425 621
-rect 493 757 546 773
-rect 493 629 501 757
-rect 535 629 546 757
-rect 110 521 163 560
-rect 493 521 546 629
-rect 576 521 618 773
-rect 648 757 738 773
-rect 648 561 659 757
-rect 727 561 738 757
-rect 648 521 738 561
-rect 768 521 810 773
-rect 840 757 896 773
-rect 840 629 851 757
-rect 885 629 896 757
-rect 840 521 896 629
-rect 926 521 968 773
-rect 998 757 1088 773
-rect 998 629 1009 757
-rect 1077 629 1088 757
-rect 998 521 1088 629
-rect 1118 521 1160 773
-rect 1190 757 1246 773
-rect 1190 595 1201 757
-rect 1235 595 1246 757
-rect 1190 521 1246 595
-rect 1276 757 1329 773
-rect 1276 561 1287 757
-rect 1321 561 1329 757
-rect 1383 757 1436 773
-rect 1383 621 1391 757
-rect 1425 621 1436 757
-rect 1383 605 1436 621
-rect 1466 605 1508 773
-rect 1538 757 1591 773
-rect 1538 621 1549 757
-rect 1583 621 1591 757
-rect 1538 605 1591 621
-rect 1659 757 1712 773
-rect 1659 617 1667 757
-rect 1701 617 1712 757
-rect 1659 605 1712 617
-rect 1742 757 1798 773
-rect 1742 617 1753 757
-rect 1787 617 1798 757
-rect 1742 605 1798 617
-rect 1828 757 1881 773
-rect 1828 617 1839 757
-rect 1873 617 1881 757
-rect 1828 605 1881 617
-rect 1276 521 1329 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 225 131 259 165
-rect 311 131 345 165
-rect 397 131 431 165
-rect 501 131 535 171
-rect 659 131 727 171
-rect 851 131 885 165
-rect 1009 131 1077 171
-rect 1201 131 1235 171
-rect 1287 131 1321 171
-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 697 69 758
-rect 121 560 155 757
-rect 225 621 259 757
-rect 383 621 417 757
-rect 501 629 535 757
-rect 659 561 727 757
-rect 851 629 885 757
-rect 1009 629 1077 757
-rect 1201 595 1235 757
-rect 1287 561 1321 757
-rect 1391 621 1425 757
-rect 1549 621 1583 757
-rect 1667 617 1701 757
-rect 1753 617 1787 757
-rect 1839 617 1873 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-rect 1658 827 1682 861
-rect 1716 827 1740 861
-rect 1794 827 1818 861
-rect 1852 827 1876 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-rect 1682 827 1716 861
-rect 1818 827 1852 861
-<< poly >>
-rect 80 773 110 799
-rect 270 773 300 799
-rect 342 773 372 799
-rect 546 773 576 799
-rect 618 773 648 799
-rect 738 773 768 799
-rect 810 773 840 799
-rect 896 773 926 799
-rect 968 773 998 799
-rect 1088 773 1118 799
-rect 1160 773 1190 799
-rect 1246 773 1276 799
-rect 1436 773 1466 799
-rect 1508 773 1538 799
-rect 1712 773 1742 799
-rect 1798 773 1828 799
-rect 80 398 110 521
-rect 79 382 133 398
-rect 79 348 89 382
-rect 123 348 133 382
-rect 79 332 133 348
-rect 79 331 110 332
-rect 80 219 110 331
-rect 270 275 300 605
-rect 342 508 372 605
-rect 342 492 415 508
-rect 342 458 371 492
-rect 405 458 415 492
-rect 342 442 415 458
-rect 217 259 300 275
-rect 217 225 227 259
-rect 261 225 300 259
-rect 217 209 300 225
-rect 270 187 300 209
-rect 356 187 386 442
-rect 546 381 576 521
-rect 618 490 648 521
-rect 618 474 672 490
-rect 618 440 628 474
-rect 662 440 672 474
-rect 618 424 672 440
-rect 546 365 600 381
-rect 738 379 768 521
-rect 810 484 840 521
-rect 896 484 926 521
-rect 810 474 926 484
-rect 810 440 842 474
-rect 876 440 926 474
-rect 810 430 926 440
-rect 968 379 998 521
-rect 1088 490 1118 521
-rect 1064 474 1118 490
-rect 1064 440 1074 474
-rect 1108 440 1118 474
-rect 1064 424 1118 440
-rect 1160 451 1190 521
-rect 1246 490 1276 521
-rect 1246 474 1317 490
-rect 1246 460 1273 474
-rect 1160 421 1196 451
-rect 1257 440 1273 460
-rect 1307 440 1317 474
-rect 1257 424 1317 440
-rect 1166 387 1196 421
-rect 546 331 556 365
-rect 590 331 600 365
-rect 546 315 600 331
-rect 642 365 1124 379
-rect 642 349 1074 365
-rect 546 219 576 315
-rect 642 271 672 349
-rect 1064 325 1074 349
-rect 1108 325 1124 365
-rect 618 241 672 271
-rect 714 291 768 307
-rect 714 257 724 291
-rect 758 257 768 291
-rect 714 241 768 257
-rect 618 219 648 241
-rect 738 219 768 241
-rect 810 291 926 301
-rect 810 257 842 291
-rect 876 257 926 291
-rect 810 247 926 257
-rect 810 219 840 247
-rect 896 219 926 247
-rect 968 291 1022 307
-rect 1064 304 1124 325
-rect 1166 371 1220 387
-rect 1166 337 1176 371
-rect 1210 337 1220 371
-rect 1166 321 1220 337
-rect 968 257 978 291
-rect 1012 257 1022 291
-rect 968 241 1022 257
-rect 968 219 998 241
-rect 1088 219 1118 304
-rect 1166 273 1196 321
-rect 1160 241 1196 273
-rect 1262 271 1292 424
-rect 1436 307 1466 605
-rect 1246 241 1292 271
-rect 1399 291 1466 307
-rect 1399 257 1409 291
-rect 1443 257 1466 291
-rect 1508 304 1538 605
-rect 1712 505 1742 605
-rect 1702 475 1742 505
-rect 1702 381 1732 475
-rect 1798 416 1828 605
-rect 1677 365 1732 381
-rect 1677 331 1687 365
-rect 1721 331 1732 365
-rect 1774 400 1828 416
-rect 1774 366 1784 400
-rect 1818 366 1828 400
-rect 1774 350 1828 366
-rect 1677 315 1732 331
-rect 1508 275 1552 304
-rect 1399 241 1466 257
-rect 1160 219 1190 241
-rect 1246 219 1276 241
-rect 1436 187 1466 241
-rect 1522 259 1605 275
-rect 1522 225 1561 259
-rect 1595 225 1605 259
-rect 1702 264 1732 315
-rect 1702 234 1742 264
-rect 1522 209 1605 225
-rect 1522 187 1552 209
-rect 1712 187 1742 234
-rect 1798 187 1828 350
-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 348 123 382
-rect 371 458 405 492
-rect 227 225 261 259
-rect 628 440 662 474
-rect 842 440 876 474
-rect 1074 440 1108 474
-rect 1273 440 1307 474
-rect 556 331 590 365
-rect 1074 325 1108 365
-rect 724 257 758 291
-rect 842 257 876 291
-rect 1176 337 1210 371
-rect 978 257 1012 291
-rect 1409 257 1443 291
-rect 1687 331 1721 365
-rect 1784 366 1818 400
-rect 1561 225 1595 259
-<< locali >>
-rect 0 867 1914 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1682 867
-rect 1716 827 1818 867
-rect 1852 827 1914 867
-rect 35 758 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 398 81 553
-rect 121 469 155 560
-rect 225 757 259 773
-rect 121 435 191 469
-rect 47 382 123 398
-rect 47 348 89 382
-rect 89 332 123 348
-rect 157 259 191 435
-rect 225 379 259 621
-rect 383 757 417 827
-rect 383 605 417 621
-rect 501 757 535 827
-rect 501 613 535 629
-rect 659 757 727 773
-rect 851 757 885 827
-rect 851 613 885 629
-rect 1009 757 1077 773
-rect 659 558 727 561
-rect 1009 558 1077 629
-rect 1201 757 1235 827
-rect 1201 579 1235 595
-rect 1287 757 1321 773
-rect 405 524 727 558
-rect 910 524 1077 558
-rect 1391 757 1425 773
-rect 1549 757 1583 827
-rect 1425 621 1511 626
-rect 1391 592 1511 621
-rect 1549 605 1583 621
-rect 1667 757 1701 773
-rect 1287 558 1321 561
-rect 1287 524 1377 558
-rect 405 508 439 524
-rect 371 492 439 508
-rect 405 458 439 492
-rect 371 442 439 458
-rect 225 345 345 379
-rect 311 291 345 345
-rect 157 239 227 259
-rect 121 225 227 239
-rect 261 225 277 259
-rect 121 205 191 225
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 205
-rect 121 115 155 131
-rect 225 165 259 181
-rect 225 61 259 131
-rect 311 165 345 257
-rect 405 294 439 442
-rect 628 474 662 490
-rect 628 439 662 440
-rect 842 474 876 490
-rect 662 405 758 439
-rect 556 365 590 381
-rect 556 315 590 331
-rect 405 274 440 294
-rect 724 291 758 405
-rect 842 291 876 440
-rect 405 240 690 274
-rect 724 241 758 257
-rect 842 241 876 257
-rect 910 291 944 524
-rect 1074 474 1108 490
-rect 1074 439 1108 440
-rect 910 241 944 257
-rect 978 405 1074 439
-rect 1170 405 1204 479
-rect 1273 474 1307 490
-rect 1273 439 1307 440
-rect 978 291 1012 405
-rect 1170 371 1210 405
-rect 1058 325 1074 365
-rect 1108 325 1124 365
-rect 1341 365 1377 524
-rect 1176 321 1210 337
-rect 1289 331 1377 365
-rect 1287 325 1377 331
-rect 1477 365 1511 592
-rect 1667 513 1701 617
-rect 1753 757 1787 827
-rect 1753 545 1787 617
-rect 1839 757 1873 773
-rect 1839 587 1873 617
-rect 1872 570 1873 587
-rect 1872 553 1896 570
-rect 1839 536 1896 553
-rect 1667 474 1701 479
-rect 1667 440 1818 474
-rect 1784 400 1818 440
-rect 1477 331 1687 365
-rect 1721 331 1737 365
-rect 978 241 1012 257
-rect 656 187 690 240
-rect 1046 207 1080 257
-rect 311 115 345 131
-rect 397 165 431 181
-rect 397 61 431 131
-rect 501 171 535 187
-rect 656 171 727 187
-rect 656 153 659 171
-rect 501 61 535 131
-rect 659 115 727 131
-rect 851 165 885 181
-rect 851 61 885 131
-rect 1009 171 1080 207
-rect 1077 131 1080 171
-rect 1009 115 1080 131
-rect 1201 171 1235 187
-rect 1201 61 1235 131
-rect 1287 171 1321 325
-rect 1409 291 1443 307
-rect 1409 241 1443 257
-rect 1287 115 1321 131
-rect 1391 165 1425 181
-rect 1391 61 1425 131
-rect 1477 165 1511 331
-rect 1784 291 1818 366
-rect 1545 225 1561 259
-rect 1595 225 1611 259
-rect 1667 257 1818 291
-rect 1477 115 1511 131
-rect 1563 165 1597 181
-rect 1563 61 1597 131
-rect 1667 165 1701 257
-rect 1862 224 1896 536
-rect 1839 190 1896 224
-rect 1667 115 1701 131
-rect 1753 165 1787 181
-rect 1753 61 1787 131
-rect 1839 165 1873 190
-rect 1839 115 1873 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 1682 861 1716 867
-rect 1682 833 1716 861
-rect 1818 861 1852 867
-rect 1818 833 1852 861
-rect 47 553 81 587
-rect 227 259 261 291
-rect 227 257 261 259
-rect 311 257 345 291
-rect 628 405 662 439
-rect 556 331 590 365
-rect 824 257 842 291
-rect 842 257 858 291
-rect 910 257 944 291
-rect 1074 405 1108 439
-rect 1170 479 1204 513
-rect 1273 405 1307 439
-rect 1074 331 1108 365
-rect 1255 331 1289 365
-rect 1838 553 1872 587
-rect 1667 479 1701 513
-rect 1687 331 1721 365
-rect 1046 257 1080 291
-rect 1409 257 1443 291
-rect 1561 259 1595 291
-rect 1561 257 1595 259
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 867 1914 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1682 867
-rect 1716 833 1818 867
-rect 1852 833 1914 867
-rect 0 827 1914 833
-rect 35 587 93 593
-rect 1826 587 1884 593
-rect 35 553 47 587
-rect 81 586 121 587
-rect 81 553 127 586
-rect 1804 553 1838 587
-rect 1872 553 1884 587
-rect 35 547 93 553
-rect 1826 547 1884 553
-rect 1158 513 1216 519
-rect 1655 513 1713 519
-rect 1158 479 1170 513
-rect 1204 479 1383 513
-rect 1632 479 1667 513
-rect 1701 479 1713 513
-rect 1158 473 1216 479
-rect 616 439 674 445
-rect 1062 439 1120 445
-rect 1261 439 1319 445
-rect 616 405 628 439
-rect 662 405 1074 439
-rect 1108 405 1273 439
-rect 1307 405 1319 439
-rect 616 399 674 405
-rect 1062 399 1120 405
-rect 1261 399 1319 405
-rect 544 365 602 371
-rect 1062 365 1120 371
-rect 1243 365 1302 371
-rect 544 331 556 365
-rect 590 331 624 365
-rect 1062 331 1074 365
-rect 1108 331 1255 365
-rect 1289 331 1302 365
-rect 544 325 602 331
-rect 1062 325 1120 331
-rect 1243 325 1302 331
-rect 1347 365 1383 479
-rect 1655 473 1713 479
-rect 1675 365 1733 371
-rect 1347 331 1687 365
-rect 1721 331 1733 365
-rect 1347 330 1733 331
-rect 1675 325 1733 330
-rect 217 291 271 303
-rect 217 257 227 291
-rect 261 257 271 291
-rect 217 251 271 257
-rect 299 291 356 299
-rect 812 291 870 297
-rect 299 257 311 291
-rect 345 257 824 291
-rect 858 257 870 291
-rect 227 217 261 251
-rect 299 250 356 257
-rect 812 251 870 257
-rect 898 291 956 297
-rect 1036 291 1088 297
-rect 1397 291 1455 297
-rect 898 257 910 291
-rect 944 257 1046 291
-rect 1080 257 1409 291
-rect 1443 257 1455 291
-rect 898 251 956 257
-rect 1036 251 1088 257
-rect 1397 251 1455 257
-rect 1549 291 1607 297
-rect 1549 257 1561 291
-rect 1595 257 1607 291
-rect 1549 251 1607 257
-rect 1561 217 1595 251
-rect 227 183 1595 217
-rect 0 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel viali 65 570 65 570 1 RN
-port 1 n
-rlabel viali 1855 570 1855 570 1 Q
-port 4 n
-rlabel viali 1685 496 1685 496 1 QN
-port 5 n
-rlabel viali 573 348 573 348 1 D
-port 2 n
-rlabel viali 1290 422 1290 422 1 CK
-port 3 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__dffs_1.mag b/12T_ms/sky130_osu_sc_12T_ms__dffs_1.mag
deleted file mode 100644
index 05be9be..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__dffs_1.mag
+++ /dev/null
@@ -1,754 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864422
-<< checkpaint >>
-rect -1210 -1243 2840 2131
-<< nwell >>
-rect -10 789 1741 897
-rect -11 563 1741 789
-rect -10 485 1741 563
-<< nmos >>
-rect 80 115 110 187
-rect 152 115 182 187
-rect 356 115 386 219
-rect 428 115 458 219
-rect 548 115 578 219
-rect 620 115 650 219
-rect 706 115 736 219
-rect 778 115 808 219
-rect 898 115 928 219
-rect 970 115 1000 219
-rect 1056 115 1086 219
-rect 1246 115 1276 187
-rect 1318 115 1348 187
-rect 1522 115 1552 219
-rect 1608 115 1638 219
-<< pmos >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 356 521 386 773
-rect 428 521 458 773
-rect 548 521 578 773
-rect 620 521 650 773
-rect 706 521 736 773
-rect 778 521 808 773
-rect 898 521 928 773
-rect 970 521 1000 773
-rect 1056 521 1086 773
-rect 1246 605 1276 773
-rect 1332 605 1362 773
-rect 1522 521 1552 773
-rect 1608 521 1638 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 115 152 187
-rect 182 165 235 187
-rect 182 131 193 165
-rect 227 131 235 165
-rect 182 115 235 131
-rect 303 171 356 219
-rect 303 131 311 171
-rect 345 131 356 171
-rect 303 115 356 131
-rect 386 115 428 219
-rect 458 171 548 219
-rect 458 131 469 171
-rect 537 131 548 171
-rect 458 115 548 131
-rect 578 115 620 219
-rect 650 165 706 219
-rect 650 131 661 165
-rect 695 131 706 165
-rect 650 115 706 131
-rect 736 115 778 219
-rect 808 171 898 219
-rect 808 131 819 171
-rect 887 131 898 171
-rect 808 115 898 131
-rect 928 115 970 219
-rect 1000 171 1056 219
-rect 1000 131 1011 171
-rect 1045 131 1056 171
-rect 1000 115 1056 131
-rect 1086 171 1139 219
-rect 1086 131 1097 171
-rect 1131 131 1139 171
-rect 1086 115 1139 131
-rect 1193 165 1246 187
-rect 1193 131 1201 165
-rect 1235 131 1246 165
-rect 1193 115 1246 131
-rect 1276 115 1318 187
-rect 1348 165 1401 187
-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 757 80 773
-rect 27 689 35 757
-rect 69 689 80 757
-rect 27 605 80 689
-rect 110 757 166 773
-rect 110 689 121 757
-rect 155 689 166 757
-rect 110 605 166 689
-rect 196 757 249 773
-rect 196 689 207 757
-rect 241 689 249 757
-rect 196 605 249 689
-rect 303 757 356 773
-rect 303 629 311 757
-rect 345 629 356 757
-rect 303 521 356 629
-rect 386 521 428 773
-rect 458 757 548 773
-rect 458 561 469 757
-rect 537 561 548 757
-rect 458 521 548 561
-rect 578 521 620 773
-rect 650 757 706 773
-rect 650 629 661 757
-rect 695 629 706 757
-rect 650 521 706 629
-rect 736 521 778 773
-rect 808 757 898 773
-rect 808 629 819 757
-rect 887 629 898 757
-rect 808 521 898 629
-rect 928 521 970 773
-rect 1000 757 1056 773
-rect 1000 595 1011 757
-rect 1045 595 1056 757
-rect 1000 521 1056 595
-rect 1086 757 1139 773
-rect 1086 561 1097 757
-rect 1131 561 1139 757
-rect 1193 757 1246 773
-rect 1193 689 1201 757
-rect 1235 689 1246 757
-rect 1193 605 1246 689
-rect 1276 757 1332 773
-rect 1276 689 1287 757
-rect 1321 689 1332 757
-rect 1276 605 1332 689
-rect 1362 757 1415 773
-rect 1362 689 1373 757
-rect 1407 689 1415 757
-rect 1362 605 1415 689
-rect 1469 757 1522 773
-rect 1469 617 1477 757
-rect 1511 617 1522 757
-rect 1086 521 1139 561
-rect 1469 521 1522 617
-rect 1552 757 1608 773
-rect 1552 617 1563 757
-rect 1597 617 1608 757
-rect 1552 521 1608 617
-rect 1638 757 1691 773
-rect 1638 617 1649 757
-rect 1683 617 1691 757
-rect 1638 521 1691 617
-<< ndiffc >>
-rect 35 131 69 165
-rect 193 131 227 165
-rect 311 131 345 171
-rect 469 131 537 171
-rect 661 131 695 165
-rect 819 131 887 171
-rect 1011 131 1045 171
-rect 1097 131 1131 171
-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 689 69 757
-rect 121 689 155 757
-rect 207 689 241 757
-rect 311 629 345 757
-rect 469 561 537 757
-rect 661 629 695 757
-rect 819 629 887 757
-rect 1011 595 1045 757
-rect 1097 561 1131 757
-rect 1201 689 1235 757
-rect 1287 689 1321 757
-rect 1373 689 1407 757
-rect 1477 617 1511 757
-rect 1563 617 1597 757
-rect 1649 617 1683 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 356 773 386 799
-rect 428 773 458 799
-rect 548 773 578 799
-rect 620 773 650 799
-rect 706 773 736 799
-rect 778 773 808 799
-rect 898 773 928 799
-rect 970 773 1000 799
-rect 1056 773 1086 799
-rect 1246 773 1276 799
-rect 1332 773 1362 799
-rect 1522 773 1552 799
-rect 1608 773 1638 799
-rect 80 327 110 605
-rect 166 418 196 605
-rect 37 311 110 327
-rect 37 277 47 311
-rect 81 277 110 311
-rect 37 261 110 277
-rect 80 187 110 261
-rect 152 402 233 418
-rect 152 368 189 402
-rect 223 368 233 402
-rect 152 352 233 368
-rect 356 381 386 521
-rect 428 490 458 521
-rect 428 474 482 490
-rect 428 440 438 474
-rect 472 440 482 474
-rect 428 424 482 440
-rect 356 365 410 381
-rect 548 379 578 521
-rect 620 484 650 521
-rect 706 484 736 521
-rect 620 474 736 484
-rect 620 440 652 474
-rect 686 440 736 474
-rect 620 430 736 440
-rect 778 381 808 521
-rect 898 490 928 521
-rect 874 474 928 490
-rect 874 440 884 474
-rect 918 440 928 474
-rect 874 424 928 440
-rect 778 379 928 381
-rect 152 187 182 352
-rect 356 331 366 365
-rect 400 331 410 365
-rect 356 315 410 331
-rect 452 365 928 379
-rect 452 349 884 365
-rect 356 219 386 315
-rect 452 271 482 349
-rect 874 331 884 349
-rect 918 331 928 365
-rect 874 313 928 331
-rect 428 241 482 271
-rect 524 291 578 307
-rect 524 257 534 291
-rect 568 257 578 291
-rect 524 241 578 257
-rect 428 219 458 241
-rect 548 219 578 241
-rect 620 291 736 301
-rect 620 257 652 291
-rect 686 257 736 291
-rect 620 247 736 257
-rect 620 219 650 247
-rect 706 219 736 247
-rect 778 291 832 307
-rect 778 257 788 291
-rect 822 257 832 291
-rect 778 241 832 257
-rect 778 219 808 241
-rect 898 219 928 313
-rect 970 375 1000 521
-rect 1056 490 1086 521
-rect 1056 474 1127 490
-rect 1056 460 1083 474
-rect 1067 440 1083 460
-rect 1117 440 1127 474
-rect 1067 424 1127 440
-rect 970 359 1024 375
-rect 970 325 980 359
-rect 1014 325 1024 359
-rect 970 309 1024 325
-rect 970 219 1000 309
-rect 1067 271 1097 424
-rect 1246 307 1276 605
-rect 1056 241 1097 271
-rect 1193 291 1276 307
-rect 1193 257 1203 291
-rect 1237 257 1276 291
-rect 1332 285 1362 605
-rect 1522 505 1552 521
-rect 1512 475 1552 505
-rect 1512 375 1542 475
-rect 1608 416 1638 521
-rect 1487 359 1542 375
-rect 1487 325 1497 359
-rect 1531 325 1542 359
-rect 1584 400 1638 416
-rect 1584 366 1594 400
-rect 1628 366 1638 400
-rect 1584 350 1638 366
-rect 1487 309 1542 325
-rect 1193 241 1276 257
-rect 1056 219 1086 241
-rect 1246 187 1276 241
-rect 1318 275 1378 285
-rect 1318 259 1415 275
-rect 1318 225 1371 259
-rect 1405 225 1415 259
-rect 1512 264 1542 309
-rect 1512 234 1552 264
-rect 1318 209 1415 225
-rect 1522 219 1552 234
-rect 1608 219 1638 350
-rect 1318 208 1354 209
-rect 1318 187 1348 208
-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 277 81 311
-rect 189 368 223 402
-rect 438 440 472 474
-rect 652 440 686 474
-rect 884 440 918 474
-rect 366 331 400 365
-rect 884 331 918 365
-rect 534 257 568 291
-rect 652 257 686 291
-rect 788 257 822 291
-rect 1083 440 1117 474
-rect 980 325 1014 359
-rect 1203 257 1237 291
-rect 1497 325 1531 359
-rect 1594 366 1628 400
-rect 1371 225 1405 259
-<< locali >>
-rect 0 867 1738 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1738 867
-rect 35 757 69 827
-rect 35 673 69 689
-rect 121 757 155 773
-rect 121 398 155 689
-rect 207 757 241 827
-rect 207 673 241 689
-rect 311 757 345 827
-rect 311 613 345 629
-rect 469 757 537 773
-rect 661 757 695 827
-rect 661 613 695 629
-rect 819 757 887 773
-rect 469 558 537 561
-rect 819 558 887 629
-rect 1011 757 1045 827
-rect 1011 579 1045 595
-rect 1097 757 1131 773
-rect 47 324 81 327
-rect 47 261 81 277
-rect 121 199 155 364
-rect 189 524 537 558
-rect 720 524 887 558
-rect 1201 757 1235 827
-rect 1201 673 1235 689
-rect 1287 757 1321 773
-rect 1097 558 1131 561
-rect 1097 524 1187 558
-rect 189 402 223 524
-rect 438 474 472 490
-rect 438 439 472 440
-rect 652 474 686 490
-rect 472 405 568 439
-rect 189 274 223 368
-rect 366 365 400 381
-rect 366 315 400 331
-rect 534 291 568 405
-rect 652 291 686 440
-rect 189 240 500 274
-rect 534 241 568 257
-rect 652 241 686 257
-rect 720 291 754 524
-rect 884 474 918 490
-rect 884 439 918 440
-rect 720 251 754 257
-rect 788 405 884 439
-rect 788 291 822 405
-rect 868 331 884 365
-rect 918 331 934 365
-rect 980 359 1014 479
-rect 1083 474 1117 490
-rect 1083 439 1117 440
-rect 1151 371 1187 524
-rect 1097 365 1187 371
-rect 1121 356 1187 365
-rect 1287 359 1321 689
-rect 1373 757 1407 827
-rect 1373 673 1407 689
-rect 1477 757 1511 773
-rect 1477 513 1511 617
-rect 1563 757 1597 827
-rect 1563 545 1597 617
-rect 1649 757 1683 773
-rect 1649 587 1683 617
-rect 1682 570 1683 587
-rect 1682 553 1706 570
-rect 1649 536 1706 553
-rect 1477 474 1511 479
-rect 1477 440 1628 474
-rect 1594 400 1628 440
-rect 1121 337 1183 356
-rect 1121 331 1131 337
-rect 980 309 1014 325
-rect 788 241 822 257
-rect 35 165 155 199
-rect 466 187 500 240
-rect 856 207 890 257
-rect 193 165 227 181
-rect 35 115 69 131
-rect 193 61 227 131
-rect 311 171 345 187
-rect 466 171 537 187
-rect 466 153 469 171
-rect 311 61 345 131
-rect 469 115 537 131
-rect 661 165 695 181
-rect 661 61 695 131
-rect 819 171 890 207
-rect 887 131 890 171
-rect 819 115 890 131
-rect 1011 171 1045 187
-rect 1011 61 1045 131
-rect 1097 171 1131 331
-rect 1287 325 1497 359
-rect 1531 325 1547 359
-rect 1187 257 1203 291
-rect 1237 257 1253 291
-rect 1287 199 1321 325
-rect 1594 291 1628 366
-rect 1371 259 1405 275
-rect 1355 217 1371 251
-rect 1477 257 1628 291
-rect 1405 217 1421 251
-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 257
-rect 1672 224 1706 536
-rect 1649 190 1706 224
-rect 1477 115 1511 131
-rect 1563 165 1597 181
-rect 1563 61 1597 131
-rect 1649 165 1683 190
-rect 1649 115 1683 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 121 364 155 398
-rect 47 311 81 324
-rect 47 290 81 311
-rect 438 405 472 439
-rect 366 331 400 365
-rect 634 257 652 291
-rect 652 257 668 291
-rect 720 257 754 291
-rect 884 405 918 439
-rect 980 479 1014 513
-rect 884 331 918 365
-rect 1083 405 1117 439
-rect 1087 331 1121 365
-rect 1648 553 1682 587
-rect 1477 479 1511 513
-rect 856 257 890 291
-rect 1497 325 1531 359
-rect 1203 257 1237 291
-rect 1371 225 1405 250
-rect 1371 216 1405 225
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 867 1738 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1738 867
-rect 0 827 1738 833
-rect 1636 587 1694 593
-rect 1614 553 1648 587
-rect 1682 553 1694 587
-rect 1636 547 1694 553
-rect 968 513 1026 519
-rect 1465 513 1523 519
-rect 968 479 980 513
-rect 1014 479 1192 513
-rect 1443 479 1477 513
-rect 1511 479 1523 513
-rect 968 473 1026 479
-rect 1157 478 1192 479
-rect 426 439 484 445
-rect 872 439 930 445
-rect 1071 439 1129 445
-rect 426 405 438 439
-rect 472 405 884 439
-rect 918 405 1083 439
-rect 1117 405 1129 439
-rect 109 398 167 404
-rect 426 399 484 405
-rect 872 399 930 405
-rect 1071 399 1129 405
-rect 109 364 121 398
-rect 155 364 167 398
-rect 109 358 167 364
-rect 354 365 412 371
-rect 872 365 930 371
-rect 1081 365 1133 371
-rect 35 324 93 330
-rect 35 290 47 324
-rect 81 290 93 324
-rect 35 283 93 290
-rect 121 291 155 358
-rect 354 331 366 365
-rect 400 331 434 365
-rect 872 331 884 365
-rect 918 331 1087 365
-rect 1121 331 1133 365
-rect 354 325 412 331
-rect 872 325 930 331
-rect 1081 325 1133 331
-rect 1161 359 1192 478
-rect 1465 473 1523 479
-rect 1485 359 1543 365
-rect 1161 325 1497 359
-rect 1531 325 1543 359
-rect 1485 319 1543 325
-rect 622 291 680 297
-rect 47 211 81 283
-rect 121 257 634 291
-rect 668 257 680 291
-rect 622 251 680 257
-rect 708 291 766 297
-rect 849 291 896 297
-rect 1191 291 1249 297
-rect 708 257 720 291
-rect 754 257 856 291
-rect 890 257 1203 291
-rect 1237 257 1249 291
-rect 708 251 766 257
-rect 849 251 896 257
-rect 1191 251 1249 257
-rect 1355 250 1417 256
-rect 1355 216 1371 250
-rect 1405 216 1417 250
-rect 1355 212 1417 216
-rect 281 211 1417 212
-rect 47 210 1417 211
-rect 47 183 1405 210
-rect 0 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 348 383 348 1 D
-port 1 n
-rlabel viali 1100 422 1100 422 1 CK
-port 2 n
-rlabel viali 1665 570 1665 570 1 Q
-port 4 n
-rlabel viali 1495 496 1495 496 1 QN
-port 3 n
-rlabel viali 64 307 64 307 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__dffs_l.mag b/12T_ms/sky130_osu_sc_12T_ms__dffs_l.mag
deleted file mode 100644
index 32a5ce7..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__dffs_l.mag
+++ /dev/null
@@ -1,754 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864422
-<< checkpaint >>
-rect -1210 -1243 2840 2131
-<< nwell >>
-rect -10 789 1741 897
-rect -11 563 1741 789
-rect -10 485 1741 563
-<< nmos >>
-rect 80 115 110 187
-rect 152 115 182 187
-rect 356 115 386 219
-rect 428 115 458 219
-rect 548 115 578 219
-rect 620 115 650 219
-rect 706 115 736 219
-rect 778 115 808 219
-rect 898 115 928 219
-rect 970 115 1000 219
-rect 1056 115 1086 219
-rect 1246 115 1276 187
-rect 1318 115 1348 187
-rect 1522 115 1552 187
-rect 1608 115 1638 187
-<< pmos >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 356 521 386 773
-rect 428 521 458 773
-rect 548 521 578 773
-rect 620 521 650 773
-rect 706 521 736 773
-rect 778 521 808 773
-rect 898 521 928 773
-rect 970 521 1000 773
-rect 1056 521 1086 773
-rect 1246 605 1276 773
-rect 1332 605 1362 773
-rect 1522 605 1552 773
-rect 1608 605 1638 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 115 152 187
-rect 182 165 235 187
-rect 182 131 193 165
-rect 227 131 235 165
-rect 182 115 235 131
-rect 303 171 356 219
-rect 303 131 311 171
-rect 345 131 356 171
-rect 303 115 356 131
-rect 386 115 428 219
-rect 458 171 548 219
-rect 458 131 469 171
-rect 537 131 548 171
-rect 458 115 548 131
-rect 578 115 620 219
-rect 650 165 706 219
-rect 650 131 661 165
-rect 695 131 706 165
-rect 650 115 706 131
-rect 736 115 778 219
-rect 808 171 898 219
-rect 808 131 819 171
-rect 887 131 898 171
-rect 808 115 898 131
-rect 928 115 970 219
-rect 1000 171 1056 219
-rect 1000 131 1011 171
-rect 1045 131 1056 171
-rect 1000 115 1056 131
-rect 1086 171 1139 219
-rect 1086 131 1097 171
-rect 1131 131 1139 171
-rect 1086 115 1139 131
-rect 1193 165 1246 187
-rect 1193 131 1201 165
-rect 1235 131 1246 165
-rect 1193 115 1246 131
-rect 1276 115 1318 187
-rect 1348 165 1401 187
-rect 1348 131 1359 165
-rect 1393 131 1401 165
-rect 1348 115 1401 131
-rect 1469 165 1522 187
-rect 1469 131 1477 165
-rect 1511 131 1522 165
-rect 1469 115 1522 131
-rect 1552 165 1608 187
-rect 1552 131 1563 165
-rect 1597 131 1608 165
-rect 1552 115 1608 131
-rect 1638 165 1691 187
-rect 1638 131 1649 165
-rect 1683 131 1691 165
-rect 1638 115 1691 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 689 35 757
-rect 69 689 80 757
-rect 27 605 80 689
-rect 110 757 166 773
-rect 110 689 121 757
-rect 155 689 166 757
-rect 110 605 166 689
-rect 196 757 249 773
-rect 196 689 207 757
-rect 241 689 249 757
-rect 196 605 249 689
-rect 303 757 356 773
-rect 303 629 311 757
-rect 345 629 356 757
-rect 303 521 356 629
-rect 386 521 428 773
-rect 458 757 548 773
-rect 458 561 469 757
-rect 537 561 548 757
-rect 458 521 548 561
-rect 578 521 620 773
-rect 650 757 706 773
-rect 650 629 661 757
-rect 695 629 706 757
-rect 650 521 706 629
-rect 736 521 778 773
-rect 808 757 898 773
-rect 808 629 819 757
-rect 887 629 898 757
-rect 808 521 898 629
-rect 928 521 970 773
-rect 1000 757 1056 773
-rect 1000 595 1011 757
-rect 1045 595 1056 757
-rect 1000 521 1056 595
-rect 1086 757 1139 773
-rect 1086 561 1097 757
-rect 1131 561 1139 757
-rect 1193 757 1246 773
-rect 1193 689 1201 757
-rect 1235 689 1246 757
-rect 1193 605 1246 689
-rect 1276 757 1332 773
-rect 1276 689 1287 757
-rect 1321 689 1332 757
-rect 1276 605 1332 689
-rect 1362 757 1415 773
-rect 1362 689 1373 757
-rect 1407 689 1415 757
-rect 1362 605 1415 689
-rect 1469 757 1522 773
-rect 1469 617 1477 757
-rect 1511 617 1522 757
-rect 1469 605 1522 617
-rect 1552 757 1608 773
-rect 1552 617 1563 757
-rect 1597 617 1608 757
-rect 1552 605 1608 617
-rect 1638 757 1691 773
-rect 1638 617 1649 757
-rect 1683 617 1691 757
-rect 1638 605 1691 617
-rect 1086 521 1139 561
-<< ndiffc >>
-rect 35 131 69 165
-rect 193 131 227 165
-rect 311 131 345 171
-rect 469 131 537 171
-rect 661 131 695 165
-rect 819 131 887 171
-rect 1011 131 1045 171
-rect 1097 131 1131 171
-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 689 69 757
-rect 121 689 155 757
-rect 207 689 241 757
-rect 311 629 345 757
-rect 469 561 537 757
-rect 661 629 695 757
-rect 819 629 887 757
-rect 1011 595 1045 757
-rect 1097 561 1131 757
-rect 1201 689 1235 757
-rect 1287 689 1321 757
-rect 1373 689 1407 757
-rect 1477 617 1511 757
-rect 1563 617 1597 757
-rect 1649 617 1683 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 356 773 386 799
-rect 428 773 458 799
-rect 548 773 578 799
-rect 620 773 650 799
-rect 706 773 736 799
-rect 778 773 808 799
-rect 898 773 928 799
-rect 970 773 1000 799
-rect 1056 773 1086 799
-rect 1246 773 1276 799
-rect 1332 773 1362 799
-rect 1522 773 1552 799
-rect 1608 773 1638 799
-rect 80 327 110 605
-rect 166 418 196 605
-rect 37 311 110 327
-rect 37 277 47 311
-rect 81 277 110 311
-rect 37 261 110 277
-rect 80 187 110 261
-rect 152 402 233 418
-rect 152 368 189 402
-rect 223 368 233 402
-rect 152 352 233 368
-rect 356 381 386 521
-rect 428 490 458 521
-rect 428 474 482 490
-rect 428 440 438 474
-rect 472 440 482 474
-rect 428 424 482 440
-rect 356 365 410 381
-rect 548 379 578 521
-rect 620 484 650 521
-rect 706 484 736 521
-rect 620 474 736 484
-rect 620 440 652 474
-rect 686 440 736 474
-rect 620 430 736 440
-rect 778 381 808 521
-rect 898 490 928 521
-rect 874 474 928 490
-rect 874 440 884 474
-rect 918 440 928 474
-rect 874 424 928 440
-rect 778 379 928 381
-rect 152 187 182 352
-rect 356 331 366 365
-rect 400 331 410 365
-rect 356 315 410 331
-rect 452 365 928 379
-rect 452 349 884 365
-rect 356 219 386 315
-rect 452 271 482 349
-rect 874 331 884 349
-rect 918 331 928 365
-rect 874 313 928 331
-rect 428 241 482 271
-rect 524 291 578 307
-rect 524 257 534 291
-rect 568 257 578 291
-rect 524 241 578 257
-rect 428 219 458 241
-rect 548 219 578 241
-rect 620 291 736 301
-rect 620 257 652 291
-rect 686 257 736 291
-rect 620 247 736 257
-rect 620 219 650 247
-rect 706 219 736 247
-rect 778 291 832 307
-rect 778 257 788 291
-rect 822 257 832 291
-rect 778 241 832 257
-rect 778 219 808 241
-rect 898 219 928 313
-rect 970 375 1000 521
-rect 1056 490 1086 521
-rect 1056 474 1127 490
-rect 1056 460 1083 474
-rect 1067 440 1083 460
-rect 1117 440 1127 474
-rect 1067 424 1127 440
-rect 970 359 1024 375
-rect 970 325 980 359
-rect 1014 325 1024 359
-rect 970 309 1024 325
-rect 970 219 1000 309
-rect 1067 271 1097 424
-rect 1246 307 1276 605
-rect 1056 241 1097 271
-rect 1193 291 1276 307
-rect 1193 257 1203 291
-rect 1237 257 1276 291
-rect 1332 285 1362 605
-rect 1522 505 1552 605
-rect 1512 475 1552 505
-rect 1512 375 1542 475
-rect 1608 416 1638 605
-rect 1487 359 1542 375
-rect 1487 325 1497 359
-rect 1531 325 1542 359
-rect 1584 400 1638 416
-rect 1584 366 1594 400
-rect 1628 366 1638 400
-rect 1584 350 1638 366
-rect 1487 309 1542 325
-rect 1193 241 1276 257
-rect 1056 219 1086 241
-rect 1246 187 1276 241
-rect 1318 275 1378 285
-rect 1318 259 1415 275
-rect 1318 225 1371 259
-rect 1405 225 1415 259
-rect 1512 264 1542 309
-rect 1512 234 1552 264
-rect 1318 209 1415 225
-rect 1318 208 1362 209
-rect 1318 187 1348 208
-rect 1522 187 1552 234
-rect 1608 187 1638 350
-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 277 81 311
-rect 189 368 223 402
-rect 438 440 472 474
-rect 652 440 686 474
-rect 884 440 918 474
-rect 366 331 400 365
-rect 884 331 918 365
-rect 534 257 568 291
-rect 652 257 686 291
-rect 788 257 822 291
-rect 1083 440 1117 474
-rect 980 325 1014 359
-rect 1203 257 1237 291
-rect 1497 325 1531 359
-rect 1594 366 1628 400
-rect 1371 225 1405 259
-<< locali >>
-rect 0 867 1738 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1738 867
-rect 35 757 69 827
-rect 35 673 69 689
-rect 121 757 155 773
-rect 121 398 155 689
-rect 207 757 241 827
-rect 207 673 241 689
-rect 311 757 345 827
-rect 311 613 345 629
-rect 469 757 537 773
-rect 661 757 695 827
-rect 661 613 695 629
-rect 819 757 887 773
-rect 469 558 537 561
-rect 819 558 887 629
-rect 1011 757 1045 827
-rect 1011 579 1045 595
-rect 1097 757 1131 773
-rect 47 324 81 327
-rect 47 261 81 277
-rect 121 199 155 364
-rect 189 524 537 558
-rect 720 524 887 558
-rect 1201 757 1235 827
-rect 1201 673 1235 689
-rect 1287 757 1321 773
-rect 1097 558 1131 561
-rect 1097 524 1187 558
-rect 189 402 223 524
-rect 438 474 472 490
-rect 438 439 472 440
-rect 652 474 686 490
-rect 472 405 568 439
-rect 189 274 223 368
-rect 366 365 400 381
-rect 366 315 400 331
-rect 534 291 568 405
-rect 652 291 686 440
-rect 189 240 500 274
-rect 534 241 568 257
-rect 652 241 686 257
-rect 720 291 754 524
-rect 884 474 918 490
-rect 884 439 918 440
-rect 720 251 754 257
-rect 788 405 884 439
-rect 788 291 822 405
-rect 868 331 884 365
-rect 918 331 934 365
-rect 980 359 1014 479
-rect 1083 474 1117 490
-rect 1083 439 1117 440
-rect 1151 371 1187 524
-rect 1097 365 1187 371
-rect 1121 356 1187 365
-rect 1287 359 1321 689
-rect 1373 757 1407 827
-rect 1373 673 1407 689
-rect 1477 757 1511 773
-rect 1477 513 1511 617
-rect 1563 757 1597 827
-rect 1563 545 1597 617
-rect 1649 757 1683 773
-rect 1649 587 1683 617
-rect 1682 570 1683 587
-rect 1682 553 1706 570
-rect 1649 536 1706 553
-rect 1477 474 1511 479
-rect 1477 440 1628 474
-rect 1594 400 1628 440
-rect 1121 337 1183 356
-rect 1121 331 1131 337
-rect 980 309 1014 325
-rect 788 241 822 257
-rect 35 165 155 199
-rect 466 187 500 240
-rect 856 207 890 257
-rect 193 165 227 181
-rect 35 115 69 131
-rect 193 61 227 131
-rect 311 171 345 187
-rect 466 171 537 187
-rect 466 153 469 171
-rect 311 61 345 131
-rect 469 115 537 131
-rect 661 165 695 181
-rect 661 61 695 131
-rect 819 171 890 207
-rect 887 131 890 171
-rect 819 115 890 131
-rect 1011 171 1045 187
-rect 1011 61 1045 131
-rect 1097 171 1131 331
-rect 1287 325 1497 359
-rect 1531 325 1547 359
-rect 1187 257 1203 291
-rect 1237 257 1253 291
-rect 1287 199 1321 325
-rect 1594 291 1628 366
-rect 1371 259 1405 275
-rect 1355 218 1371 252
-rect 1477 257 1628 291
-rect 1405 218 1421 252
-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 257
-rect 1672 224 1706 536
-rect 1649 190 1706 224
-rect 1477 115 1511 131
-rect 1563 165 1597 181
-rect 1563 61 1597 131
-rect 1649 165 1683 190
-rect 1649 115 1683 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 121 364 155 398
-rect 47 311 81 324
-rect 47 290 81 311
-rect 438 405 472 439
-rect 366 331 400 365
-rect 634 257 652 291
-rect 652 257 668 291
-rect 720 257 754 291
-rect 884 405 918 439
-rect 980 479 1014 513
-rect 884 331 918 365
-rect 1083 405 1117 439
-rect 1087 331 1121 365
-rect 1648 553 1682 587
-rect 1477 479 1511 513
-rect 856 257 890 291
-rect 1497 325 1531 359
-rect 1203 257 1237 291
-rect 1371 225 1405 250
-rect 1371 216 1405 225
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 867 1738 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1738 867
-rect 0 827 1738 833
-rect 1636 587 1694 593
-rect 1614 553 1648 587
-rect 1682 553 1694 587
-rect 1636 547 1694 553
-rect 968 513 1026 519
-rect 1465 513 1523 519
-rect 968 479 980 513
-rect 1014 479 1192 513
-rect 1443 479 1477 513
-rect 1511 479 1523 513
-rect 968 473 1026 479
-rect 1157 478 1192 479
-rect 426 439 484 445
-rect 872 439 930 445
-rect 1071 439 1129 445
-rect 426 405 438 439
-rect 472 405 884 439
-rect 918 405 1083 439
-rect 1117 405 1129 439
-rect 109 398 167 404
-rect 426 399 484 405
-rect 872 399 930 405
-rect 1071 399 1129 405
-rect 109 364 121 398
-rect 155 364 167 398
-rect 109 358 167 364
-rect 354 365 412 371
-rect 872 365 930 371
-rect 1081 365 1133 371
-rect 35 324 93 330
-rect 35 290 47 324
-rect 81 290 93 324
-rect 35 283 93 290
-rect 121 291 155 358
-rect 354 331 366 365
-rect 400 331 434 365
-rect 872 331 884 365
-rect 918 331 1087 365
-rect 1121 331 1133 365
-rect 354 325 412 331
-rect 872 325 930 331
-rect 1081 325 1133 331
-rect 1161 359 1192 478
-rect 1465 473 1523 479
-rect 1485 359 1543 365
-rect 1161 325 1497 359
-rect 1531 325 1543 359
-rect 1485 319 1543 325
-rect 622 291 680 297
-rect 47 211 81 283
-rect 121 257 634 291
-rect 668 257 680 291
-rect 622 251 680 257
-rect 708 291 766 297
-rect 849 291 896 297
-rect 1191 291 1249 297
-rect 708 257 720 291
-rect 754 257 856 291
-rect 890 257 1203 291
-rect 1237 257 1249 291
-rect 708 251 766 257
-rect 849 251 896 257
-rect 1191 251 1249 257
-rect 1355 250 1417 256
-rect 1355 216 1371 250
-rect 1405 216 1417 250
-rect 1355 212 1417 216
-rect 281 211 1417 212
-rect 47 210 1417 211
-rect 47 183 1405 210
-rect 0 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 348 383 348 1 D
-port 1 n
-rlabel viali 1100 422 1100 422 1 CK
-port 2 n
-rlabel viali 1665 570 1665 570 1 Q
-port 4 n
-rlabel viali 1495 496 1495 496 1 QN
-port 3 n
-rlabel viali 64 307 64 307 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__dffsr_1.mag b/12T_ms/sky130_osu_sc_12T_ms__dffsr_1.mag
deleted file mode 100644
index a2bc229..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__dffsr_1.mag
+++ /dev/null
@@ -1,938 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864422
-<< checkpaint >>
-rect -1210 -1243 3248 2131
-<< nwell >>
-rect -10 485 2090 897
-<< nmos >>
-rect 80 115 110 219
-rect 272 115 302 187
-rect 370 115 400 219
-rect 442 115 472 219
-rect 632 115 662 219
-rect 704 115 734 219
-rect 824 115 854 219
-rect 896 115 926 219
-rect 982 115 1012 219
-rect 1054 115 1084 219
-rect 1174 115 1204 219
-rect 1246 115 1276 219
-rect 1332 115 1362 219
-rect 1522 115 1552 219
-rect 1594 115 1624 219
-rect 1692 115 1722 187
-rect 1884 115 1914 219
-rect 1970 115 2000 219
-<< pmos >>
-rect 80 521 110 773
-rect 270 521 300 773
-rect 356 521 386 773
-rect 442 521 472 773
-rect 632 521 662 773
-rect 704 521 734 773
-rect 824 521 854 773
-rect 896 521 926 773
-rect 982 521 1012 773
-rect 1054 521 1084 773
-rect 1174 521 1204 773
-rect 1246 521 1276 773
-rect 1332 521 1362 773
-rect 1522 521 1552 773
-rect 1608 521 1638 773
-rect 1694 521 1724 773
-rect 1884 521 1914 773
-rect 1970 521 2000 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 317 187 370 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-rect 219 165 272 187
-rect 219 131 227 165
-rect 261 131 272 165
-rect 219 115 272 131
-rect 302 171 370 187
-rect 302 131 325 171
-rect 359 131 370 171
-rect 302 115 370 131
-rect 400 115 442 219
-rect 472 171 525 219
-rect 472 131 483 171
-rect 517 131 525 171
-rect 472 115 525 131
-rect 579 171 632 219
-rect 579 131 587 171
-rect 621 131 632 171
-rect 579 115 632 131
-rect 662 115 704 219
-rect 734 171 824 219
-rect 734 131 745 171
-rect 813 131 824 171
-rect 734 115 824 131
-rect 854 115 896 219
-rect 926 165 982 219
-rect 926 131 937 165
-rect 971 131 982 165
-rect 926 115 982 131
-rect 1012 115 1054 219
-rect 1084 171 1174 219
-rect 1084 131 1095 171
-rect 1163 131 1174 171
-rect 1084 115 1174 131
-rect 1204 115 1246 219
-rect 1276 171 1332 219
-rect 1276 131 1287 171
-rect 1321 131 1332 171
-rect 1276 115 1332 131
-rect 1362 171 1415 219
-rect 1362 131 1373 171
-rect 1407 131 1415 171
-rect 1362 115 1415 131
-rect 1469 171 1522 219
-rect 1469 131 1477 171
-rect 1511 131 1522 171
-rect 1469 115 1522 131
-rect 1552 115 1594 219
-rect 1624 187 1677 219
-rect 1624 171 1692 187
-rect 1624 131 1635 171
-rect 1669 131 1692 171
-rect 1624 115 1692 131
-rect 1722 165 1775 187
-rect 1722 131 1733 165
-rect 1767 131 1775 165
-rect 1722 115 1775 131
-rect 1831 171 1884 219
-rect 1831 131 1839 171
-rect 1873 131 1884 171
-rect 1831 115 1884 131
-rect 1914 171 1970 219
-rect 1914 131 1925 171
-rect 1959 131 1970 171
-rect 1914 115 1970 131
-rect 2000 171 2053 219
-rect 2000 131 2011 171
-rect 2045 131 2053 171
-rect 2000 115 2053 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-rect 217 757 270 773
-rect 217 629 225 757
-rect 259 629 270 757
-rect 217 521 270 629
-rect 300 757 356 773
-rect 300 629 311 757
-rect 345 629 356 757
-rect 300 521 356 629
-rect 386 757 442 773
-rect 386 723 397 757
-rect 431 723 442 757
-rect 386 521 442 723
-rect 472 757 525 773
-rect 472 629 483 757
-rect 517 629 525 757
-rect 472 521 525 629
-rect 579 757 632 773
-rect 579 629 587 757
-rect 621 629 632 757
-rect 579 521 632 629
-rect 662 521 704 773
-rect 734 757 824 773
-rect 734 561 745 757
-rect 813 561 824 757
-rect 734 521 824 561
-rect 854 521 896 773
-rect 926 757 982 773
-rect 926 629 937 757
-rect 971 629 982 757
-rect 926 521 982 629
-rect 1012 521 1054 773
-rect 1084 757 1174 773
-rect 1084 629 1095 757
-rect 1163 629 1174 757
-rect 1084 521 1174 629
-rect 1204 521 1246 773
-rect 1276 757 1332 773
-rect 1276 595 1287 757
-rect 1321 595 1332 757
-rect 1276 521 1332 595
-rect 1362 757 1415 773
-rect 1362 561 1373 757
-rect 1407 561 1415 757
-rect 1362 521 1415 561
-rect 1469 757 1522 773
-rect 1469 629 1477 757
-rect 1511 629 1522 757
-rect 1469 521 1522 629
-rect 1552 757 1608 773
-rect 1552 723 1563 757
-rect 1597 723 1608 757
-rect 1552 521 1608 723
-rect 1638 757 1694 773
-rect 1638 629 1649 757
-rect 1683 629 1694 757
-rect 1638 521 1694 629
-rect 1724 757 1777 773
-rect 1724 629 1735 757
-rect 1769 629 1777 757
-rect 1724 521 1777 629
-rect 1831 757 1884 773
-rect 1831 561 1839 757
-rect 1873 561 1884 757
-rect 1831 521 1884 561
-rect 1914 757 1970 773
-rect 1914 561 1925 757
-rect 1959 561 1970 757
-rect 1914 521 1970 561
-rect 2000 757 2053 773
-rect 2000 561 2011 757
-rect 2045 561 2053 757
-rect 2000 521 2053 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 227 131 261 165
-rect 325 131 359 171
-rect 483 131 517 171
-rect 587 131 621 171
-rect 745 131 813 171
-rect 937 131 971 165
-rect 1095 131 1163 171
-rect 1287 131 1321 171
-rect 1373 131 1407 171
-rect 1477 131 1511 171
-rect 1635 131 1669 171
-rect 1733 131 1767 165
-rect 1839 131 1873 171
-rect 1925 131 1959 171
-rect 2011 131 2045 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 225 629 259 757
-rect 311 629 345 757
-rect 397 723 431 757
-rect 483 629 517 757
-rect 587 629 621 757
-rect 745 561 813 757
-rect 937 629 971 757
-rect 1095 629 1163 757
-rect 1287 595 1321 757
-rect 1373 561 1407 757
-rect 1477 629 1511 757
-rect 1563 723 1597 757
-rect 1649 629 1683 757
-rect 1735 629 1769 757
-rect 1839 561 1873 757
-rect 1925 561 1959 757
-rect 2011 561 2045 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-rect 1658 827 1682 861
-rect 1716 827 1740 861
-rect 1794 827 1818 861
-rect 1852 827 1876 861
-rect 1930 827 1954 861
-rect 1988 827 2012 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-rect 1682 827 1716 861
-rect 1818 827 1852 861
-rect 1954 827 1988 861
-<< poly >>
-rect 80 773 110 799
-rect 270 773 300 799
-rect 356 773 386 799
-rect 442 773 472 799
-rect 632 773 662 799
-rect 704 773 734 799
-rect 824 773 854 799
-rect 896 773 926 799
-rect 982 773 1012 799
-rect 1054 773 1084 799
-rect 1174 773 1204 799
-rect 1246 773 1276 799
-rect 1332 773 1362 799
-rect 1522 773 1552 799
-rect 1608 773 1638 799
-rect 1694 773 1724 799
-rect 1884 773 1914 799
-rect 1970 773 2000 799
-rect 80 398 110 521
-rect 270 483 300 521
-rect 243 453 300 483
-rect 79 382 133 398
-rect 79 348 89 382
-rect 123 348 133 382
-rect 79 332 133 348
-rect 79 331 110 332
-rect 80 219 110 331
-rect 243 275 273 453
-rect 356 411 386 521
-rect 442 490 472 521
-rect 432 474 486 490
-rect 432 440 442 474
-rect 476 440 486 474
-rect 432 424 486 440
-rect 315 395 386 411
-rect 315 361 325 395
-rect 359 381 386 395
-rect 359 361 400 381
-rect 315 345 400 361
-rect 219 259 273 275
-rect 356 259 400 345
-rect 219 225 229 259
-rect 263 241 273 259
-rect 263 225 302 241
-rect 219 209 302 225
-rect 370 219 400 259
-rect 442 219 472 424
-rect 632 381 662 521
-rect 704 490 734 521
-rect 704 474 758 490
-rect 704 440 714 474
-rect 748 440 758 474
-rect 704 424 758 440
-rect 632 365 686 381
-rect 824 379 854 521
-rect 896 484 926 521
-rect 982 484 1012 521
-rect 896 474 1012 484
-rect 896 440 928 474
-rect 962 440 1012 474
-rect 896 430 1012 440
-rect 1054 379 1084 521
-rect 1174 490 1204 521
-rect 1150 474 1204 490
-rect 1150 440 1160 474
-rect 1194 440 1204 474
-rect 1150 424 1204 440
-rect 632 331 642 365
-rect 676 331 686 365
-rect 632 315 686 331
-rect 728 362 1204 379
-rect 728 349 1160 362
-rect 632 219 662 315
-rect 728 271 758 349
-rect 1150 328 1160 349
-rect 1194 328 1204 362
-rect 1150 312 1204 328
-rect 704 241 758 271
-rect 800 291 854 307
-rect 800 257 810 291
-rect 844 257 854 291
-rect 800 241 854 257
-rect 704 219 734 241
-rect 824 219 854 241
-rect 896 291 1012 301
-rect 896 257 928 291
-rect 962 257 1012 291
-rect 896 247 1012 257
-rect 896 219 926 247
-rect 982 219 1012 247
-rect 1054 291 1108 307
-rect 1054 257 1064 291
-rect 1098 257 1108 291
-rect 1054 241 1108 257
-rect 1054 219 1084 241
-rect 1174 219 1204 312
-rect 1246 375 1276 521
-rect 1332 490 1362 521
-rect 1332 474 1403 490
-rect 1522 484 1552 521
-rect 1332 460 1359 474
-rect 1343 440 1359 460
-rect 1393 440 1403 474
-rect 1343 424 1403 440
-rect 1486 474 1552 484
-rect 1486 440 1502 474
-rect 1536 440 1552 474
-rect 1486 430 1552 440
-rect 1246 359 1300 375
-rect 1246 325 1256 359
-rect 1290 325 1300 359
-rect 1246 309 1300 325
-rect 1246 219 1276 309
-rect 1343 271 1373 424
-rect 1332 241 1373 271
-rect 1486 274 1516 430
-rect 1608 388 1638 521
-rect 1694 483 1724 521
-rect 1884 505 1914 521
-rect 1694 457 1751 483
-rect 1874 475 1914 505
-rect 1694 453 1775 457
-rect 1721 425 1775 453
-rect 1576 372 1638 388
-rect 1576 338 1588 372
-rect 1622 338 1638 372
-rect 1576 322 1638 338
-rect 1486 242 1552 274
-rect 1332 219 1362 241
-rect 1522 219 1552 242
-rect 1594 219 1624 322
-rect 1745 275 1775 425
-rect 1874 375 1904 475
-rect 1970 416 2000 521
-rect 1849 359 1904 375
-rect 1849 325 1859 359
-rect 1893 325 1904 359
-rect 1946 400 2000 416
-rect 1946 366 1956 400
-rect 1990 366 2000 400
-rect 1946 350 2000 366
-rect 1849 309 1904 325
-rect 1745 259 1799 275
-rect 1745 239 1755 259
-rect 1692 225 1755 239
-rect 1789 225 1799 259
-rect 1874 264 1904 309
-rect 1874 234 1914 264
-rect 272 187 302 209
-rect 1692 209 1799 225
-rect 1884 219 1914 234
-rect 1970 219 2000 350
-rect 1692 187 1722 209
-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 348 123 382
-rect 442 440 476 474
-rect 325 361 359 395
-rect 229 225 263 259
-rect 714 440 748 474
-rect 928 440 962 474
-rect 1160 440 1194 474
-rect 642 331 676 365
-rect 1160 328 1194 362
-rect 810 257 844 291
-rect 928 257 962 291
-rect 1064 257 1098 291
-rect 1359 440 1393 474
-rect 1502 440 1536 474
-rect 1256 325 1290 359
-rect 1588 338 1622 372
-rect 1859 325 1893 359
-rect 1956 366 1990 400
-rect 1755 225 1789 259
-<< locali >>
-rect 0 867 2090 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1682 867
-rect 1716 827 1818 867
-rect 1852 827 1954 867
-rect 1988 827 2090 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 398 81 553
-rect 121 469 155 561
-rect 225 757 259 773
-rect 121 435 191 469
-rect 47 382 123 398
-rect 47 348 89 382
-rect 89 332 123 348
-rect 157 291 191 435
-rect 225 327 259 629
-rect 311 757 345 773
-rect 397 757 431 827
-rect 397 707 431 723
-rect 483 757 517 773
-rect 345 629 483 655
-rect 311 621 517 629
-rect 311 613 345 621
-rect 483 613 517 621
-rect 587 757 621 827
-rect 587 613 621 629
-rect 745 757 813 773
-rect 325 553 394 563
-rect 937 757 971 827
-rect 937 613 971 629
-rect 1095 757 1163 773
-rect 813 561 816 579
-rect 325 524 428 553
-rect 537 558 571 559
-rect 745 558 816 561
-rect 1095 558 1163 629
-rect 1287 757 1321 827
-rect 1287 579 1321 595
-rect 1373 757 1407 773
-rect 537 524 816 558
-rect 996 524 1163 558
-rect 1477 757 1511 773
-rect 1563 757 1597 827
-rect 1563 707 1597 723
-rect 1649 757 1683 773
-rect 1511 629 1649 654
-rect 1477 620 1683 629
-rect 1477 613 1511 620
-rect 1649 613 1683 620
-rect 1735 757 1769 773
-rect 1373 558 1407 561
-rect 1373 524 1461 558
-rect 325 395 359 524
-rect 442 474 476 490
-rect 537 474 571 524
-rect 476 440 571 474
-rect 714 474 748 490
-rect 309 361 325 395
-rect 359 361 375 395
-rect 225 293 359 327
-rect 313 291 359 293
-rect 121 257 157 259
-rect 191 257 229 259
-rect 121 225 229 257
-rect 263 225 279 259
-rect 121 224 219 225
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 224
-rect 121 115 155 131
-rect 227 165 261 181
-rect 227 61 261 131
-rect 325 171 359 257
-rect 442 274 476 440
-rect 714 439 748 440
-rect 928 474 962 490
-rect 748 405 844 439
-rect 642 365 676 381
-rect 642 315 676 331
-rect 810 291 844 405
-rect 928 291 962 440
-rect 442 240 776 274
-rect 810 241 844 257
-rect 928 241 962 257
-rect 996 291 1030 524
-rect 1160 474 1194 490
-rect 1160 439 1194 440
-rect 996 241 1030 257
-rect 1064 405 1160 439
-rect 1064 291 1098 405
-rect 1144 328 1160 362
-rect 1194 328 1210 362
-rect 1256 359 1290 479
-rect 1359 474 1393 490
-rect 1359 439 1393 440
-rect 1427 362 1461 524
-rect 1256 309 1290 325
-rect 1407 328 1461 362
-rect 1373 325 1461 328
-rect 1502 474 1536 490
-rect 1064 241 1098 257
-rect 742 187 776 240
-rect 1132 207 1166 251
-rect 325 115 359 131
-rect 483 171 517 187
-rect 483 61 517 131
-rect 587 171 621 187
-rect 742 171 813 187
-rect 742 153 745 171
-rect 587 61 621 131
-rect 745 115 813 131
-rect 937 165 971 181
-rect 937 61 971 131
-rect 1095 171 1166 207
-rect 1163 131 1166 171
-rect 1095 115 1166 131
-rect 1287 171 1321 187
-rect 1287 61 1321 131
-rect 1373 171 1407 325
-rect 1502 291 1536 440
-rect 1570 479 1605 552
-rect 1570 388 1604 479
-rect 1570 372 1638 388
-rect 1570 338 1588 372
-rect 1622 338 1638 372
-rect 1735 359 1769 629
-rect 1839 757 1873 773
-rect 1839 513 1873 561
-rect 1925 757 1959 827
-rect 1925 545 1959 561
-rect 2011 757 2045 773
-rect 2011 539 2045 553
-rect 2011 505 2068 539
-rect 1839 474 1873 479
-rect 1839 440 1990 474
-rect 1956 400 1990 440
-rect 1672 325 1859 359
-rect 1893 325 1909 359
-rect 1672 303 1706 325
-rect 1635 269 1706 303
-rect 1956 291 1990 366
-rect 1373 115 1407 131
-rect 1477 171 1511 187
-rect 1477 61 1511 131
-rect 1635 171 1669 269
-rect 1739 225 1755 259
-rect 1789 225 1805 259
-rect 1839 257 1990 291
-rect 1635 115 1669 131
-rect 1733 165 1767 181
-rect 1733 61 1767 131
-rect 1839 171 1873 257
-rect 2034 224 2068 505
-rect 2011 190 2068 224
-rect 1839 115 1873 131
-rect 1925 171 1959 187
-rect 1925 61 1959 131
-rect 2011 171 2045 190
-rect 2011 115 2045 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 1682 861 1716 867
-rect 1682 833 1716 861
-rect 1818 861 1852 867
-rect 1818 833 1852 861
-rect 1954 861 1988 867
-rect 1954 833 1988 861
-rect 47 553 81 587
-rect 394 553 428 587
-rect 157 257 191 291
-rect 325 257 359 291
-rect 714 405 748 439
-rect 642 331 676 365
-rect 910 257 928 291
-rect 928 257 944 291
-rect 996 257 1030 291
-rect 1160 405 1194 439
-rect 1256 479 1290 513
-rect 1160 328 1194 362
-rect 1359 405 1393 439
-rect 1570 552 1605 586
-rect 1373 328 1407 362
-rect 1132 251 1166 285
-rect 2011 561 2045 587
-rect 2011 553 2045 561
-rect 1839 479 1873 513
-rect 1859 325 1893 359
-rect 1502 257 1536 291
-rect 1755 259 1789 291
-rect 1755 257 1789 259
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 867 2090 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1682 867
-rect 1716 833 1818 867
-rect 1852 833 1954 867
-rect 1988 833 2090 867
-rect 0 827 2090 833
-rect 35 587 93 593
-rect 380 587 439 593
-rect 1558 587 1617 592
-rect 1999 587 2057 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 380 553 394 587
-rect 428 586 1617 587
-rect 428 553 1570 586
-rect 35 547 93 553
-rect 380 547 439 553
-rect 1558 552 1570 553
-rect 1605 552 1617 586
-rect 1977 553 2011 587
-rect 2045 553 2057 587
-rect 1558 546 1617 552
-rect 1999 547 2057 553
-rect 1570 529 1605 546
-rect 1244 514 1303 519
-rect 1244 513 1475 514
-rect 1827 513 1885 519
-rect 1244 479 1256 513
-rect 1290 479 1475 513
-rect 1804 479 1839 513
-rect 1873 479 1885 513
-rect 1244 473 1303 479
-rect 1433 478 1475 479
-rect 702 439 760 445
-rect 1148 439 1206 445
-rect 1347 439 1405 445
-rect 702 405 714 439
-rect 748 405 1160 439
-rect 1194 405 1359 439
-rect 1393 405 1405 439
-rect 702 399 760 405
-rect 1148 399 1206 405
-rect 1347 399 1405 405
-rect 630 365 688 371
-rect 630 331 642 365
-rect 676 331 710 365
-rect 1143 362 1210 368
-rect 1367 362 1419 368
-rect 630 325 688 331
-rect 1143 328 1160 362
-rect 1194 328 1373 362
-rect 1407 328 1419 362
-rect 1143 322 1210 328
-rect 1367 322 1419 328
-rect 1447 359 1475 478
-rect 1827 473 1885 479
-rect 1847 359 1905 365
-rect 1447 325 1859 359
-rect 1893 325 1905 359
-rect 1847 319 1905 325
-rect 145 291 203 297
-rect 145 257 157 291
-rect 191 257 203 291
-rect 145 251 203 257
-rect 313 291 371 297
-rect 898 291 956 297
-rect 313 257 325 291
-rect 359 257 910 291
-rect 944 257 956 291
-rect 313 251 371 257
-rect 898 251 956 257
-rect 984 291 1042 297
-rect 1490 291 1548 297
-rect 984 257 996 291
-rect 1030 285 1502 291
-rect 1030 257 1132 285
-rect 984 251 1042 257
-rect 1120 251 1132 257
-rect 1166 257 1502 285
-rect 1536 257 1548 291
-rect 1166 251 1178 257
-rect 1490 251 1548 257
-rect 1743 291 1802 297
-rect 1743 257 1755 291
-rect 1789 257 1802 291
-rect 1743 251 1802 257
-rect 157 217 191 251
-rect 1126 245 1172 251
-rect 1755 217 1789 251
-rect 157 183 1789 217
-rect 0 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel viali 659 348 659 348 1 D
-port 1 n
-rlabel viali 1376 422 1376 422 1 CK
-port 2 n
-rlabel viali 1857 496 1857 496 1 QN
-port 3 n
-rlabel viali 65 570 65 570 1 RN
-port 5 n
-rlabel viali 2028 570 2028 570 1 Q
-port 6 n
-rlabel viali 1588 569 1588 569 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__dffsr_l.mag b/12T_ms/sky130_osu_sc_12T_ms__dffsr_l.mag
deleted file mode 100644
index 72fec3b..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__dffsr_l.mag
+++ /dev/null
@@ -1,941 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864422
-<< checkpaint >>
-rect -1210 -1243 3248 2131
-<< nwell >>
-rect -10 485 2090 897
-<< nmos >>
-rect 80 115 110 219
-rect 272 115 302 187
-rect 370 115 400 219
-rect 442 115 472 219
-rect 632 115 662 219
-rect 704 115 734 219
-rect 824 115 854 219
-rect 896 115 926 219
-rect 982 115 1012 219
-rect 1054 115 1084 219
-rect 1174 115 1204 219
-rect 1246 115 1276 219
-rect 1332 115 1362 219
-rect 1522 115 1552 219
-rect 1594 115 1624 219
-rect 1692 115 1722 187
-rect 1884 115 1914 187
-rect 1970 115 2000 187
-<< pmos >>
-rect 80 521 110 773
-rect 270 521 300 773
-rect 356 521 386 773
-rect 442 521 472 773
-rect 632 521 662 773
-rect 704 521 734 773
-rect 824 521 854 773
-rect 896 521 926 773
-rect 982 521 1012 773
-rect 1054 521 1084 773
-rect 1174 521 1204 773
-rect 1246 521 1276 773
-rect 1332 521 1362 773
-rect 1522 521 1552 773
-rect 1608 521 1638 773
-rect 1694 521 1724 773
-rect 1884 605 1914 773
-rect 1970 605 2000 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 317 187 370 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-rect 219 165 272 187
-rect 219 131 227 165
-rect 261 131 272 165
-rect 219 115 272 131
-rect 302 171 370 187
-rect 302 131 325 171
-rect 359 131 370 171
-rect 302 115 370 131
-rect 400 115 442 219
-rect 472 171 525 219
-rect 472 131 483 171
-rect 517 131 525 171
-rect 472 115 525 131
-rect 579 171 632 219
-rect 579 131 587 171
-rect 621 131 632 171
-rect 579 115 632 131
-rect 662 115 704 219
-rect 734 171 824 219
-rect 734 131 745 171
-rect 813 131 824 171
-rect 734 115 824 131
-rect 854 115 896 219
-rect 926 165 982 219
-rect 926 131 937 165
-rect 971 131 982 165
-rect 926 115 982 131
-rect 1012 115 1054 219
-rect 1084 171 1174 219
-rect 1084 131 1095 171
-rect 1163 131 1174 171
-rect 1084 115 1174 131
-rect 1204 115 1246 219
-rect 1276 171 1332 219
-rect 1276 131 1287 171
-rect 1321 131 1332 171
-rect 1276 115 1332 131
-rect 1362 171 1415 219
-rect 1362 131 1373 171
-rect 1407 131 1415 171
-rect 1362 115 1415 131
-rect 1469 171 1522 219
-rect 1469 131 1477 171
-rect 1511 131 1522 171
-rect 1469 115 1522 131
-rect 1552 115 1594 219
-rect 1624 187 1677 219
-rect 1624 171 1692 187
-rect 1624 131 1635 171
-rect 1669 131 1692 171
-rect 1624 115 1692 131
-rect 1722 165 1775 187
-rect 1722 131 1733 165
-rect 1767 131 1775 165
-rect 1722 115 1775 131
-rect 1831 171 1884 187
-rect 1831 131 1839 171
-rect 1873 131 1884 171
-rect 1831 115 1884 131
-rect 1914 171 1970 187
-rect 1914 131 1925 171
-rect 1959 131 1970 171
-rect 1914 115 1970 131
-rect 2000 171 2053 187
-rect 2000 131 2011 171
-rect 2045 131 2053 171
-rect 2000 115 2053 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-rect 217 757 270 773
-rect 217 629 225 757
-rect 259 629 270 757
-rect 217 521 270 629
-rect 300 757 356 773
-rect 300 629 311 757
-rect 345 629 356 757
-rect 300 521 356 629
-rect 386 757 442 773
-rect 386 723 397 757
-rect 431 723 442 757
-rect 386 521 442 723
-rect 472 757 525 773
-rect 472 629 483 757
-rect 517 629 525 757
-rect 472 521 525 629
-rect 579 757 632 773
-rect 579 629 587 757
-rect 621 629 632 757
-rect 579 521 632 629
-rect 662 521 704 773
-rect 734 757 824 773
-rect 734 561 745 757
-rect 813 561 824 757
-rect 734 521 824 561
-rect 854 521 896 773
-rect 926 757 982 773
-rect 926 629 937 757
-rect 971 629 982 757
-rect 926 521 982 629
-rect 1012 521 1054 773
-rect 1084 757 1174 773
-rect 1084 629 1095 757
-rect 1163 629 1174 757
-rect 1084 521 1174 629
-rect 1204 521 1246 773
-rect 1276 757 1332 773
-rect 1276 595 1287 757
-rect 1321 595 1332 757
-rect 1276 521 1332 595
-rect 1362 757 1415 773
-rect 1362 561 1373 757
-rect 1407 561 1415 757
-rect 1362 521 1415 561
-rect 1469 757 1522 773
-rect 1469 629 1477 757
-rect 1511 629 1522 757
-rect 1469 521 1522 629
-rect 1552 757 1608 773
-rect 1552 723 1563 757
-rect 1597 723 1608 757
-rect 1552 521 1608 723
-rect 1638 757 1694 773
-rect 1638 629 1649 757
-rect 1683 629 1694 757
-rect 1638 521 1694 629
-rect 1724 757 1777 773
-rect 1724 629 1735 757
-rect 1769 629 1777 757
-rect 1724 521 1777 629
-rect 1831 757 1884 773
-rect 1831 617 1839 757
-rect 1873 617 1884 757
-rect 1831 605 1884 617
-rect 1914 757 1970 773
-rect 1914 617 1925 757
-rect 1959 617 1970 757
-rect 1914 605 1970 617
-rect 2000 757 2053 773
-rect 2000 617 2011 757
-rect 2045 617 2053 757
-rect 2000 605 2053 617
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 227 131 261 165
-rect 325 131 359 171
-rect 483 131 517 171
-rect 587 131 621 171
-rect 745 131 813 171
-rect 937 131 971 165
-rect 1095 131 1163 171
-rect 1287 131 1321 171
-rect 1373 131 1407 171
-rect 1477 131 1511 171
-rect 1635 131 1669 171
-rect 1733 131 1767 165
-rect 1839 131 1873 171
-rect 1925 131 1959 171
-rect 2011 131 2045 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 225 629 259 757
-rect 311 629 345 757
-rect 397 723 431 757
-rect 483 629 517 757
-rect 587 629 621 757
-rect 745 561 813 757
-rect 937 629 971 757
-rect 1095 629 1163 757
-rect 1287 595 1321 757
-rect 1373 561 1407 757
-rect 1477 629 1511 757
-rect 1563 723 1597 757
-rect 1649 629 1683 757
-rect 1735 629 1769 757
-rect 1839 617 1873 757
-rect 1925 617 1959 757
-rect 2011 617 2045 757
-<< 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 827 50 861
-rect 84 827 108 861
-rect 162 827 186 861
-rect 220 827 244 861
-rect 298 827 322 861
-rect 356 827 380 861
-rect 434 827 458 861
-rect 492 827 516 861
-rect 570 827 594 861
-rect 628 827 652 861
-rect 706 827 730 861
-rect 764 827 788 861
-rect 842 827 866 861
-rect 900 827 924 861
-rect 978 827 1002 861
-rect 1036 827 1060 861
-rect 1114 827 1138 861
-rect 1172 827 1196 861
-rect 1250 827 1274 861
-rect 1308 827 1332 861
-rect 1386 827 1410 861
-rect 1444 827 1468 861
-rect 1522 827 1546 861
-rect 1580 827 1604 861
-rect 1658 827 1682 861
-rect 1716 827 1740 861
-rect 1794 827 1818 861
-rect 1852 827 1876 861
-rect 1930 827 1954 861
-rect 1988 827 2012 861
-<< 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 827 84 861
-rect 186 827 220 861
-rect 322 827 356 861
-rect 458 827 492 861
-rect 594 827 628 861
-rect 730 827 764 861
-rect 866 827 900 861
-rect 1002 827 1036 861
-rect 1138 827 1172 861
-rect 1274 827 1308 861
-rect 1410 827 1444 861
-rect 1546 827 1580 861
-rect 1682 827 1716 861
-rect 1818 827 1852 861
-rect 1954 827 1988 861
-<< poly >>
-rect 80 773 110 799
-rect 270 773 300 799
-rect 356 773 386 799
-rect 442 773 472 799
-rect 632 773 662 799
-rect 704 773 734 799
-rect 824 773 854 799
-rect 896 773 926 799
-rect 982 773 1012 799
-rect 1054 773 1084 799
-rect 1174 773 1204 799
-rect 1246 773 1276 799
-rect 1332 773 1362 799
-rect 1522 773 1552 799
-rect 1608 773 1638 799
-rect 1694 773 1724 799
-rect 1884 773 1914 799
-rect 1970 773 2000 799
-rect 80 398 110 521
-rect 270 483 300 521
-rect 243 453 300 483
-rect 79 382 133 398
-rect 79 348 89 382
-rect 123 348 133 382
-rect 79 332 133 348
-rect 79 331 110 332
-rect 80 219 110 331
-rect 243 275 273 453
-rect 356 411 386 521
-rect 442 490 472 521
-rect 432 474 486 490
-rect 432 440 442 474
-rect 476 440 486 474
-rect 432 424 486 440
-rect 315 395 386 411
-rect 315 361 325 395
-rect 359 381 386 395
-rect 359 361 400 381
-rect 315 345 400 361
-rect 219 259 273 275
-rect 356 259 400 345
-rect 219 225 229 259
-rect 263 241 273 259
-rect 263 225 302 241
-rect 219 209 302 225
-rect 370 219 400 259
-rect 442 219 472 424
-rect 632 381 662 521
-rect 704 490 734 521
-rect 704 474 758 490
-rect 704 440 714 474
-rect 748 440 758 474
-rect 704 424 758 440
-rect 632 365 686 381
-rect 824 379 854 521
-rect 896 484 926 521
-rect 982 484 1012 521
-rect 896 474 1012 484
-rect 896 440 928 474
-rect 962 440 1012 474
-rect 896 430 1012 440
-rect 1054 379 1084 521
-rect 1174 490 1204 521
-rect 1150 474 1204 490
-rect 1150 440 1160 474
-rect 1194 440 1204 474
-rect 1150 424 1204 440
-rect 632 331 642 365
-rect 676 331 686 365
-rect 632 315 686 331
-rect 728 362 1204 379
-rect 728 349 1160 362
-rect 632 219 662 315
-rect 728 271 758 349
-rect 1150 328 1160 349
-rect 1194 328 1204 362
-rect 1150 312 1204 328
-rect 704 241 758 271
-rect 800 291 854 307
-rect 800 257 810 291
-rect 844 257 854 291
-rect 800 241 854 257
-rect 704 219 734 241
-rect 824 219 854 241
-rect 896 291 1012 301
-rect 896 257 928 291
-rect 962 257 1012 291
-rect 896 247 1012 257
-rect 896 219 926 247
-rect 982 219 1012 247
-rect 1054 291 1108 307
-rect 1054 257 1064 291
-rect 1098 257 1108 291
-rect 1054 241 1108 257
-rect 1054 219 1084 241
-rect 1174 219 1204 312
-rect 1246 375 1276 521
-rect 1332 490 1362 521
-rect 1332 474 1403 490
-rect 1522 484 1552 521
-rect 1332 460 1359 474
-rect 1343 440 1359 460
-rect 1393 440 1403 474
-rect 1343 424 1403 440
-rect 1486 474 1552 484
-rect 1486 440 1502 474
-rect 1536 440 1552 474
-rect 1486 430 1552 440
-rect 1246 359 1300 375
-rect 1246 325 1256 359
-rect 1290 325 1300 359
-rect 1246 309 1300 325
-rect 1246 219 1276 309
-rect 1343 271 1373 424
-rect 1332 241 1373 271
-rect 1486 274 1516 430
-rect 1608 388 1638 521
-rect 1694 483 1724 521
-rect 1884 505 1914 605
-rect 1694 457 1751 483
-rect 1874 475 1914 505
-rect 1694 453 1775 457
-rect 1721 425 1775 453
-rect 1576 372 1638 388
-rect 1576 338 1588 372
-rect 1622 338 1638 372
-rect 1576 322 1638 338
-rect 1486 242 1552 274
-rect 1332 219 1362 241
-rect 1522 219 1552 242
-rect 1594 219 1624 322
-rect 1745 275 1775 425
-rect 1874 375 1904 475
-rect 1970 416 2000 605
-rect 1849 359 1904 375
-rect 1849 325 1859 359
-rect 1893 325 1904 359
-rect 1946 400 2000 416
-rect 1946 366 1956 400
-rect 1990 366 2000 400
-rect 1946 350 2000 366
-rect 1849 309 1904 325
-rect 1745 259 1799 275
-rect 1745 239 1755 259
-rect 1692 225 1755 239
-rect 1789 225 1799 259
-rect 1874 264 1904 309
-rect 1874 234 1914 264
-rect 272 187 302 209
-rect 1692 209 1799 225
-rect 1692 187 1722 209
-rect 1884 187 1914 234
-rect 1970 187 2000 350
-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 348 123 382
-rect 442 440 476 474
-rect 325 361 359 395
-rect 229 225 263 259
-rect 714 440 748 474
-rect 928 440 962 474
-rect 1160 440 1194 474
-rect 642 331 676 365
-rect 1160 328 1194 362
-rect 810 257 844 291
-rect 928 257 962 291
-rect 1064 257 1098 291
-rect 1359 440 1393 474
-rect 1502 440 1536 474
-rect 1256 325 1290 359
-rect 1588 338 1622 372
-rect 1859 325 1893 359
-rect 1956 366 1990 400
-rect 1755 225 1789 259
-<< locali >>
-rect 0 867 2090 888
-rect 0 827 50 867
-rect 84 827 186 867
-rect 220 827 322 867
-rect 356 827 458 867
-rect 492 827 594 867
-rect 628 827 730 867
-rect 764 827 866 867
-rect 900 827 1002 867
-rect 1036 827 1138 867
-rect 1172 827 1274 867
-rect 1308 827 1410 867
-rect 1444 827 1546 867
-rect 1580 827 1682 867
-rect 1716 827 1818 867
-rect 1852 827 1954 867
-rect 1988 827 2090 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 398 81 553
-rect 121 469 155 561
-rect 225 757 259 773
-rect 121 435 191 469
-rect 47 382 123 398
-rect 47 348 89 382
-rect 89 332 123 348
-rect 157 291 191 435
-rect 225 327 259 629
-rect 311 757 345 773
-rect 397 757 431 827
-rect 397 707 431 723
-rect 483 757 517 773
-rect 345 629 483 655
-rect 311 621 517 629
-rect 311 613 345 621
-rect 483 613 517 621
-rect 587 757 621 827
-rect 587 613 621 629
-rect 745 757 813 773
-rect 325 553 394 563
-rect 937 757 971 827
-rect 937 613 971 629
-rect 1095 757 1163 773
-rect 813 561 816 579
-rect 325 524 428 553
-rect 537 558 571 559
-rect 745 558 816 561
-rect 1095 558 1163 629
-rect 1287 757 1321 827
-rect 1287 579 1321 595
-rect 1373 757 1407 773
-rect 537 524 816 558
-rect 996 524 1163 558
-rect 1477 757 1511 773
-rect 1563 757 1597 827
-rect 1563 707 1597 723
-rect 1649 757 1683 773
-rect 1511 629 1649 654
-rect 1477 620 1683 629
-rect 1477 613 1511 620
-rect 1649 613 1683 620
-rect 1735 757 1769 773
-rect 1373 558 1407 561
-rect 1373 524 1461 558
-rect 325 395 359 524
-rect 442 474 476 490
-rect 537 474 571 524
-rect 476 440 571 474
-rect 714 474 748 490
-rect 309 361 325 395
-rect 359 361 375 395
-rect 225 293 359 327
-rect 313 291 359 293
-rect 121 257 157 259
-rect 191 257 229 259
-rect 121 225 229 257
-rect 263 225 279 259
-rect 121 224 219 225
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 224
-rect 121 115 155 131
-rect 227 165 261 181
-rect 227 61 261 131
-rect 325 171 359 257
-rect 442 274 476 440
-rect 714 439 748 440
-rect 928 474 962 490
-rect 748 405 844 439
-rect 642 365 676 381
-rect 642 315 676 331
-rect 810 291 844 405
-rect 928 291 962 440
-rect 442 240 776 274
-rect 810 241 844 257
-rect 928 241 962 257
-rect 996 291 1030 524
-rect 1160 474 1194 490
-rect 1160 439 1194 440
-rect 996 241 1030 257
-rect 1064 405 1160 439
-rect 1064 291 1098 405
-rect 1144 328 1160 362
-rect 1194 328 1210 362
-rect 1256 359 1290 479
-rect 1359 474 1393 490
-rect 1359 439 1393 440
-rect 1427 362 1461 524
-rect 1256 309 1290 325
-rect 1407 328 1461 362
-rect 1373 325 1461 328
-rect 1502 474 1536 490
-rect 1064 241 1098 257
-rect 742 187 776 240
-rect 1132 207 1166 251
-rect 325 115 359 131
-rect 483 171 517 187
-rect 483 61 517 131
-rect 587 171 621 187
-rect 742 171 813 187
-rect 742 153 745 171
-rect 587 61 621 131
-rect 745 115 813 131
-rect 937 165 971 181
-rect 937 61 971 131
-rect 1095 171 1166 207
-rect 1163 131 1166 171
-rect 1095 115 1166 131
-rect 1287 171 1321 187
-rect 1287 61 1321 131
-rect 1373 171 1407 325
-rect 1502 291 1536 440
-rect 1570 479 1605 552
-rect 1570 388 1604 479
-rect 1570 372 1638 388
-rect 1570 338 1588 372
-rect 1622 338 1638 372
-rect 1735 359 1769 629
-rect 1839 757 1873 773
-rect 1839 513 1873 617
-rect 1925 757 1959 827
-rect 2011 757 2045 773
-rect 1925 601 1959 617
-rect 2010 617 2011 666
-rect 2010 539 2045 617
-rect 2010 521 2068 539
-rect 2011 505 2068 521
-rect 1839 474 1873 479
-rect 1839 440 1990 474
-rect 1956 400 1990 440
-rect 1672 325 1859 359
-rect 1893 325 1909 359
-rect 1672 303 1706 325
-rect 1635 269 1706 303
-rect 1956 291 1990 366
-rect 1373 115 1407 131
-rect 1477 171 1511 187
-rect 1477 61 1511 131
-rect 1635 171 1669 269
-rect 1739 225 1755 259
-rect 1789 225 1805 259
-rect 1839 257 1990 291
-rect 2034 439 2068 505
-rect 1635 115 1669 131
-rect 1733 165 1767 181
-rect 1733 61 1767 131
-rect 1839 171 1873 257
-rect 2034 224 2068 405
-rect 2011 190 2068 224
-rect 1839 115 1873 131
-rect 1925 171 1959 187
-rect 1925 61 1959 131
-rect 2011 171 2045 190
-rect 2011 115 2045 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 861 84 867
-rect 50 833 84 861
-rect 186 861 220 867
-rect 186 833 220 861
-rect 322 861 356 867
-rect 322 833 356 861
-rect 458 861 492 867
-rect 458 833 492 861
-rect 594 861 628 867
-rect 594 833 628 861
-rect 730 861 764 867
-rect 730 833 764 861
-rect 866 861 900 867
-rect 866 833 900 861
-rect 1002 861 1036 867
-rect 1002 833 1036 861
-rect 1138 861 1172 867
-rect 1138 833 1172 861
-rect 1274 861 1308 867
-rect 1274 833 1308 861
-rect 1410 861 1444 867
-rect 1410 833 1444 861
-rect 1546 861 1580 867
-rect 1546 833 1580 861
-rect 1682 861 1716 867
-rect 1682 833 1716 861
-rect 1818 861 1852 867
-rect 1818 833 1852 861
-rect 1954 861 1988 867
-rect 1954 833 1988 861
-rect 47 553 81 587
-rect 394 553 428 587
-rect 157 257 191 291
-rect 325 257 359 291
-rect 714 405 748 439
-rect 642 331 676 365
-rect 910 257 928 291
-rect 928 257 944 291
-rect 996 257 1030 291
-rect 1160 405 1194 439
-rect 1256 479 1290 513
-rect 1160 328 1194 362
-rect 1359 405 1393 439
-rect 1570 552 1605 586
-rect 1373 328 1407 362
-rect 1132 251 1166 285
-rect 1839 479 1873 513
-rect 1859 325 1893 359
-rect 1502 257 1536 291
-rect 1755 259 1789 291
-rect 1755 257 1789 259
-rect 2034 405 2068 439
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 867 2090 888
-rect 0 833 50 867
-rect 84 833 186 867
-rect 220 833 322 867
-rect 356 833 458 867
-rect 492 833 594 867
-rect 628 833 730 867
-rect 764 833 866 867
-rect 900 833 1002 867
-rect 1036 833 1138 867
-rect 1172 833 1274 867
-rect 1308 833 1410 867
-rect 1444 833 1546 867
-rect 1580 833 1682 867
-rect 1716 833 1818 867
-rect 1852 833 1954 867
-rect 1988 833 2090 867
-rect 0 827 2090 833
-rect 35 587 93 593
-rect 380 587 439 593
-rect 1558 587 1617 592
-rect 35 553 47 587
-rect 81 553 127 587
-rect 380 553 394 587
-rect 428 586 1617 587
-rect 428 553 1570 586
-rect 35 547 93 553
-rect 380 547 439 553
-rect 1558 552 1570 553
-rect 1605 552 1617 586
-rect 1558 546 1617 552
-rect 1570 529 1605 546
-rect 1244 514 1303 519
-rect 1244 513 1475 514
-rect 1827 513 1885 519
-rect 1244 479 1256 513
-rect 1290 479 1475 513
-rect 1804 479 1839 513
-rect 1873 479 1885 513
-rect 1244 473 1303 479
-rect 1433 478 1475 479
-rect 702 439 760 445
-rect 1148 439 1206 445
-rect 1347 439 1405 445
-rect 702 405 714 439
-rect 748 405 1160 439
-rect 1194 405 1359 439
-rect 1393 405 1405 439
-rect 702 399 760 405
-rect 1148 399 1206 405
-rect 1347 399 1405 405
-rect 630 365 688 371
-rect 630 331 642 365
-rect 676 331 710 365
-rect 1143 362 1210 368
-rect 1367 362 1419 368
-rect 630 325 688 331
-rect 1143 328 1160 362
-rect 1194 328 1373 362
-rect 1407 328 1419 362
-rect 1143 322 1210 328
-rect 1367 322 1419 328
-rect 1447 359 1475 478
-rect 1827 473 1885 479
-rect 2022 439 2080 445
-rect 2022 438 2034 439
-rect 2000 405 2034 438
-rect 2068 405 2080 439
-rect 2000 404 2080 405
-rect 2022 399 2080 404
-rect 1847 359 1905 365
-rect 1447 325 1859 359
-rect 1893 325 1905 359
-rect 1847 319 1905 325
-rect 145 291 203 297
-rect 145 257 157 291
-rect 191 257 203 291
-rect 145 251 203 257
-rect 313 291 371 297
-rect 898 291 956 297
-rect 313 257 325 291
-rect 359 257 910 291
-rect 944 257 956 291
-rect 313 251 371 257
-rect 898 251 956 257
-rect 984 291 1042 297
-rect 1490 291 1548 297
-rect 984 257 996 291
-rect 1030 285 1502 291
-rect 1030 257 1132 285
-rect 984 251 1042 257
-rect 1120 251 1132 257
-rect 1166 257 1502 285
-rect 1536 257 1548 291
-rect 1166 251 1178 257
-rect 1490 251 1548 257
-rect 1743 291 1802 297
-rect 1743 257 1755 291
-rect 1789 257 1802 291
-rect 1743 251 1802 257
-rect 157 217 191 251
-rect 1126 245 1172 251
-rect 1755 217 1789 251
-rect 157 183 1789 217
-rect 0 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel viali 659 348 659 348 1 D
-port 1 n
-rlabel viali 1376 422 1376 422 1 CK
-port 2 n
-rlabel viali 1857 496 1857 496 1 QN
-port 3 n
-rlabel viali 65 570 65 570 1 RN
-port 5 n
-rlabel viali 2051 422 2051 422 1 Q
-rlabel viali 1588 570 1588 570 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 840 67 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__fill_1.mag b/12T_ms/sky130_osu_sc_12T_ms__fill_1.mag
deleted file mode 100644
index f230c46..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__fill_1.mag
+++ /dev/null
@@ -1,24 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095898
-<< 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 485 41 897
-<< locali >>
-rect 0 827 22 888
-rect 0 0 22 61
-<< metal1 >>
-rect 0 827 22 888
-rect 0 0 22 61
-<< labels >>
-rlabel metal1 11 855 11 855 1 vdd
-rlabel metal1 11 28 11 28 1 gnd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__fill_16.mag b/12T_ms/sky130_osu_sc_12T_ms__fill_16.mag
deleted file mode 100644
index 28a847c..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__fill_16.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095907
-<< checkpaint >>
-rect -1269 2461 1615 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1615 -1129
-<< nwell >>
-rect -9 485 355 897
-<< locali >>
-rect 0 827 352 888
-rect 0 0 352 61
-<< metal1 >>
-rect 0 827 352 888
-rect 0 0 352 61
-<< labels >>
-rlabel metal1 199 856 199 856 1 vdd
-rlabel metal1 196 30 196 30 1 gnd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__fill_2.mag b/12T_ms/sky130_osu_sc_12T_ms__fill_2.mag
deleted file mode 100644
index fbe08cb..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__fill_2.mag
+++ /dev/null
@@ -1,24 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095901
-<< 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 485 50 897
-<< locali >>
-rect 0 827 44 888
-rect 0 0 44 61
-<< metal1 >>
-rect 0 827 44 888
-rect 0 0 44 61
-<< labels >>
-rlabel metal1 22 856 22 856 1 vdd
-rlabel metal1 23 28 23 28 1 gnd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__fill_32.mag b/12T_ms/sky130_osu_sc_12T_ms__fill_32.mag
deleted file mode 100644
index c15fb7b..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__fill_32.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095910
-<< checkpaint >>
-rect -1269 2461 1967 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1967 -1129
-<< nwell >>
-rect -9 485 707 897
-<< locali >>
-rect 0 827 704 888
-rect 0 0 704 61
-<< metal1 >>
-rect 0 827 704 888
-rect 0 0 704 61
-<< labels >>
-rlabel metal1 374 854 374 854 1 vdd
-rlabel metal1 363 26 363 26 1 gnd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__fill_4.mag b/12T_ms/sky130_osu_sc_12T_ms__fill_4.mag
deleted file mode 100644
index 994a525..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__fill_4.mag
+++ /dev/null
@@ -1,22 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095903
-<< 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 485 96 897
-<< locali >>
-rect 0 827 88 888
-rect 0 0 88 61
-<< metal1 >>
-rect 0 827 88 888
-rect 0 0 88 61
-<< labels >>
-rlabel metal1 72 857 72 857 1 vdd
-rlabel metal1 71 28 71 28 1 gnd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__fill_8.mag b/12T_ms/sky130_osu_sc_12T_ms__fill_8.mag
deleted file mode 100644
index f77ad65..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__fill_8.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604095905
-<< checkpaint >>
-rect -1269 2461 1439 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1439 -1129
-<< nwell >>
-rect -9 485 179 897
-<< locali >>
-rect 0 827 176 888
-rect 0 0 176 61
-<< metal1 >>
-rect 0 827 176 888
-rect 0 0 176 61
-<< labels >>
-rlabel metal1 111 859 111 859 1 vdd
-rlabel metal1 112 28 112 28 1 gnd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__inv_1.mag b/12T_ms/sky130_osu_sc_12T_ms__inv_1.mag
deleted file mode 100644
index d272a78..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__inv_1.mag
+++ /dev/null
@@ -1,115 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864424
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 485 199 897
-<< nmos >>
-rect 80 115 110 219
-<< pmos >>
-rect 80 521 110 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 398 110 521
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 219 110 332
-rect 80 89 110 115
-<< polycont >>
-rect 90 348 124 382
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 121 183 155 217
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 167 513
-rect 109 473 167 479
-rect 121 223 155 473
-rect 109 217 167 223
-rect 109 183 121 217
-rect 155 183 167 217
-rect 109 177 167 183
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 151 345 151 345 1 Y
-port 1 n
-rlabel viali 64 570 64 570 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__inv_10.mag b/12T_ms/sky130_osu_sc_12T_ms__inv_10.mag
deleted file mode 100644
index fd97de5..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__inv_10.mag
+++ /dev/null
@@ -1,420 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864424
-<< checkpaint >>
-rect -1269 2461 2250 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2250 -1129
-<< nwell >>
-rect -9 485 990 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-rect 596 115 626 219
-rect 682 115 712 219
-rect 768 115 798 219
-rect 854 115 884 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-rect 768 521 798 773
-rect 854 521 884 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 219
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 219
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 768 219
-rect 712 131 723 171
-rect 757 131 768 171
-rect 712 115 768 131
-rect 798 171 854 219
-rect 798 131 809 171
-rect 843 131 854 171
-rect 798 115 854 131
-rect 884 171 937 219
-rect 884 131 895 171
-rect 929 131 937 171
-rect 884 115 937 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 768 773
-rect 712 561 723 757
-rect 757 561 768 757
-rect 712 521 768 561
-rect 798 757 854 773
-rect 798 561 809 757
-rect 843 561 854 757
-rect 798 521 854 561
-rect 884 757 937 773
-rect 884 561 895 757
-rect 929 561 937 757
-rect 884 521 937 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-rect 809 131 843 171
-rect 895 131 929 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-rect 809 561 843 757
-rect 895 561 929 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 799
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 768 773 798 799
-rect 854 773 884 799
-rect 80 496 110 521
-rect 166 496 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 596 496 626 521
-rect 682 496 712 521
-rect 768 496 798 521
-rect 854 496 884 521
-rect 80 466 884 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 424 274 454 466
-rect 80 244 884 274
-rect 80 219 110 244
-rect 166 219 196 244
-rect 252 219 282 244
-rect 338 219 368 244
-rect 424 219 454 244
-rect 510 219 540 244
-rect 596 219 626 244
-rect 682 219 712 244
-rect 768 219 798 244
-rect 854 219 884 244
-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 348 124 382
-<< locali >>
-rect 0 867 990 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 990 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 293 757 327 773
-rect 293 513 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 513 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 637 757 671 773
-rect 637 513 671 561
-rect 723 757 757 827
-rect 723 545 757 561
-rect 809 757 843 773
-rect 809 513 843 561
-rect 895 757 929 827
-rect 895 545 929 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 637 171 671 183
-rect 637 115 671 131
-rect 723 171 757 187
-rect 723 61 757 131
-rect 809 171 843 183
-rect 809 115 843 131
-rect 895 171 929 187
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 293 479 327 513
-rect 465 479 499 513
-rect 637 479 671 513
-rect 809 479 843 513
-rect 121 183 155 217
-rect 293 183 327 217
-rect 465 183 499 217
-rect 637 183 671 217
-rect 809 183 843 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 867 990 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 990 867
-rect 0 827 990 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 281 513 339 519
-rect 453 513 511 519
-rect 625 513 683 519
-rect 797 513 855 519
-rect 109 479 121 513
-rect 155 479 293 513
-rect 327 479 465 513
-rect 499 479 637 513
-rect 671 479 809 513
-rect 843 479 855 513
-rect 109 473 167 479
-rect 281 473 339 479
-rect 453 473 511 479
-rect 625 473 683 479
-rect 797 473 855 479
-rect 121 223 155 473
-rect 293 223 327 473
-rect 465 223 499 473
-rect 637 223 671 473
-rect 809 223 843 473
-rect 109 217 167 223
-rect 281 217 339 223
-rect 453 217 511 223
-rect 625 217 683 223
-rect 797 217 855 223
-rect 109 183 121 217
-rect 155 183 293 217
-rect 327 183 465 217
-rect 499 183 637 217
-rect 671 183 809 217
-rect 843 183 855 217
-rect 109 177 167 183
-rect 281 177 339 183
-rect 453 177 511 183
-rect 625 177 683 183
-rect 797 177 855 183
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 152 344 152 344 1 Y
-port 1 n
-rlabel viali 64 569 64 569 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__inv_2.mag b/12T_ms/sky130_osu_sc_12T_ms__inv_2.mag
deleted file mode 100644
index c4dc373..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__inv_2.mag
+++ /dev/null
@@ -1,153 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864424
-<< checkpaint >>
-rect -1269 2461 1547 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1547 -1129
-<< nwell >>
-rect -9 485 287 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 249 219
-rect 196 131 207 171
-rect 241 131 249 171
-rect 196 115 249 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 249 773
-rect 196 561 207 757
-rect 241 561 249 757
-rect 196 521 249 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 800
-rect 80 496 110 521
-rect 166 496 196 521
-rect 80 466 196 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 80 244 196 274
-rect 80 219 110 244
-rect 166 219 196 244
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 90 348 124 382
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 121 183 155 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 167 513
-rect 109 473 167 479
-rect 121 223 155 473
-rect 109 217 167 223
-rect 109 183 121 217
-rect 155 183 167 217
-rect 109 177 167 183
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 152 344 152 344 1 Y
-port 1 n
-rlabel viali 64 569 64 569 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__inv_3.mag b/12T_ms/sky130_osu_sc_12T_ms__inv_3.mag
deleted file mode 100644
index 48ca1ff..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__inv_3.mag
+++ /dev/null
@@ -1,182 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864424
-<< checkpaint >>
-rect -1269 2461 1635 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1635 -1129
-<< nwell >>
-rect -9 485 375 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 335 219
-rect 282 131 293 171
-rect 327 131 335 171
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 335 773
-rect 282 561 293 757
-rect 327 561 335 757
-rect 282 521 335 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 496 110 521
-rect 166 496 196 521
-rect 252 496 282 521
-rect 80 466 282 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 80 244 282 274
-rect 80 219 110 244
-rect 166 219 196 244
-rect 252 219 282 244
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 90 348 124 382
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 293 757 327 773
-rect 293 513 327 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 293 479 327 513
-rect 121 183 155 217
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 281 513 339 519
-rect 109 479 121 513
-rect 155 479 293 513
-rect 327 479 339 513
-rect 109 473 167 479
-rect 281 473 339 479
-rect 121 223 155 473
-rect 293 223 327 473
-rect 109 217 167 223
-rect 281 217 339 223
-rect 109 183 121 217
-rect 155 183 293 217
-rect 327 183 339 217
-rect 109 177 167 183
-rect 281 177 339 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 152 344 152 344 1 Y
-port 1 n
-rlabel viali 64 569 64 569 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__inv_4.mag b/12T_ms/sky130_osu_sc_12T_ms__inv_4.mag
deleted file mode 100644
index bc1c04a..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__inv_4.mag
+++ /dev/null
@@ -1,216 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864425
-<< checkpaint >>
-rect -1269 2461 1723 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1723 -1129
-<< nwell >>
-rect -9 485 463 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 421 219
-rect 368 131 379 171
-rect 413 131 421 171
-rect 368 115 421 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 421 773
-rect 368 561 379 757
-rect 413 561 421 757
-rect 368 521 421 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 799
-rect 80 496 110 521
-rect 166 496 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 80 466 368 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 80 244 368 274
-rect 80 219 110 244
-rect 166 219 196 244
-rect 252 219 282 244
-rect 338 219 368 244
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 90 348 124 382
-<< locali >>
-rect 0 867 462 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 462 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 293 757 327 773
-rect 293 513 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 293 479 327 513
-rect 121 183 155 217
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 462 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 462 867
-rect 0 827 462 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 281 513 339 519
-rect 109 479 121 513
-rect 155 479 293 513
-rect 327 479 339 513
-rect 109 473 167 479
-rect 281 473 339 479
-rect 121 223 155 473
-rect 293 223 327 473
-rect 109 217 167 223
-rect 281 217 339 223
-rect 109 183 121 217
-rect 155 183 293 217
-rect 327 183 339 217
-rect 109 177 167 183
-rect 281 177 339 183
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 64 569 64 569 1 A
-port 1 n
-rlabel metal1 152 344 152 344 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__inv_6.mag b/12T_ms/sky130_osu_sc_12T_ms__inv_6.mag
deleted file mode 100644
index a752d7d..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__inv_6.mag
+++ /dev/null
@@ -1,280 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864425
-<< checkpaint >>
-rect -1269 2461 1899 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1899 -1129
-<< nwell >>
-rect -9 485 639 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 593 219
-rect 540 131 551 171
-rect 585 131 593 171
-rect 540 115 593 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 593 773
-rect 540 561 551 757
-rect 585 561 593 757
-rect 540 521 593 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 799
-rect 424 773 454 799
-rect 510 773 540 799
-rect 80 496 110 521
-rect 166 496 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 80 466 540 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 424 274 454 466
-rect 80 244 540 274
-rect 80 219 110 244
-rect 166 219 196 244
-rect 252 219 282 244
-rect 338 219 368 244
-rect 424 219 454 244
-rect 510 219 540 244
-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 348 124 382
-<< locali >>
-rect 0 867 638 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 638 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 293 757 327 773
-rect 293 513 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 513 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 293 479 327 513
-rect 465 479 499 513
-rect 121 183 155 217
-rect 293 183 327 217
-rect 465 183 499 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 638 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 638 867
-rect 0 827 638 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 281 513 339 519
-rect 453 513 511 519
-rect 109 479 121 513
-rect 155 479 293 513
-rect 327 479 465 513
-rect 499 479 511 513
-rect 109 473 167 479
-rect 281 473 339 479
-rect 453 473 511 479
-rect 121 223 155 473
-rect 293 223 327 473
-rect 465 223 499 473
-rect 109 217 167 223
-rect 281 217 339 223
-rect 453 217 511 223
-rect 109 183 121 217
-rect 155 183 293 217
-rect 327 183 465 217
-rect 499 183 511 217
-rect 109 177 167 183
-rect 281 177 339 183
-rect 453 177 511 183
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 64 569 64 569 1 A
-port 1 n
-rlabel metal1 152 344 152 344 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__inv_8.mag b/12T_ms/sky130_osu_sc_12T_ms__inv_8.mag
deleted file mode 100644
index 837ee40..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__inv_8.mag
+++ /dev/null
@@ -1,343 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864425
-<< checkpaint >>
-rect -1269 2461 2074 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2074 -1129
-<< nwell >>
-rect -9 485 814 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-rect 596 115 626 219
-rect 682 115 712 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 219
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 219
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 765 219
-rect 712 131 723 171
-rect 757 131 765 171
-rect 712 115 765 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 252 773
-rect 196 561 207 757
-rect 241 561 252 757
-rect 196 521 252 561
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 765 773
-rect 712 561 723 757
-rect 757 561 765 757
-rect 712 521 765 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 561 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 799
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 80 496 110 521
-rect 166 496 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 596 496 626 521
-rect 682 496 712 521
-rect 80 466 712 496
-rect 80 398 110 466
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 274 110 332
-rect 424 274 454 466
-rect 80 244 712 274
-rect 80 219 110 244
-rect 166 219 196 244
-rect 252 219 282 244
-rect 338 219 368 244
-rect 424 219 454 244
-rect 510 219 540 244
-rect 596 219 626 244
-rect 682 219 712 244
-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 348 124 382
-<< locali >>
-rect 0 867 814 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 814 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 382 81 553
-rect 121 513 155 561
-rect 207 757 241 827
-rect 207 545 241 561
-rect 293 757 327 773
-rect 293 513 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 513 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 637 757 671 773
-rect 637 513 671 561
-rect 723 757 757 827
-rect 723 545 757 561
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 637 171 671 183
-rect 637 115 671 131
-rect 723 171 757 187
-rect 723 61 757 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 814 61
-rect 0 0 814 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 293 479 327 513
-rect 465 479 499 513
-rect 637 479 671 513
-rect 121 183 155 217
-rect 293 183 327 217
-rect 465 183 499 217
-rect 637 183 671 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-<< metal1 >>
-rect 0 867 814 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 814 867
-rect 0 827 814 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 281 513 339 519
-rect 453 513 511 519
-rect 625 513 683 519
-rect 109 479 121 513
-rect 155 479 293 513
-rect 327 479 465 513
-rect 499 479 637 513
-rect 671 479 683 513
-rect 109 473 167 479
-rect 281 473 339 479
-rect 453 473 511 479
-rect 625 473 683 479
-rect 121 223 155 473
-rect 293 223 327 473
-rect 465 223 499 473
-rect 637 223 671 473
-rect 109 217 167 223
-rect 281 217 339 223
-rect 453 217 511 223
-rect 625 217 683 223
-rect 109 183 121 217
-rect 155 183 293 217
-rect 327 183 465 217
-rect 499 183 637 217
-rect 671 183 683 217
-rect 109 177 167 183
-rect 281 177 339 183
-rect 453 177 511 183
-rect 625 177 683 183
-rect 0 55 814 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 814 55
-rect 0 0 814 21
-<< labels >>
-rlabel metal1 152 344 152 344 1 Y
-port 1 n
-rlabel viali 64 569 64 569 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__inv_l.mag b/12T_ms/sky130_osu_sc_12T_ms__inv_l.mag
deleted file mode 100644
index d712cb2..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__inv_l.mag
+++ /dev/null
@@ -1,113 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864425
-<< checkpaint >>
-rect -1209 -1243 1345 2129
-<< nwell >>
-rect -9 485 199 895
-<< nmos >>
-rect 80 115 110 187
-<< pmos >>
-rect 80 603 110 771
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 163 187
-rect 110 131 121 165
-rect 155 131 163 165
-rect 110 115 163 131
-<< pdiff >>
-rect 27 755 80 771
-rect 27 687 35 755
-rect 69 687 80 755
-rect 27 603 80 687
-rect 110 755 163 771
-rect 110 687 121 755
-rect 155 687 163 755
-rect 110 603 163 687
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-<< pdiffc >>
-rect 35 687 69 755
-rect 121 687 155 755
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 825 51 859
-rect 85 825 109 859
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 825 85 859
-<< poly >>
-rect 80 771 110 797
-rect 80 398 110 603
-rect 80 382 134 398
-rect 80 348 90 382
-rect 124 348 134 382
-rect 80 332 134 348
-rect 80 187 110 332
-rect 80 89 110 115
-<< polycont >>
-rect 90 348 124 382
-<< locali >>
-rect 0 865 198 886
-rect 0 825 51 865
-rect 85 825 198 865
-rect 35 755 69 825
-rect 35 671 69 687
-rect 121 755 155 771
-rect 47 382 81 553
-rect 121 513 155 687
-rect 47 348 90 382
-rect 124 348 140 382
-rect 35 165 69 181
-rect 35 61 69 131
-rect 121 165 155 257
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 859 85 865
-rect 51 831 85 859
-rect 47 553 81 587
-rect 121 479 155 513
-rect 121 257 155 291
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 865 198 886
-rect 0 831 51 865
-rect 85 831 198 865
-rect 0 825 198 831
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 127 587
-rect 35 547 93 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 167 513
-rect 109 473 167 479
-rect 121 297 155 473
-rect 109 291 167 297
-rect 109 257 121 291
-rect 155 257 167 291
-rect 109 251 167 257
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 570 64 570 1 A
-port 1 n
-rlabel metal1 151 345 151 345 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 838 68 838 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__mux2_1.mag b/12T_ms/sky130_osu_sc_12T_ms__mux2_1.mag
deleted file mode 100644
index bc28ae9..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__mux2_1.mag
+++ /dev/null
@@ -1,227 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864425
-<< checkpaint >>
-rect -1269 2461 1813 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1813 -1129
-<< nwell >>
-rect -9 485 553 897
-<< nmos >>
-rect 80 115 110 219
-rect 270 115 300 219
-rect 356 115 386 219
-<< pmos >>
-rect 80 521 110 773
-rect 270 521 300 773
-rect 356 521 386 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-rect 217 171 270 219
-rect 217 131 225 171
-rect 259 131 270 171
-rect 217 115 270 131
-rect 300 171 356 219
-rect 300 131 311 171
-rect 345 131 356 171
-rect 300 115 356 131
-rect 386 171 439 219
-rect 386 131 397 171
-rect 431 131 439 171
-rect 386 115 439 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-rect 217 757 270 773
-rect 217 561 225 757
-rect 259 561 270 757
-rect 217 521 270 561
-rect 300 757 356 773
-rect 300 561 311 757
-rect 345 561 356 757
-rect 300 521 356 561
-rect 386 757 439 773
-rect 386 561 397 757
-rect 431 561 439 757
-rect 386 521 439 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 225 131 259 171
-rect 311 131 345 171
-rect 397 131 431 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 225 561 259 757
-rect 311 561 345 757
-rect 397 561 431 757
-<< 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 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 459 827 493 861
-<< poly >>
-rect 80 788 300 818
-rect 80 773 110 788
-rect 270 773 300 788
-rect 356 773 386 799
-rect 80 398 110 521
-rect 270 495 300 521
-rect 152 459 218 469
-rect 152 425 168 459
-rect 202 445 218 459
-rect 356 445 386 521
-rect 202 425 386 445
-rect 152 415 386 425
-rect 27 382 110 398
-rect 27 348 37 382
-rect 71 373 110 382
-rect 71 348 386 373
-rect 27 343 386 348
-rect 27 332 110 343
-rect 80 219 110 332
-rect 152 291 218 301
-rect 152 257 168 291
-rect 202 277 218 291
-rect 202 257 300 277
-rect 152 247 300 257
-rect 270 219 300 247
-rect 356 219 386 343
-rect 80 89 110 115
-rect 270 89 300 115
-rect 356 89 386 115
-<< polycont >>
-rect 168 425 202 459
-rect 37 348 71 382
-rect 168 257 202 291
-<< locali >>
-rect 0 867 550 888
-rect 0 827 459 867
-rect 493 827 550 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 37 382 71 553
-rect 37 332 71 348
-rect 121 475 155 561
-rect 225 757 259 773
-rect 311 757 345 773
-rect 225 527 270 561
-rect 236 513 270 527
-rect 121 459 202 475
-rect 121 425 168 459
-rect 121 409 202 425
-rect 121 307 155 409
-rect 121 291 202 307
-rect 121 257 168 291
-rect 121 241 202 257
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 241
-rect 236 205 270 479
-rect 311 365 345 561
-rect 397 757 431 773
-rect 397 439 431 561
-rect 121 115 155 131
-rect 225 171 270 205
-rect 311 171 345 183
-rect 225 115 259 131
-rect 311 115 345 131
-rect 397 171 431 405
-rect 397 115 431 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 459 861 493 867
-rect 459 833 493 861
-rect 37 553 71 587
-rect 236 479 270 513
-rect 311 331 345 365
-rect 397 405 431 439
-rect 311 183 345 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 550 888
-rect 0 833 459 867
-rect 493 833 550 867
-rect 0 827 550 833
-rect 25 587 83 593
-rect 25 553 37 587
-rect 71 553 117 587
-rect 25 547 83 553
-rect 224 513 282 519
-rect 190 479 236 513
-rect 270 479 282 513
-rect 224 473 282 479
-rect 385 439 443 445
-rect 351 405 397 439
-rect 431 405 443 439
-rect 385 399 443 405
-rect 299 365 357 371
-rect 299 331 311 365
-rect 345 331 357 365
-rect 299 325 357 331
-rect 311 223 345 325
-rect 299 217 357 223
-rect 299 183 311 217
-rect 345 183 357 217
-rect 299 177 357 183
-rect 0 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel viali 54 570 54 570 1 S0
-port 1 n
-rlabel viali 328 348 328 348 1 Y
-port 2 n
-rlabel viali 253 496 253 496 1 A0
-port 3 n
-rlabel viali 414 422 414 422 1 A1
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 476 840 476 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__nand2_1.mag b/12T_ms/sky130_osu_sc_12T_ms__nand2_1.mag
deleted file mode 100644
index b440ec1..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__nand2_1.mag
+++ /dev/null
@@ -1,157 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864426
-<< checkpaint >>
-rect -1269 2461 1546 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1546 -1129
-<< nwell >>
-rect -9 485 286 897
-<< nmos >>
-rect 80 115 110 219
-rect 152 115 182 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 115 152 219
-rect 182 171 235 219
-rect 182 131 193 171
-rect 227 131 235 171
-rect 182 115 235 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 697 35 757
-rect 69 697 80 757
-rect 27 521 80 697
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 757 249 773
-rect 196 629 207 757
-rect 241 629 249 757
-rect 196 521 249 629
-<< ndiffc >>
-rect 35 131 69 171
-rect 193 131 227 171
-<< pdiffc >>
-rect 35 697 69 757
-rect 121 561 155 757
-rect 207 629 241 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 80 474 110 521
-rect 37 458 110 474
-rect 37 424 47 458
-rect 81 424 110 458
-rect 37 408 110 424
-rect 80 219 110 408
-rect 166 381 196 521
-rect 152 365 210 381
-rect 152 331 166 365
-rect 200 331 210 365
-rect 152 315 210 331
-rect 152 219 182 315
-rect 80 89 110 115
-rect 152 89 182 115
-<< polycont >>
-rect 47 424 81 458
-rect 166 331 200 365
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 827
-rect 35 681 69 697
-rect 121 757 155 773
-rect 47 458 81 553
-rect 47 408 81 424
-rect 207 757 241 827
-rect 207 613 241 629
-rect 121 439 155 561
-rect 195 365 229 479
-rect 150 331 166 365
-rect 200 331 229 365
-rect 35 171 69 183
-rect 35 115 69 131
-rect 193 171 227 187
-rect 193 61 227 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 47 553 81 587
-rect 121 405 155 439
-rect 195 479 229 513
-rect 35 183 69 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 35 587 93 593
-rect 35 553 47 587
-rect 81 553 115 587
-rect 35 547 93 553
-rect 183 513 241 519
-rect 161 479 195 513
-rect 229 479 241 513
-rect 183 473 241 479
-rect 109 439 167 445
-rect 109 405 121 439
-rect 155 405 167 439
-rect 109 399 167 405
-rect 23 217 81 223
-rect 121 217 155 399
-rect 23 183 35 217
-rect 69 183 155 217
-rect 23 177 81 183
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 374 136 374 1 Y
-port 1 n
-rlabel viali 64 570 64 570 1 A
-port 2 n
-rlabel viali 212 496 212 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__nand2_l.mag b/12T_ms/sky130_osu_sc_12T_ms__nand2_l.mag
deleted file mode 100644
index beb71db..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__nand2_l.mag
+++ /dev/null
@@ -1,154 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864426
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 286 897
-<< nmos >>
-rect 80 115 110 187
-rect 152 115 182 187
-<< pmos >>
-rect 80 605 110 773
-rect 166 605 196 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 115 152 187
-rect 182 165 235 187
-rect 182 131 193 165
-rect 227 131 235 165
-rect 182 115 235 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 689 35 757
-rect 69 689 80 757
-rect 27 605 80 689
-rect 110 757 166 773
-rect 110 689 121 757
-rect 155 689 166 757
-rect 110 605 166 689
-rect 196 757 249 773
-rect 196 689 207 757
-rect 241 689 249 757
-rect 196 605 249 689
-<< ndiffc >>
-rect 35 131 69 165
-rect 193 131 227 165
-<< pdiffc >>
-rect 35 689 69 757
-rect 121 689 155 757
-rect 207 689 241 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 80 548 110 605
-rect 37 532 110 548
-rect 37 498 47 532
-rect 81 498 110 532
-rect 37 482 110 498
-rect 80 187 110 482
-rect 166 398 196 605
-rect 152 382 210 398
-rect 152 348 166 382
-rect 200 348 210 382
-rect 152 332 210 348
-rect 152 187 182 332
-rect 80 89 110 115
-rect 152 89 182 115
-<< polycont >>
-rect 47 498 81 532
-rect 166 348 200 382
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 827
-rect 35 673 69 689
-rect 121 757 155 773
-rect 47 532 81 553
-rect 47 482 81 498
-rect 121 513 155 689
-rect 207 757 241 827
-rect 207 673 241 689
-rect 195 382 229 553
-rect 150 348 166 382
-rect 200 348 229 382
-rect 35 165 69 257
-rect 35 115 69 131
-rect 193 165 227 181
-rect 193 61 227 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 47 553 81 587
-rect 121 479 155 513
-rect 195 553 229 587
-rect 35 257 69 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 35 587 93 593
-rect 183 587 241 593
-rect 35 553 47 587
-rect 81 553 115 587
-rect 161 553 195 587
-rect 229 553 241 587
-rect 35 547 93 553
-rect 183 547 241 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 167 513
-rect 109 473 167 479
-rect 23 291 81 297
-rect 121 291 155 473
-rect 23 257 35 291
-rect 69 257 155 291
-rect 23 251 81 257
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 448 136 448 1 Y
-port 1 n
-rlabel viali 212 570 212 570 1 B
-port 2 n
-rlabel viali 64 570 64 570 1 A
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__nor2_1.mag b/12T_ms/sky130_osu_sc_12T_ms__nor2_1.mag
deleted file mode 100644
index 7b65109..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__nor2_1.mag
+++ /dev/null
@@ -1,157 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864426
-<< checkpaint >>
-rect -1269 2461 1546 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1546 -1129
-<< nwell >>
-rect -9 485 286 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-<< pmos >>
-rect 80 521 110 773
-rect 152 521 182 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 249 219
-rect 196 131 207 171
-rect 241 131 249 171
-rect 196 115 249 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 521 152 773
-rect 182 757 235 773
-rect 182 697 193 757
-rect 227 697 235 757
-rect 182 521 235 697
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 193 697 227 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 152 773 182 799
-rect 80 355 110 521
-rect 152 488 182 521
-rect 152 472 225 488
-rect 152 438 181 472
-rect 215 438 225 472
-rect 152 422 225 438
-rect 56 339 110 355
-rect 56 305 66 339
-rect 100 305 110 339
-rect 56 289 110 305
-rect 80 219 110 289
-rect 166 219 196 422
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 181 438 215 472
-rect 66 305 100 339
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 773
-rect 193 757 227 827
-rect 193 681 227 697
-rect 35 439 69 561
-rect 113 339 147 479
-rect 181 472 215 553
-rect 181 422 215 438
-rect 50 305 66 339
-rect 100 305 147 339
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 183
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 181 553 215 587
-rect 35 405 69 439
-rect 113 479 147 513
-rect 121 183 155 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 169 587 227 593
-rect 148 553 181 587
-rect 215 553 227 587
-rect 169 547 227 553
-rect 101 513 159 519
-rect 79 479 113 513
-rect 147 479 159 513
-rect 101 473 159 479
-rect 23 439 81 445
-rect 23 405 35 439
-rect 69 405 155 439
-rect 23 399 81 405
-rect 121 223 155 405
-rect 109 217 167 223
-rect 109 183 121 217
-rect 155 183 167 217
-rect 109 177 167 183
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 137 297 137 297 1 Y
-port 1 n
-rlabel viali 130 496 130 496 1 B
-port 2 n
-rlabel viali 198 570 198 570 1 A
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__nor2_l.mag b/12T_ms/sky130_osu_sc_12T_ms__nor2_l.mag
deleted file mode 100644
index 7facaca..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__nor2_l.mag
+++ /dev/null
@@ -1,154 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864426
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 286 897
-<< nmos >>
-rect 80 115 110 187
-rect 166 115 196 187
-<< pmos >>
-rect 80 605 110 773
-rect 152 605 182 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 166 187
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 165 249 187
-rect 196 131 207 165
-rect 241 131 249 165
-rect 196 115 249 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 605 80 621
-rect 110 605 152 773
-rect 182 757 235 773
-rect 182 621 193 757
-rect 227 621 235 757
-rect 182 605 235 621
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-rect 207 131 241 165
-<< pdiffc >>
-rect 35 621 69 757
-rect 193 621 227 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 152 773 182 799
-rect 80 429 110 605
-rect 152 562 182 605
-rect 152 546 225 562
-rect 152 512 181 546
-rect 215 512 225 546
-rect 152 496 225 512
-rect 56 413 110 429
-rect 56 379 66 413
-rect 100 379 110 413
-rect 56 363 110 379
-rect 80 187 110 363
-rect 166 187 196 496
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 181 512 215 546
-rect 66 379 100 413
-<< locali >>
-rect 0 867 286 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 286 867
-rect 35 757 69 773
-rect 35 513 69 621
-rect 193 757 227 827
-rect 193 605 227 621
-rect 113 413 147 553
-rect 181 546 215 562
-rect 50 379 66 413
-rect 100 379 147 413
-rect 35 165 69 181
-rect 35 61 69 131
-rect 121 165 155 257
-rect 121 115 155 131
-rect 207 165 241 181
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 35 479 69 513
-rect 113 553 147 587
-rect 181 512 215 513
-rect 181 479 215 512
-rect 121 257 155 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 286 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 286 867
-rect 0 827 286 833
-rect 101 587 159 593
-rect 79 553 113 587
-rect 147 553 159 587
-rect 101 547 159 553
-rect 23 513 81 519
-rect 168 513 227 519
-rect 23 479 35 513
-rect 69 479 81 513
-rect 146 479 181 513
-rect 215 479 227 513
-rect 23 473 81 479
-rect 168 473 227 479
-rect 34 291 69 473
-rect 109 291 167 297
-rect 34 257 121 291
-rect 155 257 167 291
-rect 34 256 167 257
-rect 109 251 167 256
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel viali 130 570 130 570 1 B
-port 3 n
-rlabel metal1 48 337 48 337 1 Y
-rlabel viali 198 496 198 496 1 A
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__oai21_l.mag b/12T_ms/sky130_osu_sc_12T_ms__oai21_l.mag
deleted file mode 100644
index 4bb0049..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__oai21_l.mag
+++ /dev/null
@@ -1,194 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864426
-<< checkpaint >>
-rect -1209 -1244 1481 2131
-<< nwell >>
-rect -9 485 374 897
-<< nmos >>
-rect 80 114 110 218
-rect 166 114 196 218
-rect 252 114 282 218
-<< pmos >>
-rect 80 521 110 773
-rect 152 521 182 773
-rect 250 605 280 773
-<< ndiff >>
-rect 27 170 80 218
-rect 27 130 35 170
-rect 69 130 80 170
-rect 27 114 80 130
-rect 110 164 166 218
-rect 110 130 121 164
-rect 155 130 166 164
-rect 110 114 166 130
-rect 196 170 252 218
-rect 196 130 207 170
-rect 241 130 252 170
-rect 196 114 252 130
-rect 282 189 335 218
-rect 282 130 293 189
-rect 327 130 335 189
-rect 282 114 335 130
-<< pdiff >>
-rect 27 757 80 773
-rect 27 696 35 757
-rect 69 696 80 757
-rect 27 521 80 696
-rect 110 521 152 773
-rect 182 757 250 773
-rect 182 705 193 757
-rect 227 705 250 757
-rect 182 605 250 705
-rect 280 757 333 773
-rect 280 621 291 757
-rect 325 621 333 757
-rect 280 605 333 621
-rect 182 521 235 605
-<< ndiffc >>
-rect 35 130 69 170
-rect 121 130 155 164
-rect 207 130 241 170
-rect 293 130 327 189
-<< pdiffc >>
-rect 35 696 69 757
-rect 193 705 227 757
-rect 291 621 325 757
-<< psubdiff >>
-rect 27 26 51 60
-rect 85 26 109 60
-rect 163 26 187 60
-rect 221 26 245 60
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 266 861
-<< psubdiffcont >>
-rect 51 26 85 60
-rect 187 26 221 60
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 152 773 182 799
-rect 250 773 280 799
-rect 80 489 110 521
-rect 56 473 110 489
-rect 56 439 66 473
-rect 100 439 110 473
-rect 56 423 110 439
-rect 56 274 86 423
-rect 152 375 182 521
-rect 136 365 202 375
-rect 136 331 152 365
-rect 186 331 202 365
-rect 136 321 202 331
-rect 250 333 280 605
-rect 56 243 110 274
-rect 80 218 110 243
-rect 166 218 196 321
-rect 250 317 306 333
-rect 252 283 262 317
-rect 296 283 306 317
-rect 252 267 306 283
-rect 252 218 282 267
-rect 80 88 110 114
-rect 166 88 196 114
-rect 252 88 282 114
-<< polycont >>
-rect 66 439 100 473
-rect 152 331 186 365
-rect 262 283 296 317
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 35 655 69 696
-rect 193 757 227 827
-rect 193 689 227 705
-rect 291 757 325 773
-rect 35 621 291 655
-rect 66 473 100 553
-rect 291 513 325 621
-rect 66 423 100 439
-rect 152 479 162 513
-rect 152 365 186 479
-rect 152 315 186 331
-rect 223 317 257 405
-rect 223 283 262 317
-rect 296 283 312 317
-rect 35 214 241 248
-rect 35 170 69 214
-rect 35 114 69 130
-rect 121 164 155 180
-rect 121 60 155 130
-rect 207 170 241 214
-rect 207 114 241 130
-rect 293 114 327 130
-rect 0 20 51 60
-rect 85 20 187 60
-rect 221 20 374 60
-rect 0 0 374 20
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 66 553 100 587
-rect 162 479 196 513
-rect 291 479 325 513
-rect 223 405 257 439
-rect 293 189 327 217
-rect 293 183 327 189
-rect 51 26 85 54
-rect 51 20 85 26
-rect 187 26 221 54
-rect 187 20 221 26
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 54 587 112 593
-rect 54 553 66 587
-rect 100 553 134 587
-rect 54 547 112 553
-rect 150 513 208 519
-rect 279 513 338 519
-rect 150 479 162 513
-rect 196 479 230 513
-rect 279 479 291 513
-rect 325 479 338 513
-rect 150 473 208 479
-rect 279 473 338 479
-rect 211 439 269 445
-rect 189 405 223 439
-rect 257 405 269 439
-rect 211 399 269 405
-rect 297 224 327 473
-rect 281 217 339 224
-rect 281 183 293 217
-rect 327 183 339 217
-rect 281 177 339 183
-rect 0 54 374 60
-rect 0 20 51 54
-rect 85 20 187 54
-rect 221 20 374 54
-rect 0 0 374 20
-<< labels >>
-rlabel viali 83 570 83 570 1 A0
-port 1 n
-rlabel viali 179 496 179 496 1 A1
-port 2 n
-rlabel viali 240 422 240 422 1 B0
-port 4 n
-rlabel viali 308 496 308 496 1 Y
-rlabel viali 68 47 68 47 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__oai22_l.mag b/12T_ms/sky130_osu_sc_12T_ms__oai22_l.mag
deleted file mode 100644
index 7670037..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__oai22_l.mag
+++ /dev/null
@@ -1,234 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864427
-<< checkpaint >>
-rect -1209 -1243 1617 2131
-<< nwell >>
-rect -9 483 462 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-<< pmos >>
-rect 80 521 110 773
-rect 152 521 182 773
-rect 252 521 282 773
-rect 324 521 354 773
-<< ndiff >>
-rect 27 199 80 219
-rect 27 131 35 199
-rect 69 131 80 199
-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 199 252 219
-rect 196 131 207 199
-rect 241 131 252 199
-rect 196 115 252 131
-rect 282 211 338 219
-rect 282 177 293 211
-rect 327 177 338 211
-rect 282 115 338 177
-rect 368 165 421 219
-rect 368 131 379 165
-rect 413 131 421 165
-rect 368 115 421 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 651 35 757
-rect 69 651 80 757
-rect 27 521 80 651
-rect 110 521 152 773
-rect 182 757 252 773
-rect 182 583 200 757
-rect 234 583 252 757
-rect 182 521 252 583
-rect 282 521 324 773
-rect 354 757 407 773
-rect 354 651 365 757
-rect 399 651 407 757
-rect 354 521 407 651
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 165
-rect 207 131 241 199
-rect 293 177 327 211
-rect 379 131 413 165
-<< pdiffc >>
-rect 35 651 69 757
-rect 200 583 234 757
-rect 365 651 399 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 152 773 182 799
-rect 252 773 282 799
-rect 324 773 354 799
-rect 80 489 110 521
-rect 42 472 110 489
-rect 42 438 52 472
-rect 86 459 110 472
-rect 86 438 96 459
-rect 42 417 96 438
-rect 52 277 86 417
-rect 152 375 182 521
-rect 252 403 282 521
-rect 324 504 354 521
-rect 324 478 368 504
-rect 338 456 368 478
-rect 338 440 430 456
-rect 338 406 384 440
-rect 418 406 430 440
-rect 238 387 292 403
-rect 130 365 196 375
-rect 130 331 146 365
-rect 180 331 196 365
-rect 238 353 248 387
-rect 282 353 292 387
-rect 238 337 292 353
-rect 338 390 430 406
-rect 130 321 196 331
-rect 52 246 110 277
-rect 80 219 110 246
-rect 166 219 196 321
-rect 252 219 282 337
-rect 338 219 368 390
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 52 438 86 472
-rect 384 406 418 440
-rect 146 331 180 365
-rect 248 353 282 387
-<< locali >>
-rect 0 867 462 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 462 867
-rect 35 757 69 827
-rect 35 635 69 651
-rect 200 757 234 773
-rect 365 757 399 827
-rect 365 635 399 651
-rect 200 549 350 583
-rect 52 472 86 489
-rect 52 389 86 405
-rect 223 403 257 479
-rect 223 387 282 403
-rect 146 365 180 381
-rect 223 353 248 387
-rect 223 337 282 353
-rect 316 365 350 549
-rect 384 440 418 456
-rect 384 390 418 406
-rect 146 315 180 331
-rect 35 215 241 249
-rect 316 247 350 331
-rect 35 199 69 215
-rect 207 199 241 215
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 277 213 350 247
-rect 277 211 343 213
-rect 277 177 293 211
-rect 327 177 343 211
-rect 379 165 413 181
-rect 241 131 379 143
-rect 207 109 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 52 438 86 439
-rect 52 405 86 438
-rect 223 479 257 513
-rect 146 331 180 365
-rect 384 406 418 440
-rect 316 331 350 365
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 462 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 462 867
-rect 0 827 462 833
-rect 211 513 269 519
-rect 189 479 223 513
-rect 257 479 269 513
-rect 211 473 269 479
-rect 40 439 98 445
-rect 372 440 430 446
-rect 40 405 52 439
-rect 86 405 120 439
-rect 350 406 384 440
-rect 418 406 430 440
-rect 40 399 98 405
-rect 372 400 430 406
-rect 134 365 192 371
-rect 304 365 362 371
-rect 134 331 146 365
-rect 180 331 214 365
-rect 282 331 316 365
-rect 350 331 362 365
-rect 134 325 192 331
-rect 304 325 362 331
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 240 496 240 496 1 B0
-port 4 n
-rlabel viali 333 348 333 348 1 Y
-port 3 n
-rlabel viali 401 423 401 423 1 B1
-rlabel viali 163 348 163 348 1 A1
-rlabel viali 69 422 69 422 1 A0
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__or2_1.mag b/12T_ms/sky130_osu_sc_12T_ms__or2_1.mag
deleted file mode 100644
index e4671c4..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__or2_1.mag
+++ /dev/null
@@ -1,188 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864427
-<< checkpaint >>
-rect -1269 2461 1634 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1634 -1129
-<< nwell >>
-rect -9 485 374 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 335 219
-rect 282 131 293 171
-rect 327 131 335 171
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 521 166 773
-rect 196 757 252 773
-rect 196 697 207 757
-rect 241 697 252 757
-rect 196 521 252 697
-rect 282 757 335 773
-rect 282 561 293 757
-rect 327 561 335 757
-rect 282 521 335 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 207 697 241 757
-rect 293 561 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 472 110 521
-rect 27 456 110 472
-rect 27 422 37 456
-rect 71 422 110 456
-rect 27 406 110 422
-rect 166 414 196 521
-rect 252 496 282 521
-rect 252 466 289 496
-rect 80 219 110 406
-rect 163 398 217 414
-rect 163 364 173 398
-rect 207 364 217 398
-rect 163 348 217 364
-rect 166 219 196 348
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 274 313 308
-rect 252 258 313 274
-rect 252 219 282 258
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 422 71 456
-rect 173 364 207 398
-rect 269 274 303 308
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 207 757 241 827
-rect 207 681 241 697
-rect 293 757 327 773
-rect 69 629 139 647
-rect 35 613 139 629
-rect 37 456 71 479
-rect 37 406 71 422
-rect 105 308 139 613
-rect 173 398 207 553
-rect 293 439 327 561
-rect 173 348 207 364
-rect 105 274 269 308
-rect 303 274 319 308
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 274
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 37 479 71 513
-rect 173 553 207 587
-rect 293 405 327 439
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 161 587 219 593
-rect 140 553 173 587
-rect 207 553 219 587
-rect 161 547 219 553
-rect 25 513 83 519
-rect 25 479 37 513
-rect 71 479 105 513
-rect 25 473 83 479
-rect 281 439 339 445
-rect 281 405 293 439
-rect 327 405 339 439
-rect 281 399 339 405
-rect 293 223 327 399
-rect 281 217 339 223
-rect 281 183 293 217
-rect 327 183 339 217
-rect 281 177 339 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 190 570 190 570 1 A
-port 2 n
-rlabel viali 54 496 54 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__or2_2.mag b/12T_ms/sky130_osu_sc_12T_ms__or2_2.mag
deleted file mode 100644
index a58f50c..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__or2_2.mag
+++ /dev/null
@@ -1,223 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864427
-<< checkpaint >>
-rect -1269 2461 1722 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1722 -1129
-<< nwell >>
-rect -9 485 462 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 421 219
-rect 368 131 379 171
-rect 413 131 421 171
-rect 368 115 421 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 521 166 773
-rect 196 757 252 773
-rect 196 697 207 757
-rect 241 697 252 757
-rect 196 521 252 697
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 421 773
-rect 368 561 379 757
-rect 413 561 421 757
-rect 368 521 421 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 207 697 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 80 472 110 521
-rect 27 456 110 472
-rect 27 422 37 456
-rect 71 422 110 456
-rect 27 406 110 422
-rect 166 414 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 252 466 368 496
-rect 80 219 110 406
-rect 163 398 217 414
-rect 163 364 173 398
-rect 207 364 217 398
-rect 163 348 217 364
-rect 166 219 196 348
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 303 274 368 288
-rect 252 258 368 274
-rect 252 219 282 258
-rect 338 219 368 258
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 37 422 71 456
-rect 173 364 207 398
-rect 269 274 303 308
-<< locali >>
-rect 0 867 462 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 462 867
-rect 35 757 69 773
-rect 207 757 241 827
-rect 207 681 241 697
-rect 293 757 327 773
-rect 69 629 139 647
-rect 35 613 139 629
-rect 37 456 71 479
-rect 37 406 71 422
-rect 105 308 139 613
-rect 173 398 207 553
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 173 348 207 364
-rect 105 274 269 308
-rect 303 274 319 308
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 274
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 37 479 71 513
-rect 173 553 207 587
-rect 293 405 327 439
-rect 293 183 327 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 867 462 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 462 867
-rect 0 827 462 833
-rect 161 587 219 593
-rect 140 553 173 587
-rect 207 553 219 587
-rect 161 547 219 553
-rect 25 513 83 519
-rect 25 479 37 513
-rect 71 479 105 513
-rect 25 473 83 479
-rect 281 439 339 445
-rect 281 405 293 439
-rect 327 405 339 439
-rect 281 399 339 405
-rect 293 223 327 399
-rect 281 217 339 223
-rect 281 183 293 217
-rect 327 183 339 217
-rect 281 177 339 183
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 190 570 190 570 1 A
-port 2 n
-rlabel viali 54 496 54 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__or2_4.mag b/12T_ms/sky130_osu_sc_12T_ms__or2_4.mag
deleted file mode 100644
index ad9ddab..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__or2_4.mag
+++ /dev/null
@@ -1,286 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864427
-<< checkpaint >>
-rect -1269 2461 1898 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1898 -1129
-<< nwell >>
-rect -9 485 638 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 593 219
-rect 540 131 551 171
-rect 585 131 593 171
-rect 540 115 593 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 521 166 773
-rect 196 757 252 773
-rect 196 697 207 757
-rect 241 697 252 757
-rect 196 521 252 697
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 593 773
-rect 540 561 551 757
-rect 585 561 593 757
-rect 540 521 593 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 207 697 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 424 773 454 799
-rect 510 773 540 799
-rect 80 472 110 521
-rect 27 456 110 472
-rect 27 422 37 456
-rect 71 422 110 456
-rect 27 406 110 422
-rect 166 414 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 252 466 540 496
-rect 80 219 110 406
-rect 163 398 217 414
-rect 163 364 173 398
-rect 207 364 217 398
-rect 163 348 217 364
-rect 166 219 196 348
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 303 274 540 288
-rect 252 258 540 274
-rect 252 219 282 258
-rect 338 219 368 258
-rect 424 219 454 258
-rect 510 219 540 258
-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 422 71 456
-rect 173 364 207 398
-rect 269 274 303 308
-<< locali >>
-rect 0 867 638 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 638 867
-rect 35 757 69 773
-rect 207 757 241 827
-rect 207 681 241 697
-rect 293 757 327 773
-rect 69 629 139 647
-rect 35 613 139 629
-rect 37 456 71 479
-rect 37 406 71 422
-rect 105 308 139 613
-rect 173 398 207 553
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 439 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 173 348 207 364
-rect 105 274 269 308
-rect 303 274 319 308
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 274
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 37 479 71 513
-rect 173 553 207 587
-rect 293 405 327 439
-rect 465 405 499 439
-rect 293 183 327 217
-rect 465 183 499 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 638 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 638 867
-rect 0 827 638 833
-rect 161 587 219 593
-rect 140 553 173 587
-rect 207 553 219 587
-rect 161 547 219 553
-rect 25 513 83 519
-rect 25 479 37 513
-rect 71 479 105 513
-rect 25 473 83 479
-rect 281 439 339 445
-rect 453 439 511 445
-rect 281 405 293 439
-rect 327 405 465 439
-rect 499 405 511 439
-rect 281 399 339 405
-rect 453 399 511 405
-rect 293 223 327 399
-rect 465 223 499 399
-rect 281 217 339 223
-rect 453 217 511 223
-rect 281 183 293 217
-rect 327 183 465 217
-rect 499 183 511 217
-rect 281 177 339 183
-rect 453 177 511 183
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 190 570 190 570 1 A
-port 2 n
-rlabel viali 54 496 54 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__or2_8.mag b/12T_ms/sky130_osu_sc_12T_ms__or2_8.mag
deleted file mode 100644
index b07b066..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__or2_8.mag
+++ /dev/null
@@ -1,428 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864427
-<< checkpaint >>
-rect -1269 2461 2250 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2250 -1129
-<< nwell >>
-rect -9 485 990 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-rect 338 115 368 219
-rect 424 115 454 219
-rect 510 115 540 219
-rect 596 115 626 219
-rect 682 115 712 219
-rect 768 115 798 219
-rect 854 115 884 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 252 521 282 773
-rect 338 521 368 773
-rect 424 521 454 773
-rect 510 521 540 773
-rect 596 521 626 773
-rect 682 521 712 773
-rect 768 521 798 773
-rect 854 521 884 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 171 252 219
-rect 196 131 207 171
-rect 241 131 252 171
-rect 196 115 252 131
-rect 282 171 338 219
-rect 282 131 293 171
-rect 327 131 338 171
-rect 282 115 338 131
-rect 368 171 424 219
-rect 368 131 379 171
-rect 413 131 424 171
-rect 368 115 424 131
-rect 454 171 510 219
-rect 454 131 465 171
-rect 499 131 510 171
-rect 454 115 510 131
-rect 540 171 596 219
-rect 540 131 551 171
-rect 585 131 596 171
-rect 540 115 596 131
-rect 626 171 682 219
-rect 626 131 637 171
-rect 671 131 682 171
-rect 626 115 682 131
-rect 712 171 768 219
-rect 712 131 723 171
-rect 757 131 768 171
-rect 712 115 768 131
-rect 798 171 854 219
-rect 798 131 809 171
-rect 843 131 854 171
-rect 798 115 854 131
-rect 884 171 937 219
-rect 884 131 895 171
-rect 929 131 937 171
-rect 884 115 937 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 629 35 757
-rect 69 629 80 757
-rect 27 521 80 629
-rect 110 521 166 773
-rect 196 757 252 773
-rect 196 697 207 757
-rect 241 697 252 757
-rect 196 521 252 697
-rect 282 757 338 773
-rect 282 561 293 757
-rect 327 561 338 757
-rect 282 521 338 561
-rect 368 757 424 773
-rect 368 561 379 757
-rect 413 561 424 757
-rect 368 521 424 561
-rect 454 757 510 773
-rect 454 561 465 757
-rect 499 561 510 757
-rect 454 521 510 561
-rect 540 757 596 773
-rect 540 561 551 757
-rect 585 561 596 757
-rect 540 521 596 561
-rect 626 757 682 773
-rect 626 561 637 757
-rect 671 561 682 757
-rect 626 521 682 561
-rect 712 757 768 773
-rect 712 561 723 757
-rect 757 561 768 757
-rect 712 521 768 561
-rect 798 757 854 773
-rect 798 561 809 757
-rect 843 561 854 757
-rect 798 521 854 561
-rect 884 757 937 773
-rect 884 561 895 757
-rect 929 561 937 757
-rect 884 521 937 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 207 131 241 171
-rect 293 131 327 171
-rect 379 131 413 171
-rect 465 131 499 171
-rect 551 131 585 171
-rect 637 131 671 171
-rect 723 131 757 171
-rect 809 131 843 171
-rect 895 131 929 171
-<< pdiffc >>
-rect 35 629 69 757
-rect 207 697 241 757
-rect 293 561 327 757
-rect 379 561 413 757
-rect 465 561 499 757
-rect 551 561 585 757
-rect 637 561 671 757
-rect 723 561 757 757
-rect 809 561 843 757
-rect 895 561 929 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-rect 571 827 595 861
-rect 629 827 653 861
-rect 707 827 731 861
-rect 765 827 789 861
-rect 843 827 867 861
-rect 901 827 925 861
-<< 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 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-rect 595 827 629 861
-rect 731 827 765 861
-rect 867 827 901 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 338 773 368 800
-rect 424 773 454 799
-rect 510 773 540 799
-rect 596 773 626 799
-rect 682 773 712 799
-rect 768 773 798 799
-rect 854 773 884 799
-rect 80 472 110 521
-rect 27 456 110 472
-rect 27 422 37 456
-rect 71 422 110 456
-rect 27 406 110 422
-rect 166 414 196 521
-rect 252 496 282 521
-rect 338 496 368 521
-rect 424 496 454 521
-rect 510 496 540 521
-rect 596 496 626 521
-rect 682 496 712 521
-rect 768 496 798 521
-rect 854 496 884 521
-rect 252 466 884 496
-rect 80 219 110 406
-rect 163 398 217 414
-rect 163 364 173 398
-rect 207 364 217 398
-rect 163 348 217 364
-rect 166 219 196 348
-rect 259 324 289 466
-rect 259 308 313 324
-rect 259 288 269 308
-rect 252 274 269 288
-rect 303 288 313 308
-rect 596 288 626 466
-rect 303 274 884 288
-rect 252 258 884 274
-rect 252 219 282 258
-rect 338 219 368 258
-rect 424 219 454 258
-rect 510 219 540 258
-rect 596 219 626 258
-rect 682 219 712 258
-rect 768 219 798 258
-rect 854 219 884 258
-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 422 71 456
-rect 173 364 207 398
-rect 269 274 303 308
-<< locali >>
-rect 0 867 990 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 595 867
-rect 629 827 731 867
-rect 765 827 867 867
-rect 901 827 990 867
-rect 35 757 69 773
-rect 207 757 241 827
-rect 207 681 241 697
-rect 293 757 327 773
-rect 69 629 139 647
-rect 35 613 139 629
-rect 37 456 71 479
-rect 37 406 71 422
-rect 105 308 139 613
-rect 173 398 207 553
-rect 293 439 327 561
-rect 379 757 413 827
-rect 379 545 413 561
-rect 465 757 499 773
-rect 465 439 499 561
-rect 551 757 585 827
-rect 551 545 585 561
-rect 637 757 671 773
-rect 637 439 671 561
-rect 723 757 757 827
-rect 723 545 757 561
-rect 809 757 843 773
-rect 809 439 843 561
-rect 895 757 929 827
-rect 895 545 929 561
-rect 173 348 207 364
-rect 105 274 269 308
-rect 303 274 319 308
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 274
-rect 121 115 155 131
-rect 207 171 241 187
-rect 207 61 241 131
-rect 293 171 327 183
-rect 293 115 327 131
-rect 379 171 413 187
-rect 379 61 413 131
-rect 465 171 499 183
-rect 465 115 499 131
-rect 551 171 585 187
-rect 551 61 585 131
-rect 637 171 671 183
-rect 637 115 671 131
-rect 723 171 757 187
-rect 723 61 757 131
-rect 809 171 843 183
-rect 809 115 843 131
-rect 895 171 929 187
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 595 861 629 867
-rect 595 833 629 861
-rect 731 861 765 867
-rect 731 833 765 861
-rect 867 861 901 867
-rect 867 833 901 861
-rect 37 479 71 513
-rect 173 553 207 587
-rect 293 405 327 439
-rect 465 405 499 439
-rect 637 405 671 439
-rect 809 405 843 439
-rect 293 183 327 217
-rect 465 183 499 217
-rect 637 183 671 217
-rect 809 183 843 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 867 990 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 595 867
-rect 629 833 731 867
-rect 765 833 867 867
-rect 901 833 990 867
-rect 0 827 990 833
-rect 161 587 219 593
-rect 140 553 173 587
-rect 207 553 219 587
-rect 161 547 219 553
-rect 25 513 83 519
-rect 25 479 37 513
-rect 71 479 105 513
-rect 25 473 83 479
-rect 281 439 339 445
-rect 453 439 511 445
-rect 625 439 683 445
-rect 797 439 855 445
-rect 281 405 293 439
-rect 327 405 465 439
-rect 499 405 637 439
-rect 671 405 809 439
-rect 843 405 855 439
-rect 281 399 339 405
-rect 453 399 511 405
-rect 625 399 683 405
-rect 797 399 855 405
-rect 293 223 327 399
-rect 465 223 499 399
-rect 637 223 671 399
-rect 809 223 843 399
-rect 281 217 339 223
-rect 453 217 511 223
-rect 625 217 683 223
-rect 797 217 855 223
-rect 281 183 293 217
-rect 327 183 465 217
-rect 499 183 637 217
-rect 671 183 683 217
-rect 712 183 809 217
-rect 843 183 855 217
-rect 281 177 339 183
-rect 453 177 511 183
-rect 625 177 683 183
-rect 797 177 855 183
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 311 348 311 348 1 Y
-port 1 n
-rlabel viali 190 570 190 570 1 A
-port 2 n
-rlabel viali 54 496 54 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__or2_l.mag b/12T_ms/sky130_osu_sc_12T_ms__or2_l.mag
deleted file mode 100644
index 95d3b6f..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__or2_l.mag
+++ /dev/null
@@ -1,184 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864427
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 374 897
-<< nmos >>
-rect 80 115 110 187
-rect 166 115 196 187
-rect 252 115 282 187
-<< pmos >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 252 605 282 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 166 187
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 165 252 187
-rect 196 131 207 165
-rect 241 131 252 165
-rect 196 115 252 131
-rect 282 165 335 187
-rect 282 131 293 165
-rect 327 131 335 165
-rect 282 115 335 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 689 35 757
-rect 69 689 80 757
-rect 27 605 80 689
-rect 110 605 166 773
-rect 196 757 252 773
-rect 196 689 207 757
-rect 241 689 252 757
-rect 196 605 252 689
-rect 282 757 335 773
-rect 282 689 293 757
-rect 327 689 335 757
-rect 282 605 335 689
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-rect 207 131 241 165
-rect 293 131 327 165
-<< pdiffc >>
-rect 35 689 69 757
-rect 207 689 241 757
-rect 293 689 327 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 252 773 282 799
-rect 80 546 110 605
-rect 27 530 110 546
-rect 27 496 37 530
-rect 71 496 110 530
-rect 27 480 110 496
-rect 166 488 196 605
-rect 252 567 282 605
-rect 252 540 289 567
-rect 80 187 110 480
-rect 163 472 217 488
-rect 163 438 173 472
-rect 207 438 217 472
-rect 163 422 217 438
-rect 166 187 196 422
-rect 259 398 289 540
-rect 259 382 313 398
-rect 259 362 269 382
-rect 252 348 269 362
-rect 303 348 313 382
-rect 252 332 313 348
-rect 252 187 282 332
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 496 71 530
-rect 173 438 207 472
-rect 269 348 303 382
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 35 621 69 689
-rect 207 757 241 827
-rect 207 673 241 689
-rect 293 757 327 773
-rect 35 587 139 621
-rect 37 530 71 546
-rect 105 382 139 587
-rect 293 513 327 689
-rect 173 472 207 479
-rect 173 422 207 438
-rect 105 348 269 382
-rect 303 348 319 382
-rect 35 165 69 181
-rect 35 61 69 131
-rect 121 165 155 348
-rect 121 115 155 131
-rect 207 165 241 181
-rect 207 61 241 131
-rect 293 165 327 257
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 37 496 71 513
-rect 37 479 71 496
-rect 173 479 207 513
-rect 293 479 327 513
-rect 293 257 327 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 25 513 83 519
-rect 161 513 219 519
-rect 281 513 339 519
-rect 25 479 37 513
-rect 71 479 105 513
-rect 161 479 173 513
-rect 207 479 240 513
-rect 281 479 293 513
-rect 327 479 339 513
-rect 25 473 83 479
-rect 161 473 219 479
-rect 281 473 339 479
-rect 293 297 327 473
-rect 281 291 339 297
-rect 281 257 293 291
-rect 327 257 339 291
-rect 281 251 339 257
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 422 311 422 1 Y
-port 1 n
-rlabel viali 190 496 190 496 1 A
-rlabel viali 54 496 54 496 1 B
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__tbufi_1.mag b/12T_ms/sky130_osu_sc_12T_ms__tbufi_1.mag
deleted file mode 100644
index 11767b1..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__tbufi_1.mag
+++ /dev/null
@@ -1,187 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864428
-<< checkpaint >>
-rect -1269 2461 1635 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1635 -1129
-<< nwell >>
-rect -9 485 375 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 238 115 268 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 238 521 268 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 115 238 219
-rect 268 171 321 219
-rect 268 131 279 171
-rect 313 131 321 171
-rect 268 115 321 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 521 238 773
-rect 268 757 321 773
-rect 268 561 279 757
-rect 313 561 321 757
-rect 268 521 321 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 279 131 313 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 629 155 757
-rect 279 561 313 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 80 506 110 521
-rect 39 476 110 506
-rect 39 264 69 476
-rect 166 433 196 521
-rect 133 417 196 433
-rect 133 383 143 417
-rect 177 383 196 417
-rect 133 367 196 383
-rect 238 355 268 521
-rect 238 339 292 355
-rect 111 291 165 307
-rect 111 264 121 291
-rect 39 257 121 264
-rect 155 264 165 291
-rect 238 305 248 339
-rect 282 305 292 339
-rect 238 289 292 305
-rect 155 257 196 264
-rect 39 234 196 257
-rect 80 219 110 234
-rect 166 219 196 234
-rect 238 219 268 289
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 143 383 177 417
-rect 121 257 155 291
-rect 248 305 282 339
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 613 155 629
-rect 279 757 313 773
-rect 35 417 69 561
-rect 143 417 177 433
-rect 35 383 143 417
-rect 35 171 69 383
-rect 143 367 177 383
-rect 211 339 245 553
-rect 279 439 313 561
-rect 211 305 248 339
-rect 282 305 298 339
-rect 103 257 121 291
-rect 155 257 171 291
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 279 171 313 183
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 211 553 245 587
-rect 279 405 313 439
-rect 121 257 155 291
-rect 279 183 313 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 199 587 257 593
-rect 177 553 211 587
-rect 245 553 257 587
-rect 199 547 257 553
-rect 109 513 167 519
-rect 109 479 189 513
-rect 109 473 167 479
-rect 121 297 155 473
-rect 267 439 325 445
-rect 267 405 279 439
-rect 313 405 325 439
-rect 267 399 325 405
-rect 109 291 167 297
-rect 109 257 121 291
-rect 155 257 167 291
-rect 109 251 167 257
-rect 279 223 313 399
-rect 267 217 325 223
-rect 267 183 279 217
-rect 313 183 325 217
-rect 267 177 325 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 268 305 268 1 Y
-port 1 n
-rlabel viali 228 570 228 570 1 A
-port 2 n
-rlabel metal1 138 496 138 496 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__tbufi_l.mag b/12T_ms/sky130_osu_sc_12T_ms__tbufi_l.mag
deleted file mode 100644
index f179030..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__tbufi_l.mag
+++ /dev/null
@@ -1,183 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864428
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 375 897
-<< nmos >>
-rect 80 115 110 187
-rect 166 115 196 187
-rect 238 115 268 187
-<< pmos >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 238 605 268 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 166 187
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 115 238 187
-rect 268 165 321 187
-rect 268 131 279 165
-rect 313 131 321 165
-rect 268 115 321 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 605 80 621
-rect 110 757 166 773
-rect 110 621 121 757
-rect 155 621 166 757
-rect 110 605 166 621
-rect 196 605 238 773
-rect 268 757 321 773
-rect 268 621 279 757
-rect 313 621 321 757
-rect 268 605 321 621
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-rect 279 131 313 165
-<< pdiffc >>
-rect 35 621 69 757
-rect 121 621 155 757
-rect 279 621 313 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 80 580 110 605
-rect 39 550 110 580
-rect 39 338 69 550
-rect 166 507 196 605
-rect 133 491 196 507
-rect 133 457 143 491
-rect 177 457 196 491
-rect 133 441 196 457
-rect 238 429 268 605
-rect 238 413 292 429
-rect 111 365 165 381
-rect 111 338 121 365
-rect 39 331 121 338
-rect 155 338 165 365
-rect 238 379 248 413
-rect 282 379 292 413
-rect 238 363 292 379
-rect 155 331 196 338
-rect 39 308 196 331
-rect 80 187 110 308
-rect 166 187 196 308
-rect 238 187 268 363
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 143 457 177 491
-rect 121 331 155 365
-rect 248 379 282 413
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 35 491 69 621
-rect 121 757 155 827
-rect 121 605 155 621
-rect 279 757 313 773
-rect 143 491 177 507
-rect 35 457 143 491
-rect 35 165 69 457
-rect 143 441 177 457
-rect 211 413 245 553
-rect 279 513 313 621
-rect 211 379 248 413
-rect 282 379 298 413
-rect 103 331 121 365
-rect 155 331 171 365
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 279 165 313 257
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 211 553 245 587
-rect 279 479 313 513
-rect 121 331 155 365
-rect 279 257 313 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 199 587 257 593
-rect 177 553 211 587
-rect 245 553 257 587
-rect 199 547 257 553
-rect 109 513 167 519
-rect 267 513 325 519
-rect 109 479 189 513
-rect 267 479 279 513
-rect 313 479 325 513
-rect 109 473 167 479
-rect 267 473 325 479
-rect 121 371 155 473
-rect 109 365 167 371
-rect 109 331 121 365
-rect 155 331 167 365
-rect 109 325 167 331
-rect 279 297 313 473
-rect 267 291 325 297
-rect 267 257 279 291
-rect 313 257 325 291
-rect 267 251 325 257
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 342 305 342 1 Y
-port 1 n
-rlabel metal1 138 496 138 496 1 OE
-rlabel viali 228 570 228 570 1 A
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__tiehi.mag b/12T_ms/sky130_osu_sc_12T_ms__tiehi.mag
deleted file mode 100644
index 2f32690..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__tiehi.mag
+++ /dev/null
@@ -1,101 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864428
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 485 199 897
-<< nmos >>
-rect 80 115 110 219
-<< pmos >>
-rect 80 521 110 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 561 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 337 110 521
-rect 80 321 134 337
-rect 80 287 90 321
-rect 124 287 134 321
-rect 80 271 134 287
-rect 80 219 110 271
-rect 80 89 110 115
-<< polycont >>
-rect 90 287 124 321
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 827
-rect 35 545 69 561
-rect 121 757 155 773
-rect 121 513 155 561
-rect 74 287 90 321
-rect 124 287 155 321
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 287
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 121 479 155 513
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 94 513 167 519
-rect 94 479 121 513
-rect 155 479 167 513
-rect 94 473 167 479
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 138 496 138 496 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__tielo.mag b/12T_ms/sky130_osu_sc_12T_ms__tielo.mag
deleted file mode 100644
index bb39b66..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__tielo.mag
+++ /dev/null
@@ -1,101 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864428
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 485 199 897
-<< nmos >>
-rect 80 115 110 219
-<< pmos >>
-rect 80 521 110 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 163 219
-rect 110 131 121 171
-rect 155 131 163 171
-rect 110 115 163 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 163 773
-rect 110 561 121 757
-rect 155 561 163 757
-rect 110 521 163 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 561 155 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-<< poly >>
-rect 80 773 110 799
-rect 80 469 110 521
-rect 80 453 134 469
-rect 80 419 90 453
-rect 124 419 134 453
-rect 80 403 134 419
-rect 80 219 110 403
-rect 80 89 110 115
-<< polycont >>
-rect 90 419 124 453
-<< locali >>
-rect 0 867 198 888
-rect 0 827 51 867
-rect 85 827 198 867
-rect 35 757 69 827
-rect 35 545 69 561
-rect 121 757 155 773
-rect 121 453 155 561
-rect 74 419 90 453
-rect 124 419 155 453
-rect 35 171 69 187
-rect 35 61 69 131
-rect 121 171 155 257
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 121 257 155 291
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 867 198 888
-rect 0 833 51 867
-rect 85 833 198 867
-rect 0 827 198 833
-rect 94 291 167 297
-rect 94 257 121 291
-rect 155 257 167 291
-rect 94 251 167 257
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 138 274 138 274 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__tnbufi_1.mag b/12T_ms/sky130_osu_sc_12T_ms__tnbufi_1.mag
deleted file mode 100644
index 2f16751..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__tnbufi_1.mag
+++ /dev/null
@@ -1,182 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864428
-<< checkpaint >>
-rect -1269 2461 1635 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1635 -1129
-<< nwell >>
-rect -9 485 375 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 238 115 268 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 238 521 268 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 115 238 219
-rect 268 171 321 219
-rect 268 131 279 171
-rect 313 131 321 171
-rect 268 115 321 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 629 121 757
-rect 155 629 166 757
-rect 110 521 166 629
-rect 196 521 238 773
-rect 268 757 321 773
-rect 268 561 279 757
-rect 313 561 321 757
-rect 268 521 321 561
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 279 131 313 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 629 155 757
-rect 279 561 313 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 80 506 110 521
-rect 166 506 196 521
-rect 39 476 196 506
-rect 39 264 69 476
-rect 111 474 165 476
-rect 111 440 121 474
-rect 155 440 165 474
-rect 111 424 165 440
-rect 111 356 196 372
-rect 111 322 121 356
-rect 155 322 196 356
-rect 111 306 196 322
-rect 39 234 110 264
-rect 80 219 110 234
-rect 166 219 196 306
-rect 238 355 268 521
-rect 238 339 292 355
-rect 238 305 248 339
-rect 282 305 292 339
-rect 238 289 292 305
-rect 238 219 268 289
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 121 440 155 474
-rect 121 322 155 356
-rect 248 305 282 339
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 613 155 629
-rect 279 757 313 773
-rect 35 356 69 561
-rect 121 474 155 479
-rect 121 424 155 440
-rect 121 356 155 372
-rect 35 322 121 356
-rect 35 171 69 322
-rect 121 306 155 322
-rect 211 339 245 553
-rect 279 439 313 561
-rect 211 305 248 339
-rect 282 305 298 339
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 279 171 313 183
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 211 553 245 587
-rect 121 479 155 513
-rect 279 405 313 439
-rect 279 183 313 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 199 587 257 593
-rect 177 553 211 587
-rect 245 553 257 587
-rect 199 547 257 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 189 513
-rect 109 473 167 479
-rect 267 439 325 445
-rect 267 405 279 439
-rect 313 405 325 439
-rect 267 399 325 405
-rect 279 223 313 399
-rect 267 217 325 223
-rect 267 183 279 217
-rect 313 183 325 217
-rect 267 177 325 183
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 268 305 268 1 Y
-port 1 n
-rlabel viali 228 570 228 570 1 A
-port 2 n
-rlabel viali 138 496 138 496 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__tnbufi_l.mag b/12T_ms/sky130_osu_sc_12T_ms__tnbufi_l.mag
deleted file mode 100644
index c3dae5a..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__tnbufi_l.mag
+++ /dev/null
@@ -1,182 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864428
-<< checkpaint >>
-rect -1209 -1243 1481 2131
-<< nwell >>
-rect -9 559 375 897
-<< nmos >>
-rect 80 115 110 187
-rect 166 115 196 187
-rect 238 115 268 187
-<< pmos >>
-rect 80 605 110 773
-rect 166 605 196 773
-rect 238 605 268 773
-<< ndiff >>
-rect 27 165 80 187
-rect 27 131 35 165
-rect 69 131 80 165
-rect 27 115 80 131
-rect 110 165 166 187
-rect 110 131 121 165
-rect 155 131 166 165
-rect 110 115 166 131
-rect 196 115 238 187
-rect 268 165 321 187
-rect 268 131 279 165
-rect 313 131 321 165
-rect 268 115 321 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 621 35 757
-rect 69 621 80 757
-rect 27 605 80 621
-rect 110 757 166 773
-rect 110 621 121 757
-rect 155 621 166 757
-rect 110 605 166 621
-rect 196 605 238 773
-rect 268 757 321 773
-rect 268 621 279 757
-rect 313 621 321 757
-rect 268 605 321 621
-<< ndiffc >>
-rect 35 131 69 165
-rect 121 131 155 165
-rect 279 131 313 165
-<< pdiffc >>
-rect 35 621 69 757
-rect 121 621 155 757
-rect 279 621 313 757
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 80 580 110 605
-rect 166 580 196 605
-rect 39 550 196 580
-rect 39 337 69 550
-rect 111 548 165 550
-rect 111 514 121 548
-rect 155 514 165 548
-rect 111 498 165 514
-rect 111 429 196 445
-rect 111 395 121 429
-rect 155 395 196 429
-rect 111 379 196 395
-rect 39 308 110 337
-rect 40 307 110 308
-rect 80 187 110 307
-rect 166 187 196 379
-rect 238 429 268 605
-rect 238 413 292 429
-rect 238 379 248 413
-rect 282 379 292 413
-rect 238 363 292 379
-rect 238 187 268 363
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 121 514 155 548
-rect 121 395 155 429
-rect 248 379 282 413
-<< locali >>
-rect 0 867 374 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 374 867
-rect 35 757 69 773
-rect 35 430 69 621
-rect 121 757 155 827
-rect 121 605 155 621
-rect 279 757 313 773
-rect 279 587 313 621
-rect 121 548 155 564
-rect 121 513 155 514
-rect 121 430 155 445
-rect 35 429 155 430
-rect 35 395 121 429
-rect 35 165 69 395
-rect 121 379 155 395
-rect 245 405 248 413
-rect 211 379 248 405
-rect 282 379 298 413
-rect 35 115 69 131
-rect 121 165 155 181
-rect 121 61 155 131
-rect 279 165 313 257
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 279 553 313 587
-rect 121 479 155 513
-rect 211 405 245 439
-rect 279 257 313 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 867 374 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 374 867
-rect 0 827 374 833
-rect 266 587 325 593
-rect 266 553 279 587
-rect 313 553 325 587
-rect 266 547 325 553
-rect 109 513 167 519
-rect 109 479 121 513
-rect 155 479 189 513
-rect 109 473 167 479
-rect 199 439 257 445
-rect 199 438 211 439
-rect 177 405 211 438
-rect 245 405 257 439
-rect 177 404 257 405
-rect 199 399 257 404
-rect 285 297 319 547
-rect 267 291 325 297
-rect 267 257 279 291
-rect 313 257 325 291
-rect 267 251 325 257
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 342 305 342 1 Y
-port 1 n
-rlabel viali 228 423 228 423 1 A
-rlabel viali 138 497 138 497 1 OE
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__xnor2_l.mag b/12T_ms/sky130_osu_sc_12T_ms__xnor2_l.mag
deleted file mode 100644
index 041d5ef..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__xnor2_l.mag
+++ /dev/null
@@ -1,293 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864429
-<< checkpaint >>
-rect -1209 -1243 1753 2131
-<< nwell >>
-rect -9 485 638 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 238 115 268 219
-rect 358 115 388 219
-rect 430 115 460 219
-rect 516 115 546 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 238 521 268 773
-rect 358 521 388 773
-rect 430 521 460 773
-rect 516 521 546 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-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 171 358 219
-rect 268 131 279 171
-rect 347 131 358 171
-rect 268 115 358 131
-rect 388 115 430 219
-rect 460 165 516 219
-rect 460 131 471 165
-rect 505 131 516 165
-rect 460 115 516 131
-rect 546 171 599 219
-rect 546 131 557 171
-rect 591 131 599 171
-rect 546 115 599 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 561 121 757
-rect 155 561 166 757
-rect 110 521 166 561
-rect 196 521 238 773
-rect 268 757 358 773
-rect 268 561 279 757
-rect 347 561 358 757
-rect 268 521 358 561
-rect 388 521 430 773
-rect 460 757 516 773
-rect 460 561 471 757
-rect 505 561 516 757
-rect 460 521 516 561
-rect 546 757 599 773
-rect 546 562 557 757
-rect 591 562 599 757
-rect 546 521 599 562
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 165
-rect 279 131 347 171
-rect 471 131 505 165
-rect 557 131 591 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 561 155 757
-rect 279 561 347 757
-rect 471 561 505 757
-rect 557 562 591 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 358 773 388 799
-rect 430 773 460 799
-rect 516 773 546 799
-rect 80 506 110 521
-rect 70 476 110 506
-rect 70 264 100 476
-rect 166 415 196 521
-rect 142 399 196 415
-rect 142 365 152 399
-rect 186 365 196 399
-rect 142 349 196 365
-rect 238 490 268 521
-rect 238 474 292 490
-rect 238 440 248 474
-rect 282 440 292 474
-rect 238 424 292 440
-rect 142 291 196 307
-rect 142 264 152 291
-rect 70 257 152 264
-rect 186 257 196 291
-rect 70 234 196 257
-rect 80 219 110 234
-rect 166 219 196 234
-rect 238 219 268 424
-rect 358 415 388 521
-rect 430 506 460 521
-rect 516 506 546 521
-rect 430 476 546 506
-rect 358 399 472 415
-rect 358 385 428 399
-rect 418 365 428 385
-rect 462 365 472 399
-rect 418 349 472 365
-rect 516 307 546 476
-rect 326 291 380 307
-rect 326 257 336 291
-rect 370 264 380 291
-rect 479 291 546 307
-rect 479 264 489 291
-rect 370 257 388 264
-rect 326 241 388 257
-rect 358 219 388 241
-rect 430 257 489 264
-rect 523 257 546 291
-rect 430 234 546 257
-rect 430 219 460 234
-rect 516 219 546 234
-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 365 186 399
-rect 248 440 282 474
-rect 152 257 186 291
-rect 428 365 462 399
-rect 336 257 370 291
-rect 489 257 523 291
-<< locali >>
-rect 0 867 638 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 638 867
-rect 35 757 69 773
-rect 35 399 69 561
-rect 121 757 155 827
-rect 279 757 347 773
-rect 121 545 155 561
-rect 268 587 279 593
-rect 302 553 347 561
-rect 279 545 347 553
-rect 471 757 505 827
-rect 471 545 505 561
-rect 557 757 591 773
-rect 557 474 591 562
-rect 232 440 248 474
-rect 282 440 591 474
-rect 35 365 152 399
-rect 186 365 370 399
-rect 35 171 69 365
-rect 152 291 186 307
-rect 336 291 370 365
-rect 404 365 428 399
-rect 462 365 478 399
-rect 152 241 186 257
-rect 268 187 302 257
-rect 336 241 370 257
-rect 489 291 523 307
-rect 489 241 523 257
-rect 35 115 69 131
-rect 121 165 155 181
-rect 268 171 347 187
-rect 268 153 279 171
-rect 121 61 155 131
-rect 279 115 347 131
-rect 471 165 505 181
-rect 471 61 505 131
-rect 557 171 591 440
-rect 557 115 591 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 268 561 279 587
-rect 279 561 302 587
-rect 268 553 302 561
-rect 404 331 438 365
-rect 152 257 186 291
-rect 268 257 302 291
-rect 489 257 523 291
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 638 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 638 867
-rect 0 827 638 833
-rect 256 587 314 593
-rect 256 553 268 587
-rect 302 553 314 587
-rect 256 547 314 553
-rect 268 297 302 547
-rect 392 365 451 371
-rect 392 331 404 365
-rect 438 331 451 365
-rect 392 325 451 331
-rect 140 291 198 297
-rect 140 257 152 291
-rect 186 257 198 291
-rect 140 251 198 257
-rect 256 291 314 297
-rect 256 257 268 291
-rect 302 257 314 291
-rect 256 251 314 257
-rect 152 217 186 251
-rect 404 217 438 325
-rect 477 291 535 297
-rect 477 257 489 291
-rect 523 257 557 291
-rect 477 251 535 257
-rect 152 183 438 217
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 506 274 506 274 1 B
-port 2 n
-rlabel metal1 284 331 284 331 1 Y
-port 3 n
-rlabel viali 169 274 169 274 1 A
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/12T_ms/sky130_osu_sc_12T_ms__xor2_l.mag b/12T_ms/sky130_osu_sc_12T_ms__xor2_l.mag
deleted file mode 100644
index 9c956a1..0000000
--- a/12T_ms/sky130_osu_sc_12T_ms__xor2_l.mag
+++ /dev/null
@@ -1,292 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864429
-<< checkpaint >>
-rect -1269 2461 1898 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1898 -1129
-<< nwell >>
-rect -9 485 638 897
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 238 115 268 219
-rect 358 115 388 219
-rect 430 115 460 219
-rect 516 115 546 219
-<< pmos >>
-rect 80 521 110 773
-rect 166 521 196 773
-rect 238 521 268 773
-rect 358 521 388 773
-rect 430 521 460 773
-rect 516 521 546 773
-<< ndiff >>
-rect 27 171 80 219
-rect 27 131 35 171
-rect 69 131 80 171
-rect 27 115 80 131
-rect 110 171 166 219
-rect 110 131 121 171
-rect 155 131 166 171
-rect 110 115 166 131
-rect 196 115 238 219
-rect 268 171 358 219
-rect 268 131 279 171
-rect 347 131 358 171
-rect 268 115 358 131
-rect 388 115 430 219
-rect 460 171 516 219
-rect 460 131 471 171
-rect 505 131 516 171
-rect 460 115 516 131
-rect 546 171 599 219
-rect 546 131 557 171
-rect 591 131 599 171
-rect 546 115 599 131
-<< pdiff >>
-rect 27 757 80 773
-rect 27 561 35 757
-rect 69 561 80 757
-rect 27 521 80 561
-rect 110 757 166 773
-rect 110 697 121 757
-rect 155 697 166 757
-rect 110 521 166 697
-rect 196 521 238 773
-rect 268 757 358 773
-rect 268 561 279 757
-rect 347 561 358 757
-rect 268 521 358 561
-rect 388 521 430 773
-rect 460 757 516 773
-rect 460 697 471 757
-rect 505 697 516 757
-rect 460 521 516 697
-rect 546 757 599 773
-rect 546 562 557 757
-rect 591 562 599 757
-rect 546 521 599 562
-<< ndiffc >>
-rect 35 131 69 171
-rect 121 131 155 171
-rect 279 131 347 171
-rect 471 131 505 171
-rect 557 131 591 171
-<< pdiffc >>
-rect 35 561 69 757
-rect 121 697 155 757
-rect 279 561 347 757
-rect 471 697 505 757
-rect 557 562 591 757
-<< 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 827 51 861
-rect 85 827 109 861
-rect 163 827 187 861
-rect 221 827 245 861
-rect 299 827 323 861
-rect 357 827 381 861
-rect 435 827 459 861
-rect 493 827 517 861
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 827 85 861
-rect 187 827 221 861
-rect 323 827 357 861
-rect 459 827 493 861
-<< poly >>
-rect 80 773 110 799
-rect 166 773 196 799
-rect 238 773 268 799
-rect 358 773 388 799
-rect 430 773 460 799
-rect 516 773 546 799
-rect 80 506 110 521
-rect 166 506 196 521
-rect 70 476 196 506
-rect 70 259 100 476
-rect 142 474 196 476
-rect 142 440 152 474
-rect 186 440 196 474
-rect 142 424 196 440
-rect 142 366 196 382
-rect 142 332 152 366
-rect 186 332 196 366
-rect 142 316 196 332
-rect 70 234 110 259
-rect 80 219 110 234
-rect 166 219 196 316
-rect 238 307 268 521
-rect 358 490 388 521
-rect 334 474 388 490
-rect 430 506 460 521
-rect 516 506 546 521
-rect 430 476 546 506
-rect 334 440 344 474
-rect 378 440 388 474
-rect 334 424 388 440
-rect 479 474 546 476
-rect 479 440 489 474
-rect 523 440 546 474
-rect 479 424 546 440
-rect 420 365 474 381
-rect 420 336 430 365
-rect 358 331 430 336
-rect 464 331 474 365
-rect 238 291 292 307
-rect 238 257 248 291
-rect 282 257 292 291
-rect 238 241 292 257
-rect 358 306 474 331
-rect 238 219 268 241
-rect 358 219 388 306
-rect 516 264 546 424
-rect 430 234 546 264
-rect 430 219 460 234
-rect 516 219 546 234
-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 440 186 474
-rect 152 332 186 366
-rect 344 440 378 474
-rect 489 440 523 474
-rect 430 331 464 365
-rect 248 257 282 291
-<< locali >>
-rect 0 867 638 888
-rect 0 827 51 867
-rect 85 827 187 867
-rect 221 827 323 867
-rect 357 827 459 867
-rect 493 827 638 867
-rect 35 757 69 773
-rect 121 757 155 827
-rect 121 681 155 697
-rect 279 757 347 773
-rect 35 366 69 561
-rect 152 553 200 587
-rect 268 561 279 579
-rect 471 757 505 827
-rect 471 681 505 697
-rect 557 757 591 773
-rect 152 474 186 553
-rect 268 545 347 561
-rect 136 440 152 474
-rect 186 440 202 474
-rect 268 439 302 545
-rect 344 474 378 490
-rect 344 366 378 440
-rect 35 332 152 366
-rect 186 332 378 366
-rect 412 365 446 553
-rect 489 474 523 479
-rect 489 424 523 440
-rect 35 171 69 332
-rect 412 331 430 365
-rect 464 331 480 365
-rect 557 291 591 562
-rect 232 257 248 291
-rect 282 257 591 291
-rect 35 115 69 131
-rect 121 171 155 187
-rect 121 61 155 131
-rect 279 183 296 187
-rect 330 183 347 187
-rect 279 171 347 183
-rect 279 115 347 131
-rect 471 171 505 187
-rect 471 61 505 131
-rect 557 171 591 257
-rect 557 115 591 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 861 85 867
-rect 51 833 85 861
-rect 187 861 221 867
-rect 187 833 221 861
-rect 323 861 357 867
-rect 323 833 357 861
-rect 459 861 493 867
-rect 459 833 493 861
-rect 200 553 234 587
-rect 412 553 446 587
-rect 268 405 302 439
-rect 489 479 523 513
-rect 296 183 330 217
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 867 638 888
-rect 0 833 51 867
-rect 85 833 187 867
-rect 221 833 323 867
-rect 357 833 459 867
-rect 493 833 638 867
-rect 0 827 638 833
-rect 188 587 246 593
-rect 400 587 458 593
-rect 188 553 200 587
-rect 234 553 412 587
-rect 446 553 458 587
-rect 188 547 246 553
-rect 400 547 458 553
-rect 477 513 535 519
-rect 455 479 489 513
-rect 523 479 535 513
-rect 477 473 535 479
-rect 256 439 314 445
-rect 256 405 268 439
-rect 302 405 314 439
-rect 256 399 314 405
-rect 268 223 302 399
-rect 268 217 342 223
-rect 268 183 296 217
-rect 330 183 342 217
-rect 284 177 342 183
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 218 570 218 570 1 A
-port 1 n
-rlabel metal1 285 390 285 390 1 Y
-port 2 n
-rlabel viali 506 496 506 496 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 840 68 840 1 vdd
-<< end >>
diff --git a/15T_hs/.magicrc b/15T_hs/.magicrc
deleted file mode 100755
index 79cac60..0000000
--- a/15T_hs/.magicrc
+++ /dev/null
@@ -1,105 +0,0 @@
-puts stdout "Sourcing design .magicrc for technology EFS8A ..."
-
-# Put grid on 0.005 pitch. This is important, as some commands don't
-# rescale the grid automatically (such as lef read?).
-
-set scalefac [tech lambda]
-if {[lindex $scalefac 1] < 2} {
- scalegrid 1 2
-}
-
-# drc off
-drc euclidean on
-
-#set PDKPATH "~/projects/efabless/tech/SkyWater/EFS8A"
-
-# loading technology
-#tech load $PDKPATH/libs.tech/magic/EFS8A.tech
-tech load ../../char/techfiles/sky130A.tech
-
-# load device generator
-#source $PDKPATH/libs.tech/magic/EFS8A.tcl
-
-# load bind keys (optional)
-# source $PDKPATH/libs.tech/magic/EFS8A-BindKeys
-
-# set units to lambda grid
-snap internal
-
-# add path to reference cells
-#set MAGPATH "${PDKPATH}/libs.ref/mag"
-#addpath ${MAGPATH}/primdev
-#addpath ${MAGPATH}/s8fmlt
-#addpath ${MAGPATH}/s8iom0
-#addpath ${MAGPATH}/scs8hd
-#addpath ${MAGPATH}/scs8hdll
-#addpath ${MAGPATH}/scs8hvl
-#addpath ${MAGPATH}/scs8hs
-#addpath ${MAGPATH}/scs8ms
-#addpath ${MAGPATH}/scs8ls
-#addpath ${MAGPATH}/scs8lp
-
-# add path to GDS cells
-
-# add path to IP from catalog. This procedure defined in the PDK script.
-catch {magic::query_mylib_ip}
-# add path to local IP from user design space. Defined in the PDK script.
-catch {magic::query_my_projects}
-
-macro Shift_G "grid 74"
-macro XK_Left "scroll l .1 w"
-macro Shift_XK_Left "scroll l 1 w"
-macro Control_XK_Left "box grow w 1"
-macro Control_Shift_XK_Left "box shrink e 1"
-macro XK_Right "scroll r .1 w"
-macro Shift_XK_Right "scroll r 1 w"
-macro Control_XK_Right "box grow e 1"
-macro Control_Shift_XK_Right "box shrink w 1"
-macro XK_Up "scroll u .1 w"
-macro Shift_XK_Up "scroll u 1 w"
-macro Control_XK_Up "box grow n 1"
-macro Control_Shift_XK_Up "box shrink s 1"
-macro XK_Down "scroll d .1 w"
-macro Shift_XK_Down "scroll d 1 w"
-macro Control_XK_Down "box grow s 1"
-macro Control_Shift_XK_Down "box shrink n 1"
-
-macro XK_Pointer_Button4 "scroll u .05 w"
-macro XK_Pointer_Button5 "scroll d .05 w"
-macro . "history redo -1"
-
-macro XK_L "select less area {ndif pdif nwell poly}"
-macro XK_K "select less area nwell"
-macro XK_J "select less area {m1 lic}"
-macro XK_H "select less area li1"
-macro Control_Shift_XK_X "rotate"
-macro Shift_XK_Pointer_Button4 "stretch N 74"
-macro Shift_XK_Pointer_Button5 "stretch S 74"
-macro Control_XK_Pointer_Button4 "stretch N 34"
-macro Control_XK_Pointer_Button5 "stretch S 34"
-macro Control_Shift_XK_Q "stretch W 88"
-macro Control_Shift_XK_R "stretch E 88"
-macro Control_Shift_XK_W "stretch N 28"
-macro Control_Shift_XK_E "stretch N 4"
-macro XK_Y "stretch N 6"
-#macro Control_Shift_XK_W "stretch S 6"
-#macro Control_Shift_XK_E "stretch S 8"
-
-macro Control_Shift_XK_Pointer_Button4 "stretch N 17"
-macro Control_Shift_XK_Pointer_Button5 "stretch S 17"
-macro Control_Shift_XK_G "select area {m1 lic}"
-macro Control_Shift_XK_F "select area {poly polycont}"
-macro Control_Shift_XK_D "select area {ndc li1}"
-macro Control_Shift_XK_S "select area ntrans"
-
-macro Shift_D "select clear; move S 10; paint m1c"
-macro Shift_F "select clear; move N 10; paint m1c"
-
-
-macro Shift_B "box height 1.0um; move S 1.655um; select area; erase; select clear; move N 1um; select area; move S 1um; select clear; box height 0.26um; move S 4.35um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.26um; select clear; box height 20um; select area; move S 0.26um"
-
-
-macro Shift_N "box height 1.74um; move S 2.395um; select area; erase; select clear; move N 1.74um; select area; move S 1.74um; select clear; box height 0.48um; move S 3.61um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.48um; select clear; box height 20um; select area; move S 0.48um"
-
-
-macro Shift_M "box height 1.02um; move S 2.015um; select area; erase; select clear; move N 1.02um; box height 1.20um; select area; move S 1.02um; select clear; box height 0.12um; move S 0.56um; select area; erase; select clear; box height 5.00um; select area; move S 0.12um; select clear; move N 0.12um; box height 0.21um; move S 2.98um; select area;erase; select clear; box height 1.105um; move S 1.105um; select area; move N 0.21um; select clear; box height 0.17um; move N 0.825um; select area; erase; move S 0.825um; box height 0.825um; select area; move N 0.17um"
diff --git a/15T_hs/sky130_osu_sc_15T_hs__addf_1.mag b/15T_hs/sky130_osu_sc_15T_hs__addf_1.mag
deleted file mode 100644
index 57b9cce..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__addf_1.mag
+++ /dev/null
@@ -1,651 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864573
-<< checkpaint >>
-rect -1269 -242 2695 2379
-rect -1209 -1243 2569 -242
-<< nwell >>
-rect -9 529 1435 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 410 115 440 263
-rect 496 115 526 263
-rect 582 115 612 263
-rect 668 115 698 263
-rect 754 115 784 263
-rect 840 115 870 263
-rect 922 115 952 263
-rect 1004 115 1034 263
-rect 1102 115 1132 263
-rect 1292 115 1322 263
-<< ndiff >>
-rect 27 233 80 263
-rect 27 131 35 233
-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 1089 1408 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 1003 1089
-rect 1037 1049 1139 1089
-rect 1173 1049 1275 1089
-rect 1309 1049 1408 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 729 155 745
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 1003 1083 1037 1089
-rect 1003 1055 1037 1083
-rect 1139 1083 1173 1089
-rect 1139 1055 1173 1083
-rect 1275 1083 1309 1089
-rect 1275 1055 1309 1083
-rect 80 449 114 483
-rect 248 375 282 409
-rect 80 301 114 335
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1089 1408 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 1003 1089
-rect 1037 1055 1139 1089
-rect 1173 1055 1275 1089
-rect 1309 1055 1408 1089
-rect 0 1049 1408 1055
-rect 1131 632 1189 638
-rect 1109 598 1143 632
-rect 1177 598 1189 632
-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 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel viali 97 318 97 318 1 A
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__addf_l.mag b/15T_hs/sky130_osu_sc_15T_hs__addf_l.mag
deleted file mode 100644
index 5546bfa..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__addf_l.mag
+++ /dev/null
@@ -1,653 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864573
-<< checkpaint >>
-rect -1269 -242 2695 2379
-rect -1209 -1243 2569 -242
-<< nwell >>
-rect -9 529 1435 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 410 115 440 263
-rect 496 115 526 263
-rect 582 115 612 263
-rect 668 115 698 263
-rect 754 115 784 263
-rect 840 115 870 263
-rect 922 115 952 263
-rect 1004 115 1034 263
-rect 1102 115 1132 219
-rect 1292 115 1322 219
-<< ndiff >>
-rect 27 233 80 263
-rect 27 131 35 233
-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 1089 1408 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 1003 1089
-rect 1037 1049 1139 1089
-rect 1173 1049 1275 1089
-rect 1309 1049 1408 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 729 155 745
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 1003 1083 1037 1089
-rect 1003 1055 1037 1083
-rect 1139 1083 1173 1089
-rect 1139 1055 1173 1083
-rect 1275 1083 1309 1089
-rect 1275 1055 1309 1083
-rect 80 449 114 483
-rect 248 375 282 409
-rect 80 301 114 335
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1089 1408 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 1003 1089
-rect 1037 1055 1139 1089
-rect 1173 1055 1275 1089
-rect 1309 1055 1408 1089
-rect 0 1049 1408 1055
-rect 1131 638 1189 644
-rect 1109 604 1143 638
-rect 1177 604 1189 638
-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 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel viali 97 318 97 318 1 A
-port 1 n
-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 1228 244 1228 244 1 CON
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__addh_1.mag b/15T_hs/sky130_osu_sc_15T_hs__addh_1.mag
deleted file mode 100644
index 63b9f64..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__addh_1.mag
+++ /dev/null
@@ -1,394 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864573
-<< checkpaint >>
-rect -1269 -242 2097 2379
-rect -1209 -1243 2025 -242
-<< nwell >>
-rect -9 529 837 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 178 115 208 263
-rect 250 115 280 263
-rect 442 115 472 263
-rect 540 115 570 263
-rect 626 115 656 263
-rect 712 115 742 263
-<< ndiff >>
-rect 27 233 80 263
-rect 27 131 35 233
-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 1089 836 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 836 1089
-rect 35 949 69 965
-rect 35 575 69 597
-rect 133 949 167 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 35 609 69 631
-rect 35 597 69 609
-rect 260 449 294 483
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1089 836 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 836 1089
-rect 0 1049 836 1055
-rect 23 631 81 637
-rect 23 597 35 631
-rect 69 597 81 631
-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 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 425 50 425 1 S
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__addh_l.mag b/15T_hs/sky130_osu_sc_15T_hs__addh_l.mag
deleted file mode 100644
index 8c1055b..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__addh_l.mag
+++ /dev/null
@@ -1,398 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864574
-<< checkpaint >>
-rect -1269 -242 2097 2379
-rect -1209 -1243 2025 -242
-<< nwell >>
-rect -9 529 837 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 219
-rect 178 115 208 263
-rect 250 115 280 263
-rect 442 115 472 237
-rect 540 115 570 263
-rect 626 115 656 263
-rect 712 115 742 263
-<< ndiff >>
-rect 125 233 178 263
-rect 125 219 133 233
-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 1089 836 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 836 1089
-rect 35 949 69 965
-rect 35 631 69 745
-rect 133 949 167 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 35 597 69 631
-rect 260 449 294 483
-rect 164 375 198 409
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1089 836 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 836 1089
-rect 0 1049 836 1055
-rect 23 631 81 637
-rect 23 597 35 631
-rect 69 597 81 631
-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 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 425 50 425 1 S
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__and2_1.mag b/15T_hs/sky130_osu_sc_15T_hs__and2_1.mag
deleted file mode 100644
index 47bb731..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__and2_1.mag
+++ /dev/null
@@ -1,187 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864574
-<< checkpaint >>
-rect -1269 -242 1634 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 374 1119
-<< pmos >>
-rect 80 565 110 965
-rect 166 565 196 965
-rect 252 565 282 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-<< ndiff >>
-rect 27 233 80 263
-rect 27 131 35 233
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 1049
-rect 35 729 69 745
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 37 597 71 631
-rect 173 523 207 557
-rect 293 449 327 483
-rect 293 233 327 261
-rect 293 227 327 233
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 105 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__and2_2.mag b/15T_hs/sky130_osu_sc_15T_hs__and2_2.mag
deleted file mode 100644
index 0c2abbe..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__and2_2.mag
+++ /dev/null
@@ -1,222 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864574
-<< checkpaint >>
-rect -1269 -242 1722 2379
-rect -1209 -1243 1617 -242
-<< nwell >>
-rect -9 529 462 1119
-<< pmos >>
-rect 80 565 110 965
-rect 166 565 196 965
-rect 252 565 282 965
-rect 338 565 368 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-rect 338 115 368 263
-<< ndiff >>
-rect 27 233 80 263
-rect 27 131 35 233
-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 1089 462 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 462 1089
-rect 35 949 69 1049
-rect 35 729 69 745
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 37 597 71 631
-rect 173 523 207 557
-rect 293 449 327 483
-rect 293 233 327 261
-rect 293 227 327 233
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 462 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 462 1089
-rect 0 1049 462 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 105 631
-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 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 191 540 191 540 1 B
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__and2_4.mag b/15T_hs/sky130_osu_sc_15T_hs__and2_4.mag
deleted file mode 100644
index 3342006..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__and2_4.mag
+++ /dev/null
@@ -1,285 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864574
-<< checkpaint >>
-rect -1269 -242 1898 2379
-rect -1209 -1243 1753 -242
-<< nwell >>
-rect -9 529 638 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-<< ndiff >>
-rect 27 233 80 263
-rect 27 131 35 233
-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 1089 638 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 638 1089
-rect 35 949 69 1049
-rect 35 729 69 745
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 37 597 71 631
-rect 173 523 207 557
-rect 293 449 327 483
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 638 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 638 1089
-rect 0 1049 638 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 105 631
-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 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__and2_6.mag b/15T_hs/sky130_osu_sc_15T_hs__and2_6.mag
deleted file mode 100644
index 8813271..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__and2_6.mag
+++ /dev/null
@@ -1,314 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604007749
-<< checkpaint >>
-rect -1269 -242 2074 2379
-rect -1260 -1260 1261 -242
-<< nwell >>
-rect -9 529 814 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-rect 596 115 626 263
-rect 682 115 712 263
-<< ndiff >>
-rect 27 233 80 263
-rect 27 131 35 233
-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/sky130_osu_sc_15T_hs__and2_8.mag b/15T_hs/sky130_osu_sc_15T_hs__and2_8.mag
deleted file mode 100644
index b7b5ef1..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__and2_8.mag
+++ /dev/null
@@ -1,427 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864575
-<< checkpaint >>
-rect -1269 -242 2250 2379
-rect -1209 -1243 2161 -242
-<< nwell >>
-rect -9 529 990 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-rect 596 115 626 263
-rect 682 115 712 263
-rect 768 115 798 263
-rect 854 115 884 263
-<< ndiff >>
-rect 27 233 80 263
-rect 27 131 35 233
-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 1089 990 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 990 1089
-rect 35 949 69 1049
-rect 35 729 69 745
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 37 597 71 631
-rect 173 523 207 557
-rect 293 449 327 483
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1089 990 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 990 1089
-rect 0 1049 990 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 105 631
-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 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel viali 191 540 191 540 1 B
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__and2_l.mag b/15T_hs/sky130_osu_sc_15T_hs__and2_l.mag
deleted file mode 100644
index 2635e76..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__and2_l.mag
+++ /dev/null
@@ -1,187 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864575
-<< checkpaint >>
-rect -1269 -242 1634 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 374 1119
-<< pmos >>
-rect 80 713 110 965
-rect 166 713 196 965
-rect 252 713 282 965
-<< nmoslvt >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 252 115 282 219
-<< ndiff >>
-rect 27 199 80 219
-rect 27 131 35 199
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 1049
-rect 121 949 155 965
-rect 35 797 69 813
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 37 597 71 631
-rect 173 523 207 557
-rect 293 449 327 483
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 105 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__ant.mag b/15T_hs/sky130_osu_sc_15T_hs__ant.mag
deleted file mode 100644
index 82698b7..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__ant.mag
+++ /dev/null
@@ -1,102 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864575
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< nwell >>
-rect -9 529 199 1119
-<< pmos >>
-rect 80 565 110 965
-<< nmoslvt >>
-rect 80 115 110 263
-<< 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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 965
-rect 35 483 69 605
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 47 449 81 483
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 35 483 108 489
-rect 35 449 47 483
-rect 81 449 108 483
-rect 35 443 108 449
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 466 64 466 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__antfill.mag b/15T_hs/sky130_osu_sc_15T_hs__antfill.mag
deleted file mode 100644
index 24eee20..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__antfill.mag
+++ /dev/null
@@ -1,59 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864575
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< 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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 483 69 965
-rect 121 589 155 1049
-rect 31 449 47 483
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 47 449 81 483
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 35 483 108 489
-rect 35 449 47 483
-rect 81 449 108 483
-rect 35 443 108 449
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 466 64 466 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__aoi21_l.mag b/15T_hs/sky130_osu_sc_15T_hs__aoi21_l.mag
deleted file mode 100644
index 2aec0a3..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__aoi21_l.mag
+++ /dev/null
@@ -1,198 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864575
-<< checkpaint >>
-rect -1269 -242 1634 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 374 1119
-<< pmos >>
-rect 80 565 110 965
-rect 166 565 196 965
-rect 252 565 282 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 250 115 280 219
-<< ndiff >>
-rect 27 233 80 263
-rect 27 131 35 233
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 797 155 813
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 60 597 94 631
-rect 128 523 162 557
-rect 216 449 250 483
-rect 293 375 327 409
-rect 193 233 227 261
-rect 193 227 227 233
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 48 631 106 637
-rect 48 597 60 631
-rect 94 597 128 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel viali 77 614 77 614 1 A0
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__aoi22_l.mag b/15T_hs/sky130_osu_sc_15T_hs__aoi22_l.mag
deleted file mode 100644
index 8a9c027..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__aoi22_l.mag
+++ /dev/null
@@ -1,240 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864576
-<< checkpaint >>
-rect -1269 -242 1722 2379
-rect -1209 -1243 1617 -242
-<< nwell >>
-rect -9 529 462 1119
-<< pmos >>
-rect 80 565 110 965
-rect 166 565 196 965
-rect 252 565 282 965
-rect 338 565 368 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-rect 324 115 354 263
-<< ndiff >>
-rect 27 233 80 263
-rect 27 131 35 233
-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 1089 462 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 462 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 763 155 779
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 60 597 94 631
-rect 128 523 162 557
-rect 216 449 250 483
-rect 370 376 404 410
-rect 302 301 336 335
-rect 200 233 234 261
-rect 200 227 234 233
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 462 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 462 1089
-rect 0 1049 462 1055
-rect 48 631 106 637
-rect 48 597 60 631
-rect 94 597 128 631
-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 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 77 614 77 614 1 A0
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__buf_1.mag b/15T_hs/sky130_osu_sc_15T_hs__buf_1.mag
deleted file mode 100644
index 5b887c2..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__buf_1.mag
+++ /dev/null
@@ -1,157 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864576
-<< checkpaint >>
-rect -1269 -242 1548 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 288 1119
-<< pmos >>
-rect 80 565 110 965
-rect 166 565 196 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-<< ndiff >>
-rect 27 233 80 263
-rect 27 131 35 233
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 729 155 745
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 110 597 144 631
-rect 207 523 241 557
-rect 207 233 241 261
-rect 207 227 241 233
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 98 631 156 637
-rect 64 597 110 631
-rect 144 597 156 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 213 403 213 403 1 Y
-port 2 n
-rlabel viali 127 614 127 614 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__buf_2.mag b/15T_hs/sky130_osu_sc_15T_hs__buf_2.mag
deleted file mode 100644
index f13438c..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__buf_2.mag
+++ /dev/null
@@ -1,179 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864576
-<< checkpaint >>
-rect -1269 2461 1636 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1636 -1129
-<< nwell >>
-rect -9 529 376 1119
-<< pmos >>
-rect 80 565 110 965
-rect 166 565 196 965
-rect 252 565 282 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 725 155 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 110 597 144 631
-rect 207 523 241 557
-rect 207 227 241 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 98 631 156 637
-rect 64 597 110 631
-rect 144 597 156 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel viali 127 614 127 614 1 A
-port 1 n
-rlabel metal1 211 402 211 402 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__buf_4.mag b/15T_hs/sky130_osu_sc_15T_hs__buf_4.mag
deleted file mode 100644
index b4c508e..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__buf_4.mag
+++ /dev/null
@@ -1,244 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864576
-<< checkpaint >>
-rect -1269 2461 1812 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1812 -1129
-<< nwell >>
-rect -9 529 552 1119
-<< pmos >>
-rect 80 565 110 965
-rect 166 565 196 965
-rect 252 565 282 965
-rect 338 565 368 965
-rect 424 565 454 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 550 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 550 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 725 155 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 110 597 144 631
-rect 207 523 241 557
-rect 379 523 413 557
-rect 207 227 241 261
-rect 379 227 413 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 550 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 550 1089
-rect 0 1049 550 1055
-rect 98 631 156 637
-rect 64 597 110 631
-rect 144 597 156 631
-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 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel viali 127 614 127 614 1 A
-port 1 n
-rlabel metal1 211 402 211 402 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__buf_6.mag b/15T_hs/sky130_osu_sc_15T_hs__buf_6.mag
deleted file mode 100644
index de9735e..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__buf_6.mag
+++ /dev/null
@@ -1,286 +0,0 @@
-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
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-rect 596 115 626 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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/sky130_osu_sc_15T_hs__buf_8.mag b/15T_hs/sky130_osu_sc_15T_hs__buf_8.mag
deleted file mode 100644
index 268f973..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__buf_8.mag
+++ /dev/null
@@ -1,383 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864576
-<< checkpaint >>
-rect -1269 2461 2164 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2164 -1129
-<< nwell >>
-rect -9 529 904 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-rect 596 115 626 263
-rect 682 115 712 263
-rect 768 115 798 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 902 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 902 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 725 155 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 902 61
-rect 0 0 902 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 110 597 144 631
-rect 207 523 241 557
-rect 379 523 413 557
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1089 902 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 902 1089
-rect 0 1049 902 1055
-rect 98 631 156 637
-rect 64 597 110 631
-rect 144 597 156 631
-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 55 902 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 902 55
-rect 0 0 902 21
-<< labels >>
-rlabel viali 127 614 127 614 1 A
-port 1 n
-rlabel metal1 211 402 211 402 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__buf_l.mag b/15T_hs/sky130_osu_sc_15T_hs__buf_l.mag
deleted file mode 100644
index d69d530..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__buf_l.mag
+++ /dev/null
@@ -1,157 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864577
-<< checkpaint >>
-rect -1269 -242 1548 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 288 1119
-<< pmos >>
-rect 80 713 110 965
-rect 166 713 196 965
-<< nmoslvt >>
-rect 80 115 110 219
-rect 166 115 196 219
-<< ndiff >>
-rect 27 165 80 219
-rect 27 131 35 165
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 965
-rect 35 352 69 831
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 110 597 144 631
-rect 207 523 241 557
-rect 207 227 241 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 98 631 156 637
-rect 64 597 110 631
-rect 144 597 156 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel viali 127 614 127 614 1 A
-port 1 n
-rlabel metal1 214 400 214 400 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__decap_1.mag b/15T_hs/sky130_osu_sc_15T_hs__decap_1.mag
deleted file mode 100644
index f7561be..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__decap_1.mag
+++ /dev/null
@@ -1,84 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864577
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< nwell >>
-rect -9 529 199 1119
-<< pmos >>
-rect 80 713 110 965
-<< nmoslvt >>
-rect 80 115 110 367
-<< 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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 729 69 745
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__decap_l.mag b/15T_hs/sky130_osu_sc_15T_hs__decap_l.mag
deleted file mode 100644
index cbb6f9c..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__decap_l.mag
+++ /dev/null
@@ -1,84 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864577
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< nwell >>
-rect -9 529 199 1119
-<< pmos >>
-rect 80 837 110 965
-<< nmoslvt >>
-rect 80 115 110 243
-<< 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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 849 69 865
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__dff_1.mag b/15T_hs/sky130_osu_sc_15T_hs__dff_1.mag
deleted file mode 100644
index 7dfb21c..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__dff_1.mag
+++ /dev/null
@@ -1,635 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864577
-<< checkpaint >>
-rect -1269 -242 2716 2379
-rect -1209 -1243 2569 -242
-<< nwell >>
-rect -9 529 1456 1119
-<< 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
-<< nmoslvt >>
-rect 85 115 115 263
-rect 171 115 201 263
-rect 243 115 273 263
-rect 363 115 393 263
-rect 435 115 465 263
-rect 521 115 551 263
-rect 593 115 623 263
-rect 713 115 743 263
-rect 785 115 815 263
-rect 871 115 901 263
-rect 1061 115 1091 263
-rect 1251 115 1281 263
-rect 1337 115 1367 263
-<< ndiff >>
-rect 32 215 85 263
-rect 32 131 40 215
-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 1089 1452 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 1003 1089
-rect 1037 1049 1139 1089
-rect 1173 1049 1275 1089
-rect 1309 1049 1452 1089
-rect 40 949 74 965
-rect 17 605 40 617
-rect 126 949 160 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 1003 1083 1037 1089
-rect 1003 1055 1037 1083
-rect 1139 1083 1173 1089
-rect 1139 1055 1173 1083
-rect 1275 1083 1309 1089
-rect 1275 1055 1309 1083
-rect 40 301 74 335
-rect 253 449 287 483
-rect 181 375 215 409
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1089 1452 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 1003 1089
-rect 1037 1055 1139 1089
-rect 1173 1055 1275 1089
-rect 1309 1055 1452 1089
-rect 0 1049 1452 1055
-rect 1366 631 1424 637
-rect 1343 597 1378 631
-rect 1412 597 1424 631
-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 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel viali 198 392 198 392 1 D
-port 1 n
-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 49 68 49 1 gnd
-rlabel viali 68 1063 68 1063 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__dff_l.mag b/15T_hs/sky130_osu_sc_15T_hs__dff_l.mag
deleted file mode 100644
index a7c9b8a..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__dff_l.mag
+++ /dev/null
@@ -1,636 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864577
-<< checkpaint >>
-rect -1269 -242 2716 2379
-rect -1209 -1243 2569 -242
-<< nwell >>
-rect -9 529 1456 1119
-<< 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
-<< nmoslvt >>
-rect 85 115 115 263
-rect 171 115 201 263
-rect 243 115 273 263
-rect 363 115 393 263
-rect 435 115 465 263
-rect 521 115 551 263
-rect 593 115 623 263
-rect 713 115 743 263
-rect 785 115 815 263
-rect 871 115 901 263
-rect 1061 115 1091 263
-rect 1251 115 1281 219
-rect 1337 115 1367 219
-<< ndiff >>
-rect 32 215 85 263
-rect 32 131 40 215
-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 1089 1452 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 1003 1089
-rect 1037 1049 1139 1089
-rect 1173 1049 1275 1089
-rect 1309 1049 1452 1089
-rect 40 949 74 965
-rect 17 605 40 617
-rect 126 949 160 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 1003 1083 1037 1089
-rect 1003 1055 1037 1083
-rect 1139 1083 1173 1089
-rect 1139 1055 1173 1083
-rect 1275 1083 1309 1089
-rect 1275 1055 1309 1083
-rect 40 301 74 335
-rect 253 449 287 483
-rect 181 375 215 409
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1089 1452 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 1003 1089
-rect 1037 1055 1139 1089
-rect 1173 1055 1275 1089
-rect 1309 1055 1452 1089
-rect 0 1049 1452 1055
-rect 1365 631 1423 637
-rect 1343 597 1377 631
-rect 1411 597 1423 631
-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 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel viali 198 392 198 392 1 D
-port 1 n
-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 49 68 49 1 gnd
-rlabel viali 68 1063 68 1063 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__dffr_1.mag b/15T_hs/sky130_osu_sc_15T_hs__dffr_1.mag
deleted file mode 100644
index 71c0daa..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__dffr_1.mag
+++ /dev/null
@@ -1,809 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864578
-<< checkpaint >>
-rect -1270 -242 3177 2379
-rect -1210 -1243 3112 -242
-<< nwell >>
-rect -10 529 1917 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 270 115 300 219
-rect 356 115 386 219
-rect 546 115 576 263
-rect 618 115 648 263
-rect 738 115 768 263
-rect 810 115 840 263
-rect 896 115 926 263
-rect 968 115 998 263
-rect 1088 115 1118 263
-rect 1160 115 1190 263
-rect 1246 115 1276 263
-rect 1436 115 1466 219
-rect 1522 115 1552 219
-rect 1712 115 1742 263
-rect 1798 115 1828 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 1914 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1682 1089
-rect 1716 1049 1818 1089
-rect 1852 1049 1914 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 1682 1083 1716 1089
-rect 1682 1055 1716 1083
-rect 1818 1083 1852 1089
-rect 1818 1055 1852 1083
-rect 47 597 81 631
-rect 229 257 263 261
-rect 229 227 263 257
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 1089 1914 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1682 1089
-rect 1716 1055 1818 1089
-rect 1852 1055 1914 1089
-rect 0 1049 1914 1055
-rect 35 631 93 637
-rect 1826 631 1884 637
-rect 35 597 47 631
-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 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel viali 65 614 65 614 1 RN
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__dffr_l.mag b/15T_hs/sky130_osu_sc_15T_hs__dffr_l.mag
deleted file mode 100644
index 3cc86ec..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__dffr_l.mag
+++ /dev/null
@@ -1,809 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864578
-<< checkpaint >>
-rect -1270 -242 3177 2379
-rect -1210 -1243 3112 -242
-<< nwell >>
-rect -10 529 1917 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 270 115 300 219
-rect 356 115 386 219
-rect 546 115 576 263
-rect 618 115 648 263
-rect 738 115 768 263
-rect 810 115 840 263
-rect 896 115 926 263
-rect 968 115 998 263
-rect 1088 115 1118 263
-rect 1160 115 1190 263
-rect 1246 115 1276 263
-rect 1436 115 1466 219
-rect 1522 115 1552 219
-rect 1712 115 1742 219
-rect 1798 115 1828 219
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 1914 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1682 1089
-rect 1716 1049 1818 1089
-rect 1852 1049 1914 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 1682 1083 1716 1089
-rect 1682 1055 1716 1083
-rect 1818 1083 1852 1089
-rect 1818 1055 1852 1083
-rect 47 597 81 631
-rect 229 257 263 261
-rect 229 227 263 257
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 1089 1914 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1682 1089
-rect 1716 1055 1818 1089
-rect 1852 1055 1914 1089
-rect 0 1049 1914 1055
-rect 35 631 93 637
-rect 1826 631 1884 637
-rect 35 597 47 631
-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 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel viali 65 614 65 614 1 RN
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__dffs_1.mag b/15T_hs/sky130_osu_sc_15T_hs__dffs_1.mag
deleted file mode 100644
index 87a3fe0..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__dffs_1.mag
+++ /dev/null
@@ -1,724 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864578
-<< checkpaint >>
-rect -1270 -242 3001 2379
-rect -1210 -1243 2840 -242
-<< nwell >>
-rect -10 529 1741 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 356 115 386 263
-rect 428 115 458 263
-rect 548 115 578 263
-rect 620 115 650 263
-rect 706 115 736 263
-rect 778 115 808 263
-rect 898 115 928 263
-rect 970 115 1000 263
-rect 1056 115 1086 263
-rect 1246 115 1276 219
-rect 1318 115 1348 219
-rect 1522 115 1552 263
-rect 1608 115 1638 263
-<< ndiff >>
-rect 27 165 80 219
-rect 27 131 35 165
-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 1089 1738 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1738 1089
-rect 35 949 69 1049
-rect 35 861 69 877
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 47 227 81 261
-rect 121 301 155 335
-rect 438 449 472 483
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 1089 1738 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1738 1089
-rect 0 1049 1738 1055
-rect 1636 631 1694 637
-rect 1614 597 1648 631
-rect 1682 597 1694 631
-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 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 392 383 392 1 D
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__dffs_l.mag b/15T_hs/sky130_osu_sc_15T_hs__dffs_l.mag
deleted file mode 100644
index 6ac3be5..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__dffs_l.mag
+++ /dev/null
@@ -1,724 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864578
-<< checkpaint >>
-rect -1270 -242 3001 2379
-rect -1210 -1243 2840 -242
-<< nwell >>
-rect -10 529 1741 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 356 115 386 263
-rect 428 115 458 263
-rect 548 115 578 263
-rect 620 115 650 263
-rect 706 115 736 263
-rect 778 115 808 263
-rect 898 115 928 263
-rect 970 115 1000 263
-rect 1056 115 1086 263
-rect 1246 115 1276 219
-rect 1318 115 1348 219
-rect 1522 115 1552 219
-rect 1608 115 1638 219
-<< ndiff >>
-rect 27 165 80 219
-rect 27 131 35 165
-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 1089 1738 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1738 1089
-rect 35 949 69 1049
-rect 35 861 69 877
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 47 227 81 261
-rect 121 301 155 335
-rect 438 449 472 483
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 1089 1738 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1738 1089
-rect 0 1049 1738 1055
-rect 1636 631 1694 637
-rect 1614 597 1648 631
-rect 1682 597 1694 631
-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 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 392 383 392 1 D
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__dffsr_1.mag b/15T_hs/sky130_osu_sc_15T_hs__dffsr_1.mag
deleted file mode 100644
index 62fabf9..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__dffsr_1.mag
+++ /dev/null
@@ -1,901 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864578
-<< checkpaint >>
-rect -1270 -242 3350 2379
-rect -1210 -1243 3248 -242
-<< nwell >>
-rect -10 529 2090 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 272 115 302 219
-rect 370 115 400 263
-rect 442 115 472 263
-rect 632 115 662 263
-rect 704 115 734 263
-rect 824 115 854 263
-rect 896 115 926 263
-rect 982 115 1012 263
-rect 1054 115 1084 263
-rect 1174 115 1204 263
-rect 1246 115 1276 263
-rect 1332 115 1362 263
-rect 1522 115 1552 263
-rect 1594 115 1624 263
-rect 1692 115 1722 219
-rect 1884 115 1914 263
-rect 1970 115 2000 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 2090 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1682 1089
-rect 1716 1049 1818 1089
-rect 1852 1049 1954 1089
-rect 1988 1049 2090 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 1682 1083 1716 1089
-rect 1682 1055 1716 1083
-rect 1818 1083 1852 1089
-rect 1818 1055 1852 1083
-rect 1954 1083 1988 1089
-rect 1954 1055 1988 1083
-rect 47 597 81 631
-rect 325 523 359 557
-rect 325 301 359 335
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 1089 2090 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1682 1089
-rect 1716 1055 1818 1089
-rect 1852 1055 1954 1089
-rect 1988 1055 2090 1089
-rect 0 1049 2090 1055
-rect 35 631 93 637
-rect 1999 631 2057 637
-rect 35 597 47 631
-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 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel viali 659 392 659 392 1 D
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__dffsr_l.mag b/15T_hs/sky130_osu_sc_15T_hs__dffsr_l.mag
deleted file mode 100644
index df41591..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__dffsr_l.mag
+++ /dev/null
@@ -1,900 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864579
-<< checkpaint >>
-rect -1270 -242 3350 2379
-rect -1210 -1243 3248 -242
-<< nwell >>
-rect -10 529 2090 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 272 115 302 219
-rect 370 115 400 263
-rect 442 115 472 263
-rect 632 115 662 263
-rect 704 115 734 263
-rect 824 115 854 263
-rect 896 115 926 263
-rect 982 115 1012 263
-rect 1054 115 1084 263
-rect 1174 115 1204 263
-rect 1246 115 1276 263
-rect 1332 115 1362 263
-rect 1522 115 1552 263
-rect 1594 115 1624 263
-rect 1692 115 1722 219
-rect 1884 115 1914 219
-rect 1970 115 2000 219
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 2090 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1682 1089
-rect 1716 1049 1818 1089
-rect 1852 1049 1954 1089
-rect 1988 1049 2090 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 1682 1083 1716 1089
-rect 1682 1055 1716 1083
-rect 1818 1083 1852 1089
-rect 1818 1055 1852 1083
-rect 1954 1083 1988 1089
-rect 1954 1055 1988 1083
-rect 47 597 81 631
-rect 325 523 359 557
-rect 325 301 359 335
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 1089 2090 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1682 1089
-rect 1716 1055 1818 1089
-rect 1852 1055 1954 1089
-rect 1988 1055 2090 1089
-rect 0 1049 2090 1055
-rect 35 631 93 637
-rect 1998 631 2056 637
-rect 35 597 47 631
-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 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel viali 659 392 659 392 1 D
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__fill_1.mag b/15T_hs/sky130_osu_sc_15T_hs__fill_1.mag
deleted file mode 100644
index 8d445b8..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__fill_1.mag
+++ /dev/null
@@ -1,24 +0,0 @@
-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/sky130_osu_sc_15T_hs__fill_16.mag b/15T_hs/sky130_osu_sc_15T_hs__fill_16.mag
deleted file mode 100644
index 83c32da..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__fill_16.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-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/sky130_osu_sc_15T_hs__fill_2.mag b/15T_hs/sky130_osu_sc_15T_hs__fill_2.mag
deleted file mode 100644
index bde58ab..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__fill_2.mag
+++ /dev/null
@@ -1,24 +0,0 @@
-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/sky130_osu_sc_15T_hs__fill_32.mag b/15T_hs/sky130_osu_sc_15T_hs__fill_32.mag
deleted file mode 100644
index 4cf67de..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__fill_32.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-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/sky130_osu_sc_15T_hs__fill_4.mag b/15T_hs/sky130_osu_sc_15T_hs__fill_4.mag
deleted file mode 100644
index 8b2fb75..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__fill_4.mag
+++ /dev/null
@@ -1,22 +0,0 @@
-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/sky130_osu_sc_15T_hs__fill_8.mag b/15T_hs/sky130_osu_sc_15T_hs__fill_8.mag
deleted file mode 100644
index 2d49aaa..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__fill_8.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-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/sky130_osu_sc_15T_hs__inv_1.mag b/15T_hs/sky130_osu_sc_15T_hs__inv_1.mag
deleted file mode 100644
index fd20f37..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__inv_1.mag
+++ /dev/null
@@ -1,115 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864580
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 529 199 1119
-<< pmos >>
-rect 80 565 110 965
-<< nmoslvt >>
-rect 80 115 110 263
-<< 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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 121 227 155 261
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 151 389 151 389 1 Y
-port 1 n
-rlabel viali 64 614 64 614 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__inv_10.mag b/15T_hs/sky130_osu_sc_15T_hs__inv_10.mag
deleted file mode 100644
index 957c28e..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__inv_10.mag
+++ /dev/null
@@ -1,420 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864580
-<< checkpaint >>
-rect -1269 2461 2250 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2250 -1129
-<< nwell >>
-rect -9 529 990 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-rect 596 115 626 263
-rect 682 115 712 263
-rect 768 115 798 263
-rect 854 115 884 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 990 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 990 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 293 523 327 557
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1089 990 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 990 1089
-rect 0 1049 990 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 152 388 152 388 1 Y
-port 1 n
-rlabel viali 64 613 64 613 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__inv_2.mag b/15T_hs/sky130_osu_sc_15T_hs__inv_2.mag
deleted file mode 100644
index f0f1d46..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__inv_2.mag
+++ /dev/null
@@ -1,153 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864580
-<< checkpaint >>
-rect -1269 2461 1547 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1547 -1129
-<< nwell >>
-rect -9 529 287 1119
-<< pmos >>
-rect 80 565 110 965
-rect 166 565 196 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 121 227 155 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 152 388 152 388 1 Y
-port 1 n
-rlabel viali 64 613 64 613 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__inv_3.mag b/15T_hs/sky130_osu_sc_15T_hs__inv_3.mag
deleted file mode 100644
index 2ddf63e..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__inv_3.mag
+++ /dev/null
@@ -1,182 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864580
-<< checkpaint >>
-rect -1269 2461 1635 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1635 -1129
-<< nwell >>
-rect -9 529 375 1119
-<< pmos >>
-rect 80 565 110 965
-rect 166 565 196 965
-rect 252 565 282 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 293 523 327 557
-rect 121 227 155 261
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 152 388 152 388 1 Y
-port 1 n
-rlabel viali 64 613 64 613 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__inv_4.mag b/15T_hs/sky130_osu_sc_15T_hs__inv_4.mag
deleted file mode 100644
index 0c6c059..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__inv_4.mag
+++ /dev/null
@@ -1,216 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864581
-<< checkpaint >>
-rect -1269 2461 1723 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1723 -1129
-<< nwell >>
-rect -9 529 463 1119
-<< pmos >>
-rect 80 565 110 965
-rect 166 565 196 965
-rect 252 565 282 965
-rect 338 565 368 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 462 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 462 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 293 523 327 557
-rect 121 227 155 261
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 462 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 462 1089
-rect 0 1049 462 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 64 613 64 613 1 A
-port 1 n
-rlabel metal1 152 388 152 388 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__inv_6.mag b/15T_hs/sky130_osu_sc_15T_hs__inv_6.mag
deleted file mode 100644
index 3090eaf..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__inv_6.mag
+++ /dev/null
@@ -1,280 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864581
-<< checkpaint >>
-rect -1269 2461 1899 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1899 -1129
-<< nwell >>
-rect -9 529 639 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 638 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 638 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 293 523 327 557
-rect 465 523 499 557
-rect 121 227 155 261
-rect 293 227 327 261
-rect 465 227 499 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 638 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 638 1089
-rect 0 1049 638 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 64 613 64 613 1 A
-port 1 n
-rlabel metal1 152 388 152 388 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__inv_8.mag b/15T_hs/sky130_osu_sc_15T_hs__inv_8.mag
deleted file mode 100644
index ff62dfd..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__inv_8.mag
+++ /dev/null
@@ -1,343 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864581
-<< checkpaint >>
-rect -1269 2461 2074 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2074 -1129
-<< nwell >>
-rect -9 529 814 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-rect 596 115 626 263
-rect 682 115 712 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 814 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 814 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 814 61
-rect 0 0 814 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 293 523 327 557
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-<< metal1 >>
-rect 0 1089 814 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 814 1089
-rect 0 1049 814 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 814 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 814 55
-rect 0 0 814 21
-<< labels >>
-rlabel metal1 152 388 152 388 1 Y
-port 1 n
-rlabel viali 64 613 64 613 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__inv_l.mag b/15T_hs/sky130_osu_sc_15T_hs__inv_l.mag
deleted file mode 100644
index 11bc61a..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__inv_l.mag
+++ /dev/null
@@ -1,114 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864581
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< nwell >>
-rect -9 529 199 1119
-<< pmos >>
-rect 80 713 110 965
-<< nmoslvt >>
-rect 80 115 110 219
-<< 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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 861 69 877
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 121 227 155 261
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 614 64 614 1 A
-port 1 n
-rlabel metal1 151 389 151 389 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__mux2_1.mag b/15T_hs/sky130_osu_sc_15T_hs__mux2_1.mag
deleted file mode 100644
index 56e5fb0..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__mux2_1.mag
+++ /dev/null
@@ -1,227 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864581
-<< checkpaint >>
-rect -1269 2461 1813 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1813 -1129
-<< nwell >>
-rect -9 529 553 1119
-<< pmos >>
-rect 80 565 110 965
-rect 270 565 300 965
-rect 356 565 386 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 270 115 300 263
-rect 356 115 386 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 550 1110
-rect 0 1049 459 1089
-rect 493 1049 550 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 37 597 71 631
-rect 236 523 270 557
-rect 311 375 345 409
-rect 397 449 431 483
-rect 311 227 345 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 550 1110
-rect 0 1055 459 1089
-rect 493 1055 550 1089
-rect 0 1049 550 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 117 631
-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 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel viali 54 614 54 614 1 S0
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 476 1062 476 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__nand2_1.mag b/15T_hs/sky130_osu_sc_15T_hs__nand2_1.mag
deleted file mode 100644
index 4d7ac16..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__nand2_1.mag
+++ /dev/null
@@ -1,157 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864582
-<< checkpaint >>
-rect -1269 2461 1546 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1546 -1129
-<< nwell >>
-rect -9 529 286 1119
-<< pmos >>
-rect 80 565 110 965
-rect 166 565 196 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 47 597 81 631
-rect 121 449 155 483
-rect 195 523 229 557
-rect 35 227 69 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 115 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 418 136 418 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__nand2_l.mag b/15T_hs/sky130_osu_sc_15T_hs__nand2_l.mag
deleted file mode 100644
index cc6ee27..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__nand2_l.mag
+++ /dev/null
@@ -1,156 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864582
-<< checkpaint >>
-rect -1269 -242 1546 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 286 1119
-<< pmos >>
-rect 80 713 110 965
-rect 166 713 196 965
-<< nmoslvt >>
-rect 80 115 110 219
-rect 152 115 182 219
-<< ndiff >>
-rect 27 165 80 219
-rect 27 131 35 165
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 1049
-rect 35 861 69 877
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 47 597 81 631
-rect 121 449 155 483
-rect 195 523 229 557
-rect 35 227 69 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 115 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 418 136 418 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__nor2_1.mag b/15T_hs/sky130_osu_sc_15T_hs__nor2_1.mag
deleted file mode 100644
index dbe0c4b..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__nor2_1.mag
+++ /dev/null
@@ -1,157 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864582
-<< checkpaint >>
-rect -1269 2461 1546 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1546 -1129
-<< nwell >>
-rect -9 529 286 1119
-<< pmos >>
-rect 80 565 110 965
-rect 152 565 182 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 965
-rect 193 949 227 1049
-rect 193 725 227 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 181 597 215 631
-rect 35 449 69 483
-rect 113 523 147 557
-rect 121 227 155 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 169 631 227 637
-rect 148 597 181 631
-rect 215 597 227 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 137 341 137 341 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__nor2_l.mag b/15T_hs/sky130_osu_sc_15T_hs__nor2_l.mag
deleted file mode 100644
index 3044bd3..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__nor2_l.mag
+++ /dev/null
@@ -1,156 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864582
-<< checkpaint >>
-rect -1269 -242 1546 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 286 1119
-<< pmos >>
-rect 80 713 110 965
-rect 152 713 182 965
-<< nmoslvt >>
-rect 80 115 110 219
-rect 166 115 196 219
-<< ndiff >>
-rect 27 165 80 219
-rect 27 131 35 165
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 965
-rect 35 483 69 809
-rect 193 949 227 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 181 597 215 631
-rect 35 449 69 483
-rect 113 523 147 557
-rect 121 227 155 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 169 631 227 637
-rect 148 597 181 631
-rect 215 597 227 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 137 341 137 341 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__oai21_l.mag b/15T_hs/sky130_osu_sc_15T_hs__oai21_l.mag
deleted file mode 100644
index 0905f9b..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__oai21_l.mag
+++ /dev/null
@@ -1,195 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864582
-<< checkpaint >>
-rect -1269 -242 1634 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 374 1119
-<< pmos >>
-rect 80 565 110 965
-rect 152 565 182 965
-rect 250 713 280 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 193 949 227 1049
-rect 193 793 227 809
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 66 597 100 631
-rect 162 523 196 557
-rect 223 449 257 483
-rect 291 375 325 409
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 54 631 112 637
-rect 54 597 66 631
-rect 100 597 134 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel viali 83 614 83 614 1 A0
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__oai22_l.mag b/15T_hs/sky130_osu_sc_15T_hs__oai22_l.mag
deleted file mode 100644
index 75f7cb0..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__oai22_l.mag
+++ /dev/null
@@ -1,240 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864583
-<< checkpaint >>
-rect -1269 -242 1722 2379
-rect -1209 -1243 1617 -242
-<< nwell >>
-rect -9 529 462 1119
-<< pmos >>
-rect 80 565 110 965
-rect 152 565 182 965
-rect 252 565 282 965
-rect 324 565 354 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 462 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 462 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 200 949 234 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 66 597 100 631
-rect 162 523 196 557
-rect 223 449 257 483
-rect 384 376 418 410
-rect 316 301 350 335
-rect 316 227 350 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 462 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 462 1089
-rect 0 1049 462 1055
-rect 54 631 112 637
-rect 54 597 66 631
-rect 100 597 134 631
-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 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 240 466 240 466 1 B0
-port 4 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__or2_1.mag b/15T_hs/sky130_osu_sc_15T_hs__or2_1.mag
deleted file mode 100644
index dc3962c..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__or2_1.mag
+++ /dev/null
@@ -1,188 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864583
-<< checkpaint >>
-rect -1269 2461 1634 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1634 -1129
-<< nwell >>
-rect -9 529 374 1119
-<< pmos >>
-rect 80 565 110 965
-rect 166 565 196 965
-rect 252 565 282 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 207 949 241 1049
-rect 207 725 241 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 37 523 71 557
-rect 173 597 207 631
-rect 293 449 327 483
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 161 631 219 637
-rect 140 597 173 631
-rect 207 597 219 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__or2_2.mag b/15T_hs/sky130_osu_sc_15T_hs__or2_2.mag
deleted file mode 100644
index 05c4b0f..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__or2_2.mag
+++ /dev/null
@@ -1,223 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864583
-<< checkpaint >>
-rect -1269 2461 1722 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1722 -1129
-<< nwell >>
-rect -9 529 462 1119
-<< pmos >>
-rect 80 565 110 965
-rect 166 565 196 965
-rect 252 565 282 965
-rect 338 565 368 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 462 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 462 1089
-rect 35 949 69 965
-rect 207 949 241 1049
-rect 207 725 241 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 37 523 71 557
-rect 173 597 207 631
-rect 293 449 327 483
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 462 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 462 1089
-rect 0 1049 462 1055
-rect 161 631 219 637
-rect 140 597 173 631
-rect 207 597 219 631
-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 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__or2_4.mag b/15T_hs/sky130_osu_sc_15T_hs__or2_4.mag
deleted file mode 100644
index 1bf24da..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__or2_4.mag
+++ /dev/null
@@ -1,286 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864583
-<< checkpaint >>
-rect -1269 2461 1898 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1898 -1129
-<< nwell >>
-rect -9 529 638 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 638 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 638 1089
-rect 35 949 69 965
-rect 207 949 241 1049
-rect 207 725 241 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 37 523 71 557
-rect 173 597 207 631
-rect 293 449 327 483
-rect 465 449 499 483
-rect 293 227 327 261
-rect 465 227 499 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 638 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 638 1089
-rect 0 1049 638 1055
-rect 161 631 219 637
-rect 140 597 173 631
-rect 207 597 219 631
-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 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__or2_8.mag b/15T_hs/sky130_osu_sc_15T_hs__or2_8.mag
deleted file mode 100644
index 29ce0cc..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__or2_8.mag
+++ /dev/null
@@ -1,428 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864583
-<< checkpaint >>
-rect -1269 2461 2250 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2250 -1129
-<< nwell >>
-rect -9 529 990 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-rect 596 115 626 263
-rect 682 115 712 263
-rect 768 115 798 263
-rect 854 115 884 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 990 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 990 1089
-rect 35 949 69 965
-rect 207 949 241 1049
-rect 207 725 241 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 37 523 71 557
-rect 173 597 207 631
-rect 293 449 327 483
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1089 990 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 990 1089
-rect 0 1049 990 1055
-rect 161 631 219 637
-rect 140 597 173 631
-rect 207 597 219 631
-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 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__or2_l.mag b/15T_hs/sky130_osu_sc_15T_hs__or2_l.mag
deleted file mode 100644
index 6a6e35c..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__or2_l.mag
+++ /dev/null
@@ -1,187 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864583
-<< checkpaint >>
-rect -1269 -242 1634 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 374 1119
-<< pmos >>
-rect 80 713 110 965
-rect 166 713 196 965
-rect 252 713 282 965
-<< nmoslvt >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-<< ndiff >>
-rect 27 165 80 219
-rect 27 131 35 165
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 35 691 69 877
-rect 207 949 241 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 37 523 71 557
-rect 173 597 207 631
-rect 293 449 327 483
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 161 631 219 637
-rect 140 597 173 631
-rect 207 597 219 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__tbufi_1.mag b/15T_hs/sky130_osu_sc_15T_hs__tbufi_1.mag
deleted file mode 100644
index b85767c..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__tbufi_1.mag
+++ /dev/null
@@ -1,187 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864584
-<< checkpaint >>
-rect -1269 2461 1635 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1635 -1129
-<< nwell >>
-rect -9 529 375 1119
-<< pmos >>
-rect 80 565 110 965
-rect 166 565 196 965
-rect 238 565 268 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 657 155 673
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 211 597 245 631
-rect 279 449 313 483
-rect 121 301 155 335
-rect 279 227 313 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 199 631 257 637
-rect 177 597 211 631
-rect 245 597 257 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 312 305 312 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__tbufi_l.mag b/15T_hs/sky130_osu_sc_15T_hs__tbufi_l.mag
deleted file mode 100644
index ed546be..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__tbufi_l.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864584
-<< checkpaint >>
-rect -1269 -242 1635 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 375 1119
-<< pmos >>
-rect 80 713 110 965
-rect 166 713 196 965
-rect 238 713 268 965
-<< nmoslvt >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 238 115 268 219
-<< ndiff >>
-rect 27 165 80 219
-rect 27 131 35 165
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 35 461 69 809
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 211 597 245 631
-rect 279 449 313 483
-rect 121 301 155 335
-rect 279 227 313 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 199 631 257 637
-rect 177 597 211 631
-rect 245 597 257 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 312 305 312 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__tiehi.mag b/15T_hs/sky130_osu_sc_15T_hs__tiehi.mag
deleted file mode 100644
index 454c7ca..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__tiehi.mag
+++ /dev/null
@@ -1,100 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864584
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< nwell >>
-rect -9 529 199 1119
-<< pmos >>
-rect 80 565 110 965
-<< nmoslvt >>
-rect 80 115 110 263
-<< 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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 589 69 605
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 121 523 155 557
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 94 557 167 563
-rect 94 523 121 557
-rect 155 523 167 557
-rect 94 517 167 523
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 138 540 138 540 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__tielo.mag b/15T_hs/sky130_osu_sc_15T_hs__tielo.mag
deleted file mode 100644
index c05dd92..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__tielo.mag
+++ /dev/null
@@ -1,101 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864584
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 529 199 1119
-<< pmos >>
-rect 80 565 110 965
-<< nmoslvt >>
-rect 80 115 110 263
-<< 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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 589 69 605
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 121 301 155 335
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 94 335 167 341
-rect 94 301 121 335
-rect 155 301 167 335
-rect 94 295 167 301
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 138 318 138 318 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__tnbufi_1.mag b/15T_hs/sky130_osu_sc_15T_hs__tnbufi_1.mag
deleted file mode 100644
index cd4b230..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__tnbufi_1.mag
+++ /dev/null
@@ -1,182 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864584
-<< checkpaint >>
-rect -1269 2461 1635 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1635 -1129
-<< nwell >>
-rect -9 529 375 1119
-<< pmos >>
-rect 80 565 110 965
-rect 166 565 196 965
-rect 238 565 268 965
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 657 155 673
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 211 597 245 631
-rect 121 523 155 557
-rect 279 449 313 483
-rect 279 227 313 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 199 631 257 637
-rect 177 597 211 631
-rect 245 597 257 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 312 305 312 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__tnbufi_l.mag b/15T_hs/sky130_osu_sc_15T_hs__tnbufi_l.mag
deleted file mode 100644
index c3df65f..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__tnbufi_l.mag
+++ /dev/null
@@ -1,181 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864585
-<< checkpaint >>
-rect -1269 -242 1635 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 375 1119
-<< pmos >>
-rect 80 713 110 965
-rect 166 713 196 965
-rect 238 713 268 965
-<< nmoslvt >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 238 115 268 219
-<< ndiff >>
-rect 27 165 80 219
-rect 27 131 35 165
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 35 400 69 809
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 211 597 245 631
-rect 121 523 155 557
-rect 279 449 313 483
-rect 279 227 313 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 199 631 257 637
-rect 177 597 211 631
-rect 245 597 257 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 312 305 312 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__xnor2_l.mag b/15T_hs/sky130_osu_sc_15T_hs__xnor2_l.mag
deleted file mode 100644
index eb8167d..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__xnor2_l.mag
+++ /dev/null
@@ -1,292 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864585
-<< checkpaint >>
-rect -1269 -242 1898 2379
-rect -1209 -1243 1753 -242
-<< nwell >>
-rect -9 529 638 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
-rect 358 115 388 263
-rect 430 115 460 263
-rect 516 115 546 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 1089 638 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 638 1089
-rect 35 949 69 965
-rect 35 443 69 605
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 268 605 279 631
-rect 279 605 302 631
-rect 268 597 302 605
-rect 152 227 186 261
-rect 268 301 302 335
-rect 489 301 523 335
-rect 412 227 446 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 638 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 638 1089
-rect 0 1049 638 1055
-rect 256 631 314 637
-rect 256 597 268 631
-rect 302 597 314 631
-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 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 170 244 170 244 1 A
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_hs/sky130_osu_sc_15T_hs__xor2_l.mag b/15T_hs/sky130_osu_sc_15T_hs__xor2_l.mag
deleted file mode 100644
index 18150f0..0000000
--- a/15T_hs/sky130_osu_sc_15T_hs__xor2_l.mag
+++ /dev/null
@@ -1,291 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864585
-<< checkpaint >>
-rect -1269 -242 1898 2379
-rect -1209 -1243 1753 -242
-<< nwell >>
-rect -9 529 638 1119
-<< 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
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
-rect 358 115 388 263
-rect 430 115 460 263
-rect 516 115 546 263
-<< ndiff >>
-rect 27 215 80 263
-rect 27 131 35 215
-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 358 263
-rect 268 131 279 215
-rect 347 131 358 215
-rect 268 115 358 131
-rect 388 115 430 263
-rect 460 215 516 263
-rect 460 131 471 215
-rect 505 131 516 215
-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 741 121 949
-rect 155 741 166 949
-rect 110 565 166 741
-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 741 471 949
-rect 505 741 516 949
-rect 460 565 516 741
-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 215
-rect 279 131 347 215
-rect 471 131 505 215
-rect 557 131 591 215
-<< pdiffc >>
-rect 35 605 69 949
-rect 121 741 155 949
-rect 279 605 347 949
-rect 471 741 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 166 550 196 565
-rect 70 520 196 550
-rect 70 303 100 520
-rect 142 518 196 520
-rect 142 484 152 518
-rect 186 484 196 518
-rect 142 468 196 484
-rect 142 410 196 426
-rect 142 376 152 410
-rect 186 376 196 410
-rect 142 360 196 376
-rect 70 278 110 303
-rect 80 263 110 278
-rect 166 263 196 360
-rect 238 351 268 565
-rect 358 534 388 565
-rect 334 518 388 534
-rect 430 550 460 565
-rect 516 550 546 565
-rect 430 520 546 550
-rect 334 484 344 518
-rect 378 484 388 518
-rect 334 468 388 484
-rect 479 518 546 520
-rect 479 484 489 518
-rect 523 484 546 518
-rect 479 468 546 484
-rect 420 409 474 425
-rect 420 380 430 409
-rect 358 375 430 380
-rect 464 375 474 409
-rect 238 335 292 351
-rect 238 301 248 335
-rect 282 301 292 335
-rect 238 285 292 301
-rect 358 350 474 375
-rect 238 263 268 285
-rect 358 263 388 350
-rect 516 308 546 468
-rect 430 278 546 308
-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 484 186 518
-rect 152 376 186 410
-rect 344 484 378 518
-rect 489 484 523 518
-rect 430 375 464 409
-rect 248 301 282 335
-<< locali >>
-rect 0 1089 638 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 638 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 725 155 741
-rect 279 949 347 965
-rect 35 410 69 605
-rect 152 597 200 631
-rect 268 605 279 623
-rect 471 949 505 1049
-rect 471 725 505 741
-rect 557 949 591 965
-rect 152 518 186 597
-rect 268 589 347 605
-rect 136 484 152 518
-rect 186 484 202 518
-rect 268 483 302 589
-rect 344 518 378 534
-rect 344 410 378 484
-rect 35 376 152 410
-rect 186 376 378 410
-rect 412 409 446 597
-rect 489 518 523 523
-rect 489 468 523 484
-rect 35 215 69 376
-rect 412 375 430 409
-rect 464 375 480 409
-rect 557 335 591 606
-rect 232 301 248 335
-rect 282 301 591 335
-rect 35 115 69 131
-rect 121 215 155 231
-rect 121 61 155 131
-rect 279 227 296 231
-rect 330 227 347 231
-rect 279 215 347 227
-rect 279 115 347 131
-rect 471 215 505 231
-rect 471 61 505 131
-rect 557 215 591 301
-rect 557 115 591 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 200 597 234 631
-rect 412 597 446 631
-rect 268 449 302 483
-rect 489 523 523 557
-rect 296 227 330 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 638 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 638 1089
-rect 0 1049 638 1055
-rect 188 631 246 637
-rect 400 631 458 637
-rect 188 597 200 631
-rect 234 597 412 631
-rect 446 597 458 631
-rect 188 591 246 597
-rect 400 591 458 597
-rect 477 557 535 563
-rect 455 523 489 557
-rect 523 523 535 557
-rect 477 517 535 523
-rect 256 483 314 489
-rect 256 449 268 483
-rect 302 449 314 483
-rect 256 443 314 449
-rect 268 267 302 443
-rect 268 261 342 267
-rect 268 227 296 261
-rect 330 227 342 261
-rect 284 221 342 227
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 218 614 218 614 1 A
-port 1 n
-rlabel metal1 285 434 285 434 1 Y
-port 2 n
-rlabel viali 506 540 506 540 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/.magicrc b/15T_ls/.magicrc
deleted file mode 100755
index 79cac60..0000000
--- a/15T_ls/.magicrc
+++ /dev/null
@@ -1,105 +0,0 @@
-puts stdout "Sourcing design .magicrc for technology EFS8A ..."
-
-# Put grid on 0.005 pitch. This is important, as some commands don't
-# rescale the grid automatically (such as lef read?).
-
-set scalefac [tech lambda]
-if {[lindex $scalefac 1] < 2} {
- scalegrid 1 2
-}
-
-# drc off
-drc euclidean on
-
-#set PDKPATH "~/projects/efabless/tech/SkyWater/EFS8A"
-
-# loading technology
-#tech load $PDKPATH/libs.tech/magic/EFS8A.tech
-tech load ../../char/techfiles/sky130A.tech
-
-# load device generator
-#source $PDKPATH/libs.tech/magic/EFS8A.tcl
-
-# load bind keys (optional)
-# source $PDKPATH/libs.tech/magic/EFS8A-BindKeys
-
-# set units to lambda grid
-snap internal
-
-# add path to reference cells
-#set MAGPATH "${PDKPATH}/libs.ref/mag"
-#addpath ${MAGPATH}/primdev
-#addpath ${MAGPATH}/s8fmlt
-#addpath ${MAGPATH}/s8iom0
-#addpath ${MAGPATH}/scs8hd
-#addpath ${MAGPATH}/scs8hdll
-#addpath ${MAGPATH}/scs8hvl
-#addpath ${MAGPATH}/scs8hs
-#addpath ${MAGPATH}/scs8ms
-#addpath ${MAGPATH}/scs8ls
-#addpath ${MAGPATH}/scs8lp
-
-# add path to GDS cells
-
-# add path to IP from catalog. This procedure defined in the PDK script.
-catch {magic::query_mylib_ip}
-# add path to local IP from user design space. Defined in the PDK script.
-catch {magic::query_my_projects}
-
-macro Shift_G "grid 74"
-macro XK_Left "scroll l .1 w"
-macro Shift_XK_Left "scroll l 1 w"
-macro Control_XK_Left "box grow w 1"
-macro Control_Shift_XK_Left "box shrink e 1"
-macro XK_Right "scroll r .1 w"
-macro Shift_XK_Right "scroll r 1 w"
-macro Control_XK_Right "box grow e 1"
-macro Control_Shift_XK_Right "box shrink w 1"
-macro XK_Up "scroll u .1 w"
-macro Shift_XK_Up "scroll u 1 w"
-macro Control_XK_Up "box grow n 1"
-macro Control_Shift_XK_Up "box shrink s 1"
-macro XK_Down "scroll d .1 w"
-macro Shift_XK_Down "scroll d 1 w"
-macro Control_XK_Down "box grow s 1"
-macro Control_Shift_XK_Down "box shrink n 1"
-
-macro XK_Pointer_Button4 "scroll u .05 w"
-macro XK_Pointer_Button5 "scroll d .05 w"
-macro . "history redo -1"
-
-macro XK_L "select less area {ndif pdif nwell poly}"
-macro XK_K "select less area nwell"
-macro XK_J "select less area {m1 lic}"
-macro XK_H "select less area li1"
-macro Control_Shift_XK_X "rotate"
-macro Shift_XK_Pointer_Button4 "stretch N 74"
-macro Shift_XK_Pointer_Button5 "stretch S 74"
-macro Control_XK_Pointer_Button4 "stretch N 34"
-macro Control_XK_Pointer_Button5 "stretch S 34"
-macro Control_Shift_XK_Q "stretch W 88"
-macro Control_Shift_XK_R "stretch E 88"
-macro Control_Shift_XK_W "stretch N 28"
-macro Control_Shift_XK_E "stretch N 4"
-macro XK_Y "stretch N 6"
-#macro Control_Shift_XK_W "stretch S 6"
-#macro Control_Shift_XK_E "stretch S 8"
-
-macro Control_Shift_XK_Pointer_Button4 "stretch N 17"
-macro Control_Shift_XK_Pointer_Button5 "stretch S 17"
-macro Control_Shift_XK_G "select area {m1 lic}"
-macro Control_Shift_XK_F "select area {poly polycont}"
-macro Control_Shift_XK_D "select area {ndc li1}"
-macro Control_Shift_XK_S "select area ntrans"
-
-macro Shift_D "select clear; move S 10; paint m1c"
-macro Shift_F "select clear; move N 10; paint m1c"
-
-
-macro Shift_B "box height 1.0um; move S 1.655um; select area; erase; select clear; move N 1um; select area; move S 1um; select clear; box height 0.26um; move S 4.35um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.26um; select clear; box height 20um; select area; move S 0.26um"
-
-
-macro Shift_N "box height 1.74um; move S 2.395um; select area; erase; select clear; move N 1.74um; select area; move S 1.74um; select clear; box height 0.48um; move S 3.61um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.48um; select clear; box height 20um; select area; move S 0.48um"
-
-
-macro Shift_M "box height 1.02um; move S 2.015um; select area; erase; select clear; move N 1.02um; box height 1.20um; select area; move S 1.02um; select clear; box height 0.12um; move S 0.56um; select area; erase; select clear; box height 5.00um; select area; move S 0.12um; select clear; move N 0.12um; box height 0.21um; move S 2.98um; select area;erase; select clear; box height 1.105um; move S 1.105um; select area; move N 0.21um; select clear; box height 0.17um; move N 0.825um; select area; erase; move S 0.825um; box height 0.825um; select area; move N 0.17um"
diff --git a/15T_ls/sky130_osu_sc_15T_ls__addf_1.mag b/15T_ls/sky130_osu_sc_15T_ls__addf_1.mag
deleted file mode 100644
index f9a81d0..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__addf_1.mag
+++ /dev/null
@@ -1,651 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864544
-<< checkpaint >>
-rect -1269 -242 2695 2379
-rect -1209 -1243 2569 -242
-<< nwell >>
-rect -9 529 1435 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 1408 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 1003 1089
-rect 1037 1049 1139 1089
-rect 1173 1049 1275 1089
-rect 1309 1049 1408 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 729 155 745
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 1003 1083 1037 1089
-rect 1003 1055 1037 1083
-rect 1139 1083 1173 1089
-rect 1139 1055 1173 1083
-rect 1275 1083 1309 1089
-rect 1275 1055 1309 1083
-rect 80 449 114 483
-rect 248 375 282 409
-rect 80 301 114 335
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1089 1408 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 1003 1089
-rect 1037 1055 1139 1089
-rect 1173 1055 1275 1089
-rect 1309 1055 1408 1089
-rect 0 1049 1408 1055
-rect 1131 632 1189 638
-rect 1109 598 1143 632
-rect 1177 598 1189 632
-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 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel viali 97 318 97 318 1 A
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__addf_l.mag b/15T_ls/sky130_osu_sc_15T_ls__addf_l.mag
deleted file mode 100644
index a4b9578..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__addf_l.mag
+++ /dev/null
@@ -1,653 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864544
-<< checkpaint >>
-rect -1269 -242 2695 2379
-rect -1209 -1243 2569 -242
-<< nwell >>
-rect -9 529 1435 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 1408 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 1003 1089
-rect 1037 1049 1139 1089
-rect 1173 1049 1275 1089
-rect 1309 1049 1408 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 729 155 745
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 1003 1083 1037 1089
-rect 1003 1055 1037 1083
-rect 1139 1083 1173 1089
-rect 1139 1055 1173 1083
-rect 1275 1083 1309 1089
-rect 1275 1055 1309 1083
-rect 80 449 114 483
-rect 248 375 282 409
-rect 80 301 114 335
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1089 1408 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 1003 1089
-rect 1037 1055 1139 1089
-rect 1173 1055 1275 1089
-rect 1309 1055 1408 1089
-rect 0 1049 1408 1055
-rect 1131 638 1189 644
-rect 1109 604 1143 638
-rect 1177 604 1189 638
-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 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel viali 97 318 97 318 1 A
-port 1 n
-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 1228 244 1228 244 1 CON
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__addh_1.mag b/15T_ls/sky130_osu_sc_15T_ls__addh_1.mag
deleted file mode 100644
index 55b89b8..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__addh_1.mag
+++ /dev/null
@@ -1,394 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864545
-<< checkpaint >>
-rect -1269 -242 2097 2379
-rect -1209 -1243 2025 -242
-<< nwell >>
-rect -9 529 837 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 836 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 836 1089
-rect 35 949 69 965
-rect 35 575 69 597
-rect 133 949 167 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 35 609 69 631
-rect 35 597 69 609
-rect 260 449 294 483
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1089 836 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 836 1089
-rect 0 1049 836 1055
-rect 23 631 81 637
-rect 23 597 35 631
-rect 69 597 81 631
-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 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 425 50 425 1 S
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__addh_l.mag b/15T_ls/sky130_osu_sc_15T_ls__addh_l.mag
deleted file mode 100644
index 4386a18..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__addh_l.mag
+++ /dev/null
@@ -1,398 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864545
-<< checkpaint >>
-rect -1269 -242 2097 2379
-rect -1209 -1243 2025 -242
-<< nwell >>
-rect -9 529 837 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 836 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 836 1089
-rect 35 949 69 965
-rect 35 631 69 745
-rect 133 949 167 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 35 597 69 631
-rect 260 449 294 483
-rect 164 375 198 409
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1089 836 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 836 1089
-rect 0 1049 836 1055
-rect 23 631 81 637
-rect 23 597 35 631
-rect 69 597 81 631
-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 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 425 50 425 1 S
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__and2_1.mag b/15T_ls/sky130_osu_sc_15T_ls__and2_1.mag
deleted file mode 100644
index 57a61ae..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__and2_1.mag
+++ /dev/null
@@ -1,187 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864545
-<< checkpaint >>
-rect -1269 -242 1634 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 374 1119
-<< nmos >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-<< pmoshvt >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 1049
-rect 35 729 69 745
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 37 597 71 631
-rect 173 523 207 557
-rect 293 449 327 483
-rect 293 233 327 261
-rect 293 227 327 233
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 105 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__and2_2.mag b/15T_ls/sky130_osu_sc_15T_ls__and2_2.mag
deleted file mode 100644
index 6e2bd12..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__and2_2.mag
+++ /dev/null
@@ -1,222 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864545
-<< checkpaint >>
-rect -1269 -242 1722 2379
-rect -1209 -1243 1617 -242
-<< nwell >>
-rect -9 529 462 1119
-<< nmos >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-rect 338 115 368 263
-<< pmoshvt >>
-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 1089 462 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 462 1089
-rect 35 949 69 1049
-rect 35 729 69 745
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 37 597 71 631
-rect 173 523 207 557
-rect 293 449 327 483
-rect 293 233 327 261
-rect 293 227 327 233
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 462 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 462 1089
-rect 0 1049 462 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 105 631
-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 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 191 540 191 540 1 B
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__and2_4.mag b/15T_ls/sky130_osu_sc_15T_ls__and2_4.mag
deleted file mode 100644
index 4bc77f8..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__and2_4.mag
+++ /dev/null
@@ -1,285 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864545
-<< checkpaint >>
-rect -1269 -242 1898 2379
-rect -1209 -1243 1753 -242
-<< nwell >>
-rect -9 529 638 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 638 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 638 1089
-rect 35 949 69 1049
-rect 35 729 69 745
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 37 597 71 631
-rect 173 523 207 557
-rect 293 449 327 483
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 638 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 638 1089
-rect 0 1049 638 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 105 631
-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 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__and2_6.mag b/15T_ls/sky130_osu_sc_15T_ls__and2_6.mag
deleted file mode 100644
index a465aed..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__and2_6.mag
+++ /dev/null
@@ -1,314 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604007749
-<< checkpaint >>
-rect -1269 -242 2074 2379
-rect -1260 -1260 1261 -242
-<< nwell >>
-rect -9 529 814 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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_ls/sky130_osu_sc_15T_ls__and2_8.mag b/15T_ls/sky130_osu_sc_15T_ls__and2_8.mag
deleted file mode 100644
index a5e11b8..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__and2_8.mag
+++ /dev/null
@@ -1,427 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864546
-<< checkpaint >>
-rect -1269 -242 2250 2379
-rect -1209 -1243 2161 -242
-<< nwell >>
-rect -9 529 990 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 990 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 990 1089
-rect 35 949 69 1049
-rect 35 729 69 745
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 37 597 71 631
-rect 173 523 207 557
-rect 293 449 327 483
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1089 990 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 990 1089
-rect 0 1049 990 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 105 631
-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 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel viali 191 540 191 540 1 B
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__and2_l.mag b/15T_ls/sky130_osu_sc_15T_ls__and2_l.mag
deleted file mode 100644
index 6d46506..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__and2_l.mag
+++ /dev/null
@@ -1,187 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864546
-<< checkpaint >>
-rect -1269 -242 1634 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 374 1119
-<< nmos >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 252 115 282 219
-<< pmoshvt >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 1049
-rect 121 949 155 965
-rect 35 797 69 813
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 37 597 71 631
-rect 173 523 207 557
-rect 293 449 327 483
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 105 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__ant.mag b/15T_ls/sky130_osu_sc_15T_ls__ant.mag
deleted file mode 100644
index 49e2533..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__ant.mag
+++ /dev/null
@@ -1,102 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864546
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< nwell >>
-rect -9 529 199 1119
-<< nmos >>
-rect 80 115 110 263
-<< pmoshvt >>
-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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 965
-rect 35 483 69 605
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 47 449 81 483
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 35 483 108 489
-rect 35 449 47 483
-rect 81 449 108 483
-rect 35 443 108 449
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 466 64 466 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__antfill.mag b/15T_ls/sky130_osu_sc_15T_ls__antfill.mag
deleted file mode 100644
index 1f34f32..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__antfill.mag
+++ /dev/null
@@ -1,59 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864546
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< 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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 483 69 965
-rect 121 589 155 1049
-rect 31 449 47 483
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 47 449 81 483
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 35 483 108 489
-rect 35 449 47 483
-rect 81 449 108 483
-rect 35 443 108 449
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 466 64 466 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__aoi21_l.mag b/15T_ls/sky130_osu_sc_15T_ls__aoi21_l.mag
deleted file mode 100644
index aa18df1..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__aoi21_l.mag
+++ /dev/null
@@ -1,198 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864547
-<< checkpaint >>
-rect -1269 -242 1634 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 374 1119
-<< nmos >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 250 115 280 219
-<< pmoshvt >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 797 155 813
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 60 597 94 631
-rect 128 523 162 557
-rect 216 449 250 483
-rect 293 375 327 409
-rect 193 233 227 261
-rect 193 227 227 233
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 48 631 106 637
-rect 48 597 60 631
-rect 94 597 128 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel viali 77 614 77 614 1 A0
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__aoi22_l.mag b/15T_ls/sky130_osu_sc_15T_ls__aoi22_l.mag
deleted file mode 100644
index 8b609b9..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__aoi22_l.mag
+++ /dev/null
@@ -1,240 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864547
-<< checkpaint >>
-rect -1269 -242 1722 2379
-rect -1209 -1243 1617 -242
-<< nwell >>
-rect -9 529 462 1119
-<< nmos >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-rect 324 115 354 263
-<< pmoshvt >>
-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 1089 462 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 462 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 763 155 779
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 60 597 94 631
-rect 128 523 162 557
-rect 216 449 250 483
-rect 370 376 404 410
-rect 302 301 336 335
-rect 200 233 234 261
-rect 200 227 234 233
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 462 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 462 1089
-rect 0 1049 462 1055
-rect 48 631 106 637
-rect 48 597 60 631
-rect 94 597 128 631
-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 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 77 614 77 614 1 A0
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__buf_1.mag b/15T_ls/sky130_osu_sc_15T_ls__buf_1.mag
deleted file mode 100644
index 9817cfc..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__buf_1.mag
+++ /dev/null
@@ -1,157 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864547
-<< checkpaint >>
-rect -1269 -242 1548 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 288 1119
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-<< pmoshvt >>
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 729 155 745
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 110 597 144 631
-rect 207 523 241 557
-rect 207 233 241 261
-rect 207 227 241 233
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 98 631 156 637
-rect 64 597 110 631
-rect 144 597 156 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 213 403 213 403 1 Y
-port 2 n
-rlabel viali 127 614 127 614 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__buf_2.mag b/15T_ls/sky130_osu_sc_15T_ls__buf_2.mag
deleted file mode 100644
index e8c0059..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__buf_2.mag
+++ /dev/null
@@ -1,179 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864547
-<< checkpaint >>
-rect -1269 2461 1636 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1636 -1129
-<< nwell >>
-rect -9 529 376 1119
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-<< pmoshvt >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 725 155 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 110 597 144 631
-rect 207 523 241 557
-rect 207 227 241 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 98 631 156 637
-rect 64 597 110 631
-rect 144 597 156 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel viali 127 614 127 614 1 A
-port 1 n
-rlabel metal1 211 402 211 402 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__buf_4.mag b/15T_ls/sky130_osu_sc_15T_ls__buf_4.mag
deleted file mode 100644
index 0e3cc6d..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__buf_4.mag
+++ /dev/null
@@ -1,244 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864547
-<< checkpaint >>
-rect -1269 2461 1812 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1812 -1129
-<< nwell >>
-rect -9 529 552 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 550 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 550 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 725 155 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 110 597 144 631
-rect 207 523 241 557
-rect 379 523 413 557
-rect 207 227 241 261
-rect 379 227 413 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 550 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 550 1089
-rect 0 1049 550 1055
-rect 98 631 156 637
-rect 64 597 110 631
-rect 144 597 156 631
-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 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel viali 127 614 127 614 1 A
-port 1 n
-rlabel metal1 211 402 211 402 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__buf_6.mag b/15T_ls/sky130_osu_sc_15T_ls__buf_6.mag
deleted file mode 100644
index 58e6525..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__buf_6.mag
+++ /dev/null
@@ -1,286 +0,0 @@
-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
-<< nmos >>
-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
-<< pmoshvt >>
-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_ls/sky130_osu_sc_15T_ls__buf_8.mag b/15T_ls/sky130_osu_sc_15T_ls__buf_8.mag
deleted file mode 100644
index 1482c49..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__buf_8.mag
+++ /dev/null
@@ -1,383 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864548
-<< checkpaint >>
-rect -1269 2461 2164 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2164 -1129
-<< nwell >>
-rect -9 529 904 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 902 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 902 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 725 155 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 902 61
-rect 0 0 902 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 110 597 144 631
-rect 207 523 241 557
-rect 379 523 413 557
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1089 902 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 902 1089
-rect 0 1049 902 1055
-rect 98 631 156 637
-rect 64 597 110 631
-rect 144 597 156 631
-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 55 902 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 902 55
-rect 0 0 902 21
-<< labels >>
-rlabel viali 127 614 127 614 1 A
-port 1 n
-rlabel metal1 211 402 211 402 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__buf_l.mag b/15T_ls/sky130_osu_sc_15T_ls__buf_l.mag
deleted file mode 100644
index eed675f..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__buf_l.mag
+++ /dev/null
@@ -1,157 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864548
-<< checkpaint >>
-rect -1269 -242 1548 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 288 1119
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-<< pmoshvt >>
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 965
-rect 35 352 69 831
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 110 597 144 631
-rect 207 523 241 557
-rect 207 227 241 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 98 631 156 637
-rect 64 597 110 631
-rect 144 597 156 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel viali 127 614 127 614 1 A
-port 1 n
-rlabel metal1 214 400 214 400 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__decap_1.mag b/15T_ls/sky130_osu_sc_15T_ls__decap_1.mag
deleted file mode 100644
index 05abb9b..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__decap_1.mag
+++ /dev/null
@@ -1,84 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864548
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< nwell >>
-rect -9 529 199 1119
-<< nmos >>
-rect 80 115 110 367
-<< pmoshvt >>
-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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 729 69 745
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__decap_l.mag b/15T_ls/sky130_osu_sc_15T_ls__decap_l.mag
deleted file mode 100644
index 386cb37..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__decap_l.mag
+++ /dev/null
@@ -1,84 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864548
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< nwell >>
-rect -9 529 199 1119
-<< nmos >>
-rect 80 115 110 243
-<< pmoshvt >>
-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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 849 69 865
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__dff_1.mag b/15T_ls/sky130_osu_sc_15T_ls__dff_1.mag
deleted file mode 100644
index 8ea0d62..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__dff_1.mag
+++ /dev/null
@@ -1,635 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864548
-<< checkpaint >>
-rect -1269 -242 2716 2379
-rect -1209 -1243 2569 -242
-<< nwell >>
-rect -9 529 1456 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 1452 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 1003 1089
-rect 1037 1049 1139 1089
-rect 1173 1049 1275 1089
-rect 1309 1049 1452 1089
-rect 40 949 74 965
-rect 17 605 40 617
-rect 126 949 160 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 1003 1083 1037 1089
-rect 1003 1055 1037 1083
-rect 1139 1083 1173 1089
-rect 1139 1055 1173 1083
-rect 1275 1083 1309 1089
-rect 1275 1055 1309 1083
-rect 40 301 74 335
-rect 253 449 287 483
-rect 181 375 215 409
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1089 1452 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 1003 1089
-rect 1037 1055 1139 1089
-rect 1173 1055 1275 1089
-rect 1309 1055 1452 1089
-rect 0 1049 1452 1055
-rect 1366 631 1424 637
-rect 1343 597 1378 631
-rect 1412 597 1424 631
-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 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel viali 198 392 198 392 1 D
-port 1 n
-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 49 68 49 1 gnd
-rlabel viali 68 1063 68 1063 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__dff_l.mag b/15T_ls/sky130_osu_sc_15T_ls__dff_l.mag
deleted file mode 100644
index 1f6a58d..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__dff_l.mag
+++ /dev/null
@@ -1,636 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864549
-<< checkpaint >>
-rect -1269 -242 2716 2379
-rect -1209 -1243 2569 -242
-<< nwell >>
-rect -9 529 1456 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 1452 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 1003 1089
-rect 1037 1049 1139 1089
-rect 1173 1049 1275 1089
-rect 1309 1049 1452 1089
-rect 40 949 74 965
-rect 17 605 40 617
-rect 126 949 160 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 1003 1083 1037 1089
-rect 1003 1055 1037 1083
-rect 1139 1083 1173 1089
-rect 1139 1055 1173 1083
-rect 1275 1083 1309 1089
-rect 1275 1055 1309 1083
-rect 40 301 74 335
-rect 253 449 287 483
-rect 181 375 215 409
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1089 1452 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 1003 1089
-rect 1037 1055 1139 1089
-rect 1173 1055 1275 1089
-rect 1309 1055 1452 1089
-rect 0 1049 1452 1055
-rect 1365 631 1423 637
-rect 1343 597 1377 631
-rect 1411 597 1423 631
-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 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel viali 198 392 198 392 1 D
-port 1 n
-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 49 68 49 1 gnd
-rlabel viali 68 1063 68 1063 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__dffr_1.mag b/15T_ls/sky130_osu_sc_15T_ls__dffr_1.mag
deleted file mode 100644
index 3a4e9b5..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__dffr_1.mag
+++ /dev/null
@@ -1,809 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864549
-<< checkpaint >>
-rect -1270 -242 3177 2379
-rect -1210 -1243 3112 -242
-<< nwell >>
-rect -10 529 1917 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 1914 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1682 1089
-rect 1716 1049 1818 1089
-rect 1852 1049 1914 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 1682 1083 1716 1089
-rect 1682 1055 1716 1083
-rect 1818 1083 1852 1089
-rect 1818 1055 1852 1083
-rect 47 597 81 631
-rect 229 257 263 261
-rect 229 227 263 257
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 1089 1914 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1682 1089
-rect 1716 1055 1818 1089
-rect 1852 1055 1914 1089
-rect 0 1049 1914 1055
-rect 35 631 93 637
-rect 1826 631 1884 637
-rect 35 597 47 631
-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 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel viali 65 614 65 614 1 RN
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__dffr_l.mag b/15T_ls/sky130_osu_sc_15T_ls__dffr_l.mag
deleted file mode 100644
index f215f7a..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__dffr_l.mag
+++ /dev/null
@@ -1,809 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864549
-<< checkpaint >>
-rect -1270 -242 3177 2379
-rect -1210 -1243 3112 -242
-<< nwell >>
-rect -10 529 1917 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 1914 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1682 1089
-rect 1716 1049 1818 1089
-rect 1852 1049 1914 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 1682 1083 1716 1089
-rect 1682 1055 1716 1083
-rect 1818 1083 1852 1089
-rect 1818 1055 1852 1083
-rect 47 597 81 631
-rect 229 257 263 261
-rect 229 227 263 257
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 1089 1914 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1682 1089
-rect 1716 1055 1818 1089
-rect 1852 1055 1914 1089
-rect 0 1049 1914 1055
-rect 35 631 93 637
-rect 1826 631 1884 637
-rect 35 597 47 631
-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 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel viali 65 614 65 614 1 RN
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__dffs_1.mag b/15T_ls/sky130_osu_sc_15T_ls__dffs_1.mag
deleted file mode 100644
index cf3b5fd..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__dffs_1.mag
+++ /dev/null
@@ -1,724 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864549
-<< checkpaint >>
-rect -1270 -242 3001 2379
-rect -1210 -1243 2840 -242
-<< nwell >>
-rect -10 529 1741 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 1738 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1738 1089
-rect 35 949 69 1049
-rect 35 861 69 877
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 47 227 81 261
-rect 121 301 155 335
-rect 438 449 472 483
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 1089 1738 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1738 1089
-rect 0 1049 1738 1055
-rect 1636 631 1694 637
-rect 1614 597 1648 631
-rect 1682 597 1694 631
-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 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 392 383 392 1 D
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__dffs_l.mag b/15T_ls/sky130_osu_sc_15T_ls__dffs_l.mag
deleted file mode 100644
index aa37d4d..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__dffs_l.mag
+++ /dev/null
@@ -1,724 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864549
-<< checkpaint >>
-rect -1270 -242 3001 2379
-rect -1210 -1243 2840 -242
-<< nwell >>
-rect -10 529 1741 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 1738 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1738 1089
-rect 35 949 69 1049
-rect 35 861 69 877
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 47 227 81 261
-rect 121 301 155 335
-rect 438 449 472 483
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 1089 1738 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1738 1089
-rect 0 1049 1738 1055
-rect 1636 631 1694 637
-rect 1614 597 1648 631
-rect 1682 597 1694 631
-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 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 392 383 392 1 D
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__dffsr_1.mag b/15T_ls/sky130_osu_sc_15T_ls__dffsr_1.mag
deleted file mode 100644
index 3a747e6..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__dffsr_1.mag
+++ /dev/null
@@ -1,901 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864550
-<< checkpaint >>
-rect -1270 -242 3350 2379
-rect -1210 -1243 3248 -242
-<< nwell >>
-rect -10 529 2090 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 2090 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1682 1089
-rect 1716 1049 1818 1089
-rect 1852 1049 1954 1089
-rect 1988 1049 2090 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 1682 1083 1716 1089
-rect 1682 1055 1716 1083
-rect 1818 1083 1852 1089
-rect 1818 1055 1852 1083
-rect 1954 1083 1988 1089
-rect 1954 1055 1988 1083
-rect 47 597 81 631
-rect 325 523 359 557
-rect 325 301 359 335
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 1089 2090 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1682 1089
-rect 1716 1055 1818 1089
-rect 1852 1055 1954 1089
-rect 1988 1055 2090 1089
-rect 0 1049 2090 1055
-rect 35 631 93 637
-rect 1999 631 2057 637
-rect 35 597 47 631
-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 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel viali 659 392 659 392 1 D
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__dffsr_l.mag b/15T_ls/sky130_osu_sc_15T_ls__dffsr_l.mag
deleted file mode 100644
index acf3f24..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__dffsr_l.mag
+++ /dev/null
@@ -1,900 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864550
-<< checkpaint >>
-rect -1270 -242 3350 2379
-rect -1210 -1243 3248 -242
-<< nwell >>
-rect -10 529 2090 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 2090 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1682 1089
-rect 1716 1049 1818 1089
-rect 1852 1049 1954 1089
-rect 1988 1049 2090 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 1682 1083 1716 1089
-rect 1682 1055 1716 1083
-rect 1818 1083 1852 1089
-rect 1818 1055 1852 1083
-rect 1954 1083 1988 1089
-rect 1954 1055 1988 1083
-rect 47 597 81 631
-rect 325 523 359 557
-rect 325 301 359 335
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 1089 2090 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1682 1089
-rect 1716 1055 1818 1089
-rect 1852 1055 1954 1089
-rect 1988 1055 2090 1089
-rect 0 1049 2090 1055
-rect 35 631 93 637
-rect 1998 631 2056 637
-rect 35 597 47 631
-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 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel viali 659 392 659 392 1 D
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__fill_1.mag b/15T_ls/sky130_osu_sc_15T_ls__fill_1.mag
deleted file mode 100644
index 8d445b8..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__fill_1.mag
+++ /dev/null
@@ -1,24 +0,0 @@
-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_ls/sky130_osu_sc_15T_ls__fill_16.mag b/15T_ls/sky130_osu_sc_15T_ls__fill_16.mag
deleted file mode 100644
index 83c32da..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__fill_16.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-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_ls/sky130_osu_sc_15T_ls__fill_2.mag b/15T_ls/sky130_osu_sc_15T_ls__fill_2.mag
deleted file mode 100644
index bde58ab..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__fill_2.mag
+++ /dev/null
@@ -1,24 +0,0 @@
-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_ls/sky130_osu_sc_15T_ls__fill_32.mag b/15T_ls/sky130_osu_sc_15T_ls__fill_32.mag
deleted file mode 100644
index 4cf67de..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__fill_32.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-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_ls/sky130_osu_sc_15T_ls__fill_4.mag b/15T_ls/sky130_osu_sc_15T_ls__fill_4.mag
deleted file mode 100644
index 8b2fb75..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__fill_4.mag
+++ /dev/null
@@ -1,22 +0,0 @@
-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_ls/sky130_osu_sc_15T_ls__fill_8.mag b/15T_ls/sky130_osu_sc_15T_ls__fill_8.mag
deleted file mode 100644
index 2d49aaa..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__fill_8.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-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_ls/sky130_osu_sc_15T_ls__inv_1.mag b/15T_ls/sky130_osu_sc_15T_ls__inv_1.mag
deleted file mode 100644
index f6e552e..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__inv_1.mag
+++ /dev/null
@@ -1,115 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864551
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 529 199 1119
-<< nmos >>
-rect 80 115 110 263
-<< pmoshvt >>
-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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 121 227 155 261
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 151 389 151 389 1 Y
-port 1 n
-rlabel viali 64 614 64 614 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__inv_10.mag b/15T_ls/sky130_osu_sc_15T_ls__inv_10.mag
deleted file mode 100644
index 26acad6..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__inv_10.mag
+++ /dev/null
@@ -1,420 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864551
-<< checkpaint >>
-rect -1269 2461 2250 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2250 -1129
-<< nwell >>
-rect -9 529 990 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 990 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 990 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 293 523 327 557
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1089 990 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 990 1089
-rect 0 1049 990 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 152 388 152 388 1 Y
-port 1 n
-rlabel viali 64 613 64 613 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__inv_2.mag b/15T_ls/sky130_osu_sc_15T_ls__inv_2.mag
deleted file mode 100644
index 9639bd9..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__inv_2.mag
+++ /dev/null
@@ -1,153 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864551
-<< checkpaint >>
-rect -1269 2461 1547 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1547 -1129
-<< nwell >>
-rect -9 529 287 1119
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-<< pmoshvt >>
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 121 227 155 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 152 388 152 388 1 Y
-port 1 n
-rlabel viali 64 613 64 613 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__inv_3.mag b/15T_ls/sky130_osu_sc_15T_ls__inv_3.mag
deleted file mode 100644
index ee4c0a2..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__inv_3.mag
+++ /dev/null
@@ -1,182 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864552
-<< checkpaint >>
-rect -1269 2461 1635 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1635 -1129
-<< nwell >>
-rect -9 529 375 1119
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-<< pmoshvt >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 293 523 327 557
-rect 121 227 155 261
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 152 388 152 388 1 Y
-port 1 n
-rlabel viali 64 613 64 613 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__inv_4.mag b/15T_ls/sky130_osu_sc_15T_ls__inv_4.mag
deleted file mode 100644
index 29d5255..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__inv_4.mag
+++ /dev/null
@@ -1,216 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864552
-<< checkpaint >>
-rect -1269 2461 1723 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1723 -1129
-<< nwell >>
-rect -9 529 463 1119
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-<< pmoshvt >>
-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 1089 462 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 462 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 293 523 327 557
-rect 121 227 155 261
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 462 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 462 1089
-rect 0 1049 462 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 64 613 64 613 1 A
-port 1 n
-rlabel metal1 152 388 152 388 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__inv_6.mag b/15T_ls/sky130_osu_sc_15T_ls__inv_6.mag
deleted file mode 100644
index 65269a0..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__inv_6.mag
+++ /dev/null
@@ -1,280 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864552
-<< checkpaint >>
-rect -1269 2461 1899 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1899 -1129
-<< nwell >>
-rect -9 529 639 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 638 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 638 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 293 523 327 557
-rect 465 523 499 557
-rect 121 227 155 261
-rect 293 227 327 261
-rect 465 227 499 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 638 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 638 1089
-rect 0 1049 638 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 64 613 64 613 1 A
-port 1 n
-rlabel metal1 152 388 152 388 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__inv_8.mag b/15T_ls/sky130_osu_sc_15T_ls__inv_8.mag
deleted file mode 100644
index ff1bf0a..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__inv_8.mag
+++ /dev/null
@@ -1,343 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864552
-<< checkpaint >>
-rect -1269 2461 2074 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2074 -1129
-<< nwell >>
-rect -9 529 814 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 814 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 814 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 814 61
-rect 0 0 814 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 293 523 327 557
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-<< metal1 >>
-rect 0 1089 814 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 814 1089
-rect 0 1049 814 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 814 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 814 55
-rect 0 0 814 21
-<< labels >>
-rlabel metal1 152 388 152 388 1 Y
-port 1 n
-rlabel viali 64 613 64 613 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__inv_l.mag b/15T_ls/sky130_osu_sc_15T_ls__inv_l.mag
deleted file mode 100644
index 2d89936..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__inv_l.mag
+++ /dev/null
@@ -1,114 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864552
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< nwell >>
-rect -9 529 199 1119
-<< nmos >>
-rect 80 115 110 219
-<< pmoshvt >>
-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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 861 69 877
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 121 227 155 261
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 614 64 614 1 A
-port 1 n
-rlabel metal1 151 389 151 389 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__mux2_1.mag b/15T_ls/sky130_osu_sc_15T_ls__mux2_1.mag
deleted file mode 100644
index 96a931b..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__mux2_1.mag
+++ /dev/null
@@ -1,227 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864553
-<< checkpaint >>
-rect -1269 2461 1813 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1813 -1129
-<< nwell >>
-rect -9 529 553 1119
-<< nmos >>
-rect 80 115 110 263
-rect 270 115 300 263
-rect 356 115 386 263
-<< pmoshvt >>
-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 1089 550 1110
-rect 0 1049 459 1089
-rect 493 1049 550 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 37 597 71 631
-rect 236 523 270 557
-rect 311 375 345 409
-rect 397 449 431 483
-rect 311 227 345 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 550 1110
-rect 0 1055 459 1089
-rect 493 1055 550 1089
-rect 0 1049 550 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 117 631
-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 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel viali 54 614 54 614 1 S0
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 476 1062 476 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__nand2_1.mag b/15T_ls/sky130_osu_sc_15T_ls__nand2_1.mag
deleted file mode 100644
index b9a5194..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__nand2_1.mag
+++ /dev/null
@@ -1,157 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864553
-<< checkpaint >>
-rect -1269 2461 1546 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1546 -1129
-<< nwell >>
-rect -9 529 286 1119
-<< nmos >>
-rect 80 115 110 263
-rect 152 115 182 263
-<< pmoshvt >>
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 47 597 81 631
-rect 121 449 155 483
-rect 195 523 229 557
-rect 35 227 69 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 115 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 418 136 418 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__nand2_l.mag b/15T_ls/sky130_osu_sc_15T_ls__nand2_l.mag
deleted file mode 100644
index 8eb6018..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__nand2_l.mag
+++ /dev/null
@@ -1,156 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864553
-<< checkpaint >>
-rect -1269 -242 1546 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 286 1119
-<< nmos >>
-rect 80 115 110 219
-rect 152 115 182 219
-<< pmoshvt >>
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 1049
-rect 35 861 69 877
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 47 597 81 631
-rect 121 449 155 483
-rect 195 523 229 557
-rect 35 227 69 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 115 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 418 136 418 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__nor2_1.mag b/15T_ls/sky130_osu_sc_15T_ls__nor2_1.mag
deleted file mode 100644
index b961123..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__nor2_1.mag
+++ /dev/null
@@ -1,157 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864553
-<< checkpaint >>
-rect -1269 2461 1546 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1546 -1129
-<< nwell >>
-rect -9 529 286 1119
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-<< pmoshvt >>
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 965
-rect 193 949 227 1049
-rect 193 725 227 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 181 597 215 631
-rect 35 449 69 483
-rect 113 523 147 557
-rect 121 227 155 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 169 631 227 637
-rect 148 597 181 631
-rect 215 597 227 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 137 341 137 341 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__nor2_l.mag b/15T_ls/sky130_osu_sc_15T_ls__nor2_l.mag
deleted file mode 100644
index 84a183b..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__nor2_l.mag
+++ /dev/null
@@ -1,156 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864553
-<< checkpaint >>
-rect -1269 -242 1546 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 286 1119
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-<< pmoshvt >>
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 965
-rect 35 483 69 809
-rect 193 949 227 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 181 597 215 631
-rect 35 449 69 483
-rect 113 523 147 557
-rect 121 227 155 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 169 631 227 637
-rect 148 597 181 631
-rect 215 597 227 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 137 341 137 341 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__oai21_l.mag b/15T_ls/sky130_osu_sc_15T_ls__oai21_l.mag
deleted file mode 100644
index 10795d1..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__oai21_l.mag
+++ /dev/null
@@ -1,195 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864554
-<< checkpaint >>
-rect -1269 -242 1634 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 374 1119
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-<< pmoshvt >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 193 949 227 1049
-rect 193 793 227 809
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 66 597 100 631
-rect 162 523 196 557
-rect 223 449 257 483
-rect 291 375 325 409
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 54 631 112 637
-rect 54 597 66 631
-rect 100 597 134 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel viali 83 614 83 614 1 A0
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__oai22_l.mag b/15T_ls/sky130_osu_sc_15T_ls__oai22_l.mag
deleted file mode 100644
index 1320af1..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__oai22_l.mag
+++ /dev/null
@@ -1,240 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864554
-<< checkpaint >>
-rect -1269 -242 1722 2379
-rect -1209 -1243 1617 -242
-<< nwell >>
-rect -9 529 462 1119
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-<< pmoshvt >>
-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 1089 462 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 462 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 200 949 234 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 66 597 100 631
-rect 162 523 196 557
-rect 223 449 257 483
-rect 384 376 418 410
-rect 316 301 350 335
-rect 316 227 350 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 462 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 462 1089
-rect 0 1049 462 1055
-rect 54 631 112 637
-rect 54 597 66 631
-rect 100 597 134 631
-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 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 240 466 240 466 1 B0
-port 4 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__or2_1.mag b/15T_ls/sky130_osu_sc_15T_ls__or2_1.mag
deleted file mode 100644
index 30c4fc8..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__or2_1.mag
+++ /dev/null
@@ -1,188 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864554
-<< checkpaint >>
-rect -1269 2461 1634 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1634 -1129
-<< nwell >>
-rect -9 529 374 1119
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-<< pmoshvt >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 207 949 241 1049
-rect 207 725 241 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 37 523 71 557
-rect 173 597 207 631
-rect 293 449 327 483
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 161 631 219 637
-rect 140 597 173 631
-rect 207 597 219 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__or2_2.mag b/15T_ls/sky130_osu_sc_15T_ls__or2_2.mag
deleted file mode 100644
index 9d47135..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__or2_2.mag
+++ /dev/null
@@ -1,223 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864554
-<< checkpaint >>
-rect -1269 2461 1722 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1722 -1129
-<< nwell >>
-rect -9 529 462 1119
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-<< pmoshvt >>
-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 1089 462 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 462 1089
-rect 35 949 69 965
-rect 207 949 241 1049
-rect 207 725 241 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 37 523 71 557
-rect 173 597 207 631
-rect 293 449 327 483
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 462 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 462 1089
-rect 0 1049 462 1055
-rect 161 631 219 637
-rect 140 597 173 631
-rect 207 597 219 631
-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 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__or2_4.mag b/15T_ls/sky130_osu_sc_15T_ls__or2_4.mag
deleted file mode 100644
index fe61887..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__or2_4.mag
+++ /dev/null
@@ -1,286 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864554
-<< checkpaint >>
-rect -1269 2461 1898 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1898 -1129
-<< nwell >>
-rect -9 529 638 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 638 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 638 1089
-rect 35 949 69 965
-rect 207 949 241 1049
-rect 207 725 241 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 37 523 71 557
-rect 173 597 207 631
-rect 293 449 327 483
-rect 465 449 499 483
-rect 293 227 327 261
-rect 465 227 499 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 638 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 638 1089
-rect 0 1049 638 1055
-rect 161 631 219 637
-rect 140 597 173 631
-rect 207 597 219 631
-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 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__or2_8.mag b/15T_ls/sky130_osu_sc_15T_ls__or2_8.mag
deleted file mode 100644
index 2b1f2a0..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__or2_8.mag
+++ /dev/null
@@ -1,428 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864554
-<< checkpaint >>
-rect -1269 2461 2250 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2250 -1129
-<< nwell >>
-rect -9 529 990 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 990 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 990 1089
-rect 35 949 69 965
-rect 207 949 241 1049
-rect 207 725 241 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 37 523 71 557
-rect 173 597 207 631
-rect 293 449 327 483
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1089 990 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 990 1089
-rect 0 1049 990 1055
-rect 161 631 219 637
-rect 140 597 173 631
-rect 207 597 219 631
-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 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__or2_l.mag b/15T_ls/sky130_osu_sc_15T_ls__or2_l.mag
deleted file mode 100644
index 583463c..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__or2_l.mag
+++ /dev/null
@@ -1,187 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864555
-<< checkpaint >>
-rect -1269 -242 1634 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 374 1119
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
-<< pmoshvt >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 35 691 69 877
-rect 207 949 241 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 37 523 71 557
-rect 173 597 207 631
-rect 293 449 327 483
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 161 631 219 637
-rect 140 597 173 631
-rect 207 597 219 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__tbufi_1.mag b/15T_ls/sky130_osu_sc_15T_ls__tbufi_1.mag
deleted file mode 100644
index cee6512..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__tbufi_1.mag
+++ /dev/null
@@ -1,187 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864555
-<< checkpaint >>
-rect -1269 2461 1635 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1635 -1129
-<< nwell >>
-rect -9 529 375 1119
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
-<< pmoshvt >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 657 155 673
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 211 597 245 631
-rect 279 449 313 483
-rect 121 301 155 335
-rect 279 227 313 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 199 631 257 637
-rect 177 597 211 631
-rect 245 597 257 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 312 305 312 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__tbufi_l.mag b/15T_ls/sky130_osu_sc_15T_ls__tbufi_l.mag
deleted file mode 100644
index e7cc112..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__tbufi_l.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864555
-<< checkpaint >>
-rect -1269 -242 1635 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 375 1119
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 238 115 268 219
-<< pmoshvt >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 35 461 69 809
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 211 597 245 631
-rect 279 449 313 483
-rect 121 301 155 335
-rect 279 227 313 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 199 631 257 637
-rect 177 597 211 631
-rect 245 597 257 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 312 305 312 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__tiehi.mag b/15T_ls/sky130_osu_sc_15T_ls__tiehi.mag
deleted file mode 100644
index e6e1b46..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__tiehi.mag
+++ /dev/null
@@ -1,100 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864555
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< nwell >>
-rect -9 529 199 1119
-<< nmos >>
-rect 80 115 110 263
-<< pmoshvt >>
-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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 589 69 605
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 121 523 155 557
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 94 557 167 563
-rect 94 523 121 557
-rect 155 523 167 557
-rect 94 517 167 523
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 138 540 138 540 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__tielo.mag b/15T_ls/sky130_osu_sc_15T_ls__tielo.mag
deleted file mode 100644
index 6284f45..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__tielo.mag
+++ /dev/null
@@ -1,101 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864555
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 529 199 1119
-<< nmos >>
-rect 80 115 110 263
-<< pmoshvt >>
-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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 589 69 605
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 121 301 155 335
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 94 335 167 341
-rect 94 301 121 335
-rect 155 301 167 335
-rect 94 295 167 301
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 138 318 138 318 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__tnbufi_1.mag b/15T_ls/sky130_osu_sc_15T_ls__tnbufi_1.mag
deleted file mode 100644
index ff723d9..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__tnbufi_1.mag
+++ /dev/null
@@ -1,182 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864556
-<< checkpaint >>
-rect -1269 2461 1635 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1635 -1129
-<< nwell >>
-rect -9 529 375 1119
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
-<< pmoshvt >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 657 155 673
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 211 597 245 631
-rect 121 523 155 557
-rect 279 449 313 483
-rect 279 227 313 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 199 631 257 637
-rect 177 597 211 631
-rect 245 597 257 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 312 305 312 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__tnbufi_l.mag b/15T_ls/sky130_osu_sc_15T_ls__tnbufi_l.mag
deleted file mode 100644
index e4a243c..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__tnbufi_l.mag
+++ /dev/null
@@ -1,181 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864556
-<< checkpaint >>
-rect -1269 -242 1635 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 375 1119
-<< nmos >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 238 115 268 219
-<< pmoshvt >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 35 400 69 809
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 211 597 245 631
-rect 121 523 155 557
-rect 279 449 313 483
-rect 279 227 313 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 199 631 257 637
-rect 177 597 211 631
-rect 245 597 257 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 312 305 312 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__xnor2_l.mag b/15T_ls/sky130_osu_sc_15T_ls__xnor2_l.mag
deleted file mode 100644
index 260bd7b..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__xnor2_l.mag
+++ /dev/null
@@ -1,292 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864556
-<< checkpaint >>
-rect -1269 -242 1898 2379
-rect -1209 -1243 1753 -242
-<< nwell >>
-rect -9 529 638 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 1089 638 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 638 1089
-rect 35 949 69 965
-rect 35 443 69 605
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 268 605 279 631
-rect 279 605 302 631
-rect 268 597 302 605
-rect 152 227 186 261
-rect 268 301 302 335
-rect 489 301 523 335
-rect 412 227 446 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 638 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 638 1089
-rect 0 1049 638 1055
-rect 256 631 314 637
-rect 256 597 268 631
-rect 302 597 314 631
-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 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 170 244 170 244 1 A
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ls/sky130_osu_sc_15T_ls__xor2_l.mag b/15T_ls/sky130_osu_sc_15T_ls__xor2_l.mag
deleted file mode 100644
index 6aff882..0000000
--- a/15T_ls/sky130_osu_sc_15T_ls__xor2_l.mag
+++ /dev/null
@@ -1,291 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864556
-<< checkpaint >>
-rect -1269 -242 1898 2379
-rect -1209 -1243 1753 -242
-<< nwell >>
-rect -9 529 638 1119
-<< nmos >>
-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
-<< pmoshvt >>
-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 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 358 263
-rect 268 131 279 215
-rect 347 131 358 215
-rect 268 115 358 131
-rect 388 115 430 263
-rect 460 215 516 263
-rect 460 131 471 215
-rect 505 131 516 215
-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 741 121 949
-rect 155 741 166 949
-rect 110 565 166 741
-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 741 471 949
-rect 505 741 516 949
-rect 460 565 516 741
-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 215
-rect 279 131 347 215
-rect 471 131 505 215
-rect 557 131 591 215
-<< pdiffc >>
-rect 35 605 69 949
-rect 121 741 155 949
-rect 279 605 347 949
-rect 471 741 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 166 550 196 565
-rect 70 520 196 550
-rect 70 303 100 520
-rect 142 518 196 520
-rect 142 484 152 518
-rect 186 484 196 518
-rect 142 468 196 484
-rect 142 410 196 426
-rect 142 376 152 410
-rect 186 376 196 410
-rect 142 360 196 376
-rect 70 278 110 303
-rect 80 263 110 278
-rect 166 263 196 360
-rect 238 351 268 565
-rect 358 534 388 565
-rect 334 518 388 534
-rect 430 550 460 565
-rect 516 550 546 565
-rect 430 520 546 550
-rect 334 484 344 518
-rect 378 484 388 518
-rect 334 468 388 484
-rect 479 518 546 520
-rect 479 484 489 518
-rect 523 484 546 518
-rect 479 468 546 484
-rect 420 409 474 425
-rect 420 380 430 409
-rect 358 375 430 380
-rect 464 375 474 409
-rect 238 335 292 351
-rect 238 301 248 335
-rect 282 301 292 335
-rect 238 285 292 301
-rect 358 350 474 375
-rect 238 263 268 285
-rect 358 263 388 350
-rect 516 308 546 468
-rect 430 278 546 308
-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 484 186 518
-rect 152 376 186 410
-rect 344 484 378 518
-rect 489 484 523 518
-rect 430 375 464 409
-rect 248 301 282 335
-<< locali >>
-rect 0 1089 638 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 638 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 725 155 741
-rect 279 949 347 965
-rect 35 410 69 605
-rect 152 597 200 631
-rect 268 605 279 623
-rect 471 949 505 1049
-rect 471 725 505 741
-rect 557 949 591 965
-rect 152 518 186 597
-rect 268 589 347 605
-rect 136 484 152 518
-rect 186 484 202 518
-rect 268 483 302 589
-rect 344 518 378 534
-rect 344 410 378 484
-rect 35 376 152 410
-rect 186 376 378 410
-rect 412 409 446 597
-rect 489 518 523 523
-rect 489 468 523 484
-rect 35 215 69 376
-rect 412 375 430 409
-rect 464 375 480 409
-rect 557 335 591 606
-rect 232 301 248 335
-rect 282 301 591 335
-rect 35 115 69 131
-rect 121 215 155 231
-rect 121 61 155 131
-rect 279 227 296 231
-rect 330 227 347 231
-rect 279 215 347 227
-rect 279 115 347 131
-rect 471 215 505 231
-rect 471 61 505 131
-rect 557 215 591 301
-rect 557 115 591 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 200 597 234 631
-rect 412 597 446 631
-rect 268 449 302 483
-rect 489 523 523 557
-rect 296 227 330 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 638 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 638 1089
-rect 0 1049 638 1055
-rect 188 631 246 637
-rect 400 631 458 637
-rect 188 597 200 631
-rect 234 597 412 631
-rect 446 597 458 631
-rect 188 591 246 597
-rect 400 591 458 597
-rect 477 557 535 563
-rect 455 523 489 557
-rect 523 523 535 557
-rect 477 517 535 523
-rect 256 483 314 489
-rect 256 449 268 483
-rect 302 449 314 483
-rect 256 443 314 449
-rect 268 267 302 443
-rect 268 261 342 267
-rect 268 227 296 261
-rect 330 227 342 261
-rect 284 221 342 227
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 218 614 218 614 1 A
-port 1 n
-rlabel metal1 285 434 285 434 1 Y
-port 2 n
-rlabel viali 506 540 506 540 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/.magicrc b/15T_ms/.magicrc
deleted file mode 100755
index 79cac60..0000000
--- a/15T_ms/.magicrc
+++ /dev/null
@@ -1,105 +0,0 @@
-puts stdout "Sourcing design .magicrc for technology EFS8A ..."
-
-# Put grid on 0.005 pitch. This is important, as some commands don't
-# rescale the grid automatically (such as lef read?).
-
-set scalefac [tech lambda]
-if {[lindex $scalefac 1] < 2} {
- scalegrid 1 2
-}
-
-# drc off
-drc euclidean on
-
-#set PDKPATH "~/projects/efabless/tech/SkyWater/EFS8A"
-
-# loading technology
-#tech load $PDKPATH/libs.tech/magic/EFS8A.tech
-tech load ../../char/techfiles/sky130A.tech
-
-# load device generator
-#source $PDKPATH/libs.tech/magic/EFS8A.tcl
-
-# load bind keys (optional)
-# source $PDKPATH/libs.tech/magic/EFS8A-BindKeys
-
-# set units to lambda grid
-snap internal
-
-# add path to reference cells
-#set MAGPATH "${PDKPATH}/libs.ref/mag"
-#addpath ${MAGPATH}/primdev
-#addpath ${MAGPATH}/s8fmlt
-#addpath ${MAGPATH}/s8iom0
-#addpath ${MAGPATH}/scs8hd
-#addpath ${MAGPATH}/scs8hdll
-#addpath ${MAGPATH}/scs8hvl
-#addpath ${MAGPATH}/scs8hs
-#addpath ${MAGPATH}/scs8ms
-#addpath ${MAGPATH}/scs8ls
-#addpath ${MAGPATH}/scs8lp
-
-# add path to GDS cells
-
-# add path to IP from catalog. This procedure defined in the PDK script.
-catch {magic::query_mylib_ip}
-# add path to local IP from user design space. Defined in the PDK script.
-catch {magic::query_my_projects}
-
-macro Shift_G "grid 74"
-macro XK_Left "scroll l .1 w"
-macro Shift_XK_Left "scroll l 1 w"
-macro Control_XK_Left "box grow w 1"
-macro Control_Shift_XK_Left "box shrink e 1"
-macro XK_Right "scroll r .1 w"
-macro Shift_XK_Right "scroll r 1 w"
-macro Control_XK_Right "box grow e 1"
-macro Control_Shift_XK_Right "box shrink w 1"
-macro XK_Up "scroll u .1 w"
-macro Shift_XK_Up "scroll u 1 w"
-macro Control_XK_Up "box grow n 1"
-macro Control_Shift_XK_Up "box shrink s 1"
-macro XK_Down "scroll d .1 w"
-macro Shift_XK_Down "scroll d 1 w"
-macro Control_XK_Down "box grow s 1"
-macro Control_Shift_XK_Down "box shrink n 1"
-
-macro XK_Pointer_Button4 "scroll u .05 w"
-macro XK_Pointer_Button5 "scroll d .05 w"
-macro . "history redo -1"
-
-macro XK_L "select less area {ndif pdif nwell poly}"
-macro XK_K "select less area nwell"
-macro XK_J "select less area {m1 lic}"
-macro XK_H "select less area li1"
-macro Control_Shift_XK_X "rotate"
-macro Shift_XK_Pointer_Button4 "stretch N 74"
-macro Shift_XK_Pointer_Button5 "stretch S 74"
-macro Control_XK_Pointer_Button4 "stretch N 34"
-macro Control_XK_Pointer_Button5 "stretch S 34"
-macro Control_Shift_XK_Q "stretch W 88"
-macro Control_Shift_XK_R "stretch E 88"
-macro Control_Shift_XK_W "stretch N 28"
-macro Control_Shift_XK_E "stretch N 4"
-macro XK_Y "stretch N 6"
-#macro Control_Shift_XK_W "stretch S 6"
-#macro Control_Shift_XK_E "stretch S 8"
-
-macro Control_Shift_XK_Pointer_Button4 "stretch N 17"
-macro Control_Shift_XK_Pointer_Button5 "stretch S 17"
-macro Control_Shift_XK_G "select area {m1 lic}"
-macro Control_Shift_XK_F "select area {poly polycont}"
-macro Control_Shift_XK_D "select area {ndc li1}"
-macro Control_Shift_XK_S "select area ntrans"
-
-macro Shift_D "select clear; move S 10; paint m1c"
-macro Shift_F "select clear; move N 10; paint m1c"
-
-
-macro Shift_B "box height 1.0um; move S 1.655um; select area; erase; select clear; move N 1um; select area; move S 1um; select clear; box height 0.26um; move S 4.35um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.26um; select clear; box height 20um; select area; move S 0.26um"
-
-
-macro Shift_N "box height 1.74um; move S 2.395um; select area; erase; select clear; move N 1.74um; select area; move S 1.74um; select clear; box height 0.48um; move S 3.61um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.48um; select clear; box height 20um; select area; move S 0.48um"
-
-
-macro Shift_M "box height 1.02um; move S 2.015um; select area; erase; select clear; move N 1.02um; box height 1.20um; select area; move S 1.02um; select clear; box height 0.12um; move S 0.56um; select area; erase; select clear; box height 5.00um; select area; move S 0.12um; select clear; move N 0.12um; box height 0.21um; move S 2.98um; select area;erase; select clear; box height 1.105um; move S 1.105um; select area; move N 0.21um; select clear; box height 0.17um; move N 0.825um; select area; erase; move S 0.825um; box height 0.825um; select area; move N 0.17um"
diff --git a/15T_ms/sky130_osu_sc_15T_ms__addf_1.mag b/15T_ms/sky130_osu_sc_15T_ms__addf_1.mag
deleted file mode 100644
index dbfbc0b..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__addf_1.mag
+++ /dev/null
@@ -1,651 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864560
-<< checkpaint >>
-rect -1269 -242 2695 2379
-rect -1209 -1243 2569 -242
-<< nwell >>
-rect -9 529 1435 1119
-<< nmos >>
-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 1089 1408 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 1003 1089
-rect 1037 1049 1139 1089
-rect 1173 1049 1275 1089
-rect 1309 1049 1408 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 729 155 745
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 1003 1083 1037 1089
-rect 1003 1055 1037 1083
-rect 1139 1083 1173 1089
-rect 1139 1055 1173 1083
-rect 1275 1083 1309 1089
-rect 1275 1055 1309 1083
-rect 80 449 114 483
-rect 248 375 282 409
-rect 80 301 114 335
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1089 1408 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 1003 1089
-rect 1037 1055 1139 1089
-rect 1173 1055 1275 1089
-rect 1309 1055 1408 1089
-rect 0 1049 1408 1055
-rect 1131 632 1189 638
-rect 1109 598 1143 632
-rect 1177 598 1189 632
-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 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel viali 97 318 97 318 1 A
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__addf_l.mag b/15T_ms/sky130_osu_sc_15T_ms__addf_l.mag
deleted file mode 100644
index e3d3880..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__addf_l.mag
+++ /dev/null
@@ -1,653 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864560
-<< checkpaint >>
-rect -1269 -242 2695 2379
-rect -1209 -1243 2569 -242
-<< nwell >>
-rect -9 529 1435 1119
-<< nmos >>
-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 1089 1408 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 1003 1089
-rect 1037 1049 1139 1089
-rect 1173 1049 1275 1089
-rect 1309 1049 1408 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 729 155 745
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 1003 1083 1037 1089
-rect 1003 1055 1037 1083
-rect 1139 1083 1173 1089
-rect 1139 1055 1173 1083
-rect 1275 1083 1309 1089
-rect 1275 1055 1309 1083
-rect 80 449 114 483
-rect 248 375 282 409
-rect 80 301 114 335
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1089 1408 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 1003 1089
-rect 1037 1055 1139 1089
-rect 1173 1055 1275 1089
-rect 1309 1055 1408 1089
-rect 0 1049 1408 1055
-rect 1131 638 1189 644
-rect 1109 604 1143 638
-rect 1177 604 1189 638
-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 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel viali 97 318 97 318 1 A
-port 1 n
-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 1228 244 1228 244 1 CON
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__addh_1.mag b/15T_ms/sky130_osu_sc_15T_ms__addh_1.mag
deleted file mode 100644
index 3b974a4..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__addh_1.mag
+++ /dev/null
@@ -1,394 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864560
-<< checkpaint >>
-rect -1269 -242 2097 2379
-rect -1209 -1243 2025 -242
-<< nwell >>
-rect -9 529 837 1119
-<< nmos >>
-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 1089 836 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 836 1089
-rect 35 949 69 965
-rect 35 575 69 597
-rect 133 949 167 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 35 609 69 631
-rect 35 597 69 609
-rect 260 449 294 483
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1089 836 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 836 1089
-rect 0 1049 836 1055
-rect 23 631 81 637
-rect 23 597 35 631
-rect 69 597 81 631
-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 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 425 50 425 1 S
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__addh_l.mag b/15T_ms/sky130_osu_sc_15T_ms__addh_l.mag
deleted file mode 100644
index 801f457..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__addh_l.mag
+++ /dev/null
@@ -1,398 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864561
-<< checkpaint >>
-rect -1269 -242 2097 2379
-rect -1209 -1243 2025 -242
-<< nwell >>
-rect -9 529 837 1119
-<< nmos >>
-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 1089 836 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 836 1089
-rect 35 949 69 965
-rect 35 631 69 745
-rect 133 949 167 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 35 597 69 631
-rect 260 449 294 483
-rect 164 375 198 409
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1089 836 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 836 1089
-rect 0 1049 836 1055
-rect 23 631 81 637
-rect 23 597 35 631
-rect 69 597 81 631
-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 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 425 50 425 1 S
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__and2_1.mag b/15T_ms/sky130_osu_sc_15T_ms__and2_1.mag
deleted file mode 100644
index 72ff63e..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__and2_1.mag
+++ /dev/null
@@ -1,187 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864561
-<< checkpaint >>
-rect -1269 -242 1634 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 374 1119
-<< nmos >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 1049
-rect 35 729 69 745
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 37 597 71 631
-rect 173 523 207 557
-rect 293 449 327 483
-rect 293 233 327 261
-rect 293 227 327 233
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 105 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__and2_2.mag b/15T_ms/sky130_osu_sc_15T_ms__and2_2.mag
deleted file mode 100644
index 5395a62..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__and2_2.mag
+++ /dev/null
@@ -1,222 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864561
-<< checkpaint >>
-rect -1269 -242 1722 2379
-rect -1209 -1243 1617 -242
-<< nwell >>
-rect -9 529 462 1119
-<< nmos >>
-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 1089 462 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 462 1089
-rect 35 949 69 1049
-rect 35 729 69 745
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 37 597 71 631
-rect 173 523 207 557
-rect 293 449 327 483
-rect 293 233 327 261
-rect 293 227 327 233
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 462 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 462 1089
-rect 0 1049 462 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 105 631
-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 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 191 540 191 540 1 B
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__and2_4.mag b/15T_ms/sky130_osu_sc_15T_ms__and2_4.mag
deleted file mode 100644
index b02dfa2..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__and2_4.mag
+++ /dev/null
@@ -1,285 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864561
-<< checkpaint >>
-rect -1269 -242 1898 2379
-rect -1209 -1243 1753 -242
-<< nwell >>
-rect -9 529 638 1119
-<< nmos >>
-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 1089 638 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 638 1089
-rect 35 949 69 1049
-rect 35 729 69 745
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 37 597 71 631
-rect 173 523 207 557
-rect 293 449 327 483
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 638 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 638 1089
-rect 0 1049 638 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 105 631
-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 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__and2_6.mag b/15T_ms/sky130_osu_sc_15T_ms__and2_6.mag
deleted file mode 100644
index e84e34c..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__and2_6.mag
+++ /dev/null
@@ -1,314 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1604007749
-<< checkpaint >>
-rect -1269 -242 2074 2379
-rect -1260 -1260 1261 -242
-<< nwell >>
-rect -9 529 814 1119
-<< nmos >>
-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_ms/sky130_osu_sc_15T_ms__and2_8.mag b/15T_ms/sky130_osu_sc_15T_ms__and2_8.mag
deleted file mode 100644
index d6fd48c..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__and2_8.mag
+++ /dev/null
@@ -1,427 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864562
-<< checkpaint >>
-rect -1269 -242 2250 2379
-rect -1209 -1243 2161 -242
-<< nwell >>
-rect -9 529 990 1119
-<< nmos >>
-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 1089 990 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 990 1089
-rect 35 949 69 1049
-rect 35 729 69 745
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 37 597 71 631
-rect 173 523 207 557
-rect 293 449 327 483
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1089 990 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 990 1089
-rect 0 1049 990 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 105 631
-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 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel viali 191 540 191 540 1 B
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__and2_l.mag b/15T_ms/sky130_osu_sc_15T_ms__and2_l.mag
deleted file mode 100644
index b55b6d1..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__and2_l.mag
+++ /dev/null
@@ -1,187 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864562
-<< checkpaint >>
-rect -1269 -242 1634 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 374 1119
-<< nmos >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 1049
-rect 121 949 155 965
-rect 35 797 69 813
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 37 597 71 631
-rect 173 523 207 557
-rect 293 449 327 483
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 105 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__ant.mag b/15T_ms/sky130_osu_sc_15T_ms__ant.mag
deleted file mode 100644
index 0c47885..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__ant.mag
+++ /dev/null
@@ -1,102 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864562
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< nwell >>
-rect -9 529 199 1119
-<< nmos >>
-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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 965
-rect 35 483 69 605
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 47 449 81 483
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 35 483 108 489
-rect 35 449 47 483
-rect 81 449 108 483
-rect 35 443 108 449
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 466 64 466 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__antfill.mag b/15T_ms/sky130_osu_sc_15T_ms__antfill.mag
deleted file mode 100644
index ef89bff..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__antfill.mag
+++ /dev/null
@@ -1,59 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864562
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< 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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 483 69 965
-rect 121 589 155 1049
-rect 31 449 47 483
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 47 449 81 483
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 35 483 108 489
-rect 35 449 47 483
-rect 81 449 108 483
-rect 35 443 108 449
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 466 64 466 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__aoi21_l.mag b/15T_ms/sky130_osu_sc_15T_ms__aoi21_l.mag
deleted file mode 100644
index 8e921f1..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__aoi21_l.mag
+++ /dev/null
@@ -1,198 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864562
-<< checkpaint >>
-rect -1269 -242 1634 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 374 1119
-<< nmos >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 797 155 813
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 60 597 94 631
-rect 128 523 162 557
-rect 216 449 250 483
-rect 293 375 327 409
-rect 193 233 227 261
-rect 193 227 227 233
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 48 631 106 637
-rect 48 597 60 631
-rect 94 597 128 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel viali 77 614 77 614 1 A0
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__aoi22_l.mag b/15T_ms/sky130_osu_sc_15T_ms__aoi22_l.mag
deleted file mode 100644
index 1e09611..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__aoi22_l.mag
+++ /dev/null
@@ -1,240 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864562
-<< checkpaint >>
-rect -1269 -242 1722 2379
-rect -1209 -1243 1617 -242
-<< nwell >>
-rect -9 529 462 1119
-<< nmos >>
-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 1089 462 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 462 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 763 155 779
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 60 597 94 631
-rect 128 523 162 557
-rect 216 449 250 483
-rect 370 376 404 410
-rect 302 301 336 335
-rect 200 233 234 261
-rect 200 227 234 233
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 462 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 462 1089
-rect 0 1049 462 1055
-rect 48 631 106 637
-rect 48 597 60 631
-rect 94 597 128 631
-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 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 77 614 77 614 1 A0
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__buf_1.mag b/15T_ms/sky130_osu_sc_15T_ms__buf_1.mag
deleted file mode 100644
index 616e585..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__buf_1.mag
+++ /dev/null
@@ -1,157 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864563
-<< checkpaint >>
-rect -1269 -242 1548 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 288 1119
-<< nmos >>
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 729 155 745
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 110 597 144 631
-rect 207 523 241 557
-rect 207 233 241 261
-rect 207 227 241 233
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 98 631 156 637
-rect 64 597 110 631
-rect 144 597 156 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 213 403 213 403 1 Y
-port 2 n
-rlabel viali 127 614 127 614 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__buf_2.mag b/15T_ms/sky130_osu_sc_15T_ms__buf_2.mag
deleted file mode 100644
index e95fc11..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__buf_2.mag
+++ /dev/null
@@ -1,179 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864563
-<< checkpaint >>
-rect -1269 2461 1636 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1636 -1129
-<< nwell >>
-rect -9 529 376 1119
-<< nmos >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 725 155 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 110 597 144 631
-rect 207 523 241 557
-rect 207 227 241 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 98 631 156 637
-rect 64 597 110 631
-rect 144 597 156 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel viali 127 614 127 614 1 A
-port 1 n
-rlabel metal1 211 402 211 402 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__buf_4.mag b/15T_ms/sky130_osu_sc_15T_ms__buf_4.mag
deleted file mode 100644
index d9ea366..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__buf_4.mag
+++ /dev/null
@@ -1,244 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864563
-<< checkpaint >>
-rect -1269 2461 1812 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1812 -1129
-<< nwell >>
-rect -9 529 552 1119
-<< nmos >>
-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 1089 550 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 550 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 725 155 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 110 597 144 631
-rect 207 523 241 557
-rect 379 523 413 557
-rect 207 227 241 261
-rect 379 227 413 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 550 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 550 1089
-rect 0 1049 550 1055
-rect 98 631 156 637
-rect 64 597 110 631
-rect 144 597 156 631
-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 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel viali 127 614 127 614 1 A
-port 1 n
-rlabel metal1 211 402 211 402 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__buf_6.mag b/15T_ms/sky130_osu_sc_15T_ms__buf_6.mag
deleted file mode 100644
index d48678d..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__buf_6.mag
+++ /dev/null
@@ -1,286 +0,0 @@
-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
-<< nmos >>
-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_ms/sky130_osu_sc_15T_ms__buf_8.mag b/15T_ms/sky130_osu_sc_15T_ms__buf_8.mag
deleted file mode 100644
index 517951d..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__buf_8.mag
+++ /dev/null
@@ -1,383 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864563
-<< checkpaint >>
-rect -1269 2461 2164 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2164 -1129
-<< nwell >>
-rect -9 529 904 1119
-<< nmos >>
-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 1089 902 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 902 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 725 155 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 902 61
-rect 0 0 902 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 110 597 144 631
-rect 207 523 241 557
-rect 379 523 413 557
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1089 902 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 902 1089
-rect 0 1049 902 1055
-rect 98 631 156 637
-rect 64 597 110 631
-rect 144 597 156 631
-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 55 902 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 902 55
-rect 0 0 902 21
-<< labels >>
-rlabel viali 127 614 127 614 1 A
-port 1 n
-rlabel metal1 211 402 211 402 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__buf_l.mag b/15T_ms/sky130_osu_sc_15T_ms__buf_l.mag
deleted file mode 100644
index 4c99cfc..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__buf_l.mag
+++ /dev/null
@@ -1,157 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864564
-<< checkpaint >>
-rect -1269 -242 1548 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 288 1119
-<< nmos >>
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 965
-rect 35 352 69 831
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 110 597 144 631
-rect 207 523 241 557
-rect 207 227 241 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 98 631 156 637
-rect 64 597 110 631
-rect 144 597 156 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel viali 127 614 127 614 1 A
-port 1 n
-rlabel metal1 214 400 214 400 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__decap_1.mag b/15T_ms/sky130_osu_sc_15T_ms__decap_1.mag
deleted file mode 100644
index 224a6a5..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__decap_1.mag
+++ /dev/null
@@ -1,84 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864564
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< nwell >>
-rect -9 529 199 1119
-<< nmos >>
-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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 729 69 745
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__decap_l.mag b/15T_ms/sky130_osu_sc_15T_ms__decap_l.mag
deleted file mode 100644
index 4e66e21..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__decap_l.mag
+++ /dev/null
@@ -1,84 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864564
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< nwell >>
-rect -9 529 199 1119
-<< nmos >>
-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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 849 69 865
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__dff_1.mag b/15T_ms/sky130_osu_sc_15T_ms__dff_1.mag
deleted file mode 100644
index bd12596..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__dff_1.mag
+++ /dev/null
@@ -1,635 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864564
-<< checkpaint >>
-rect -1269 -242 2716 2379
-rect -1209 -1243 2569 -242
-<< nwell >>
-rect -9 529 1456 1119
-<< nmos >>
-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 1089 1452 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 1003 1089
-rect 1037 1049 1139 1089
-rect 1173 1049 1275 1089
-rect 1309 1049 1452 1089
-rect 40 949 74 965
-rect 17 605 40 617
-rect 126 949 160 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 1003 1083 1037 1089
-rect 1003 1055 1037 1083
-rect 1139 1083 1173 1089
-rect 1139 1055 1173 1083
-rect 1275 1083 1309 1089
-rect 1275 1055 1309 1083
-rect 40 301 74 335
-rect 253 449 287 483
-rect 181 375 215 409
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1089 1452 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 1003 1089
-rect 1037 1055 1139 1089
-rect 1173 1055 1275 1089
-rect 1309 1055 1452 1089
-rect 0 1049 1452 1055
-rect 1366 631 1424 637
-rect 1343 597 1378 631
-rect 1412 597 1424 631
-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 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel viali 198 392 198 392 1 D
-port 1 n
-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 49 68 49 1 gnd
-rlabel viali 68 1063 68 1063 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__dff_l.mag b/15T_ms/sky130_osu_sc_15T_ms__dff_l.mag
deleted file mode 100644
index 6d86c98..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__dff_l.mag
+++ /dev/null
@@ -1,636 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864564
-<< checkpaint >>
-rect -1269 -242 2716 2379
-rect -1209 -1243 2569 -242
-<< nwell >>
-rect -9 529 1456 1119
-<< nmos >>
-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 1089 1452 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 1003 1089
-rect 1037 1049 1139 1089
-rect 1173 1049 1275 1089
-rect 1309 1049 1452 1089
-rect 40 949 74 965
-rect 17 605 40 617
-rect 126 949 160 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 1003 1083 1037 1089
-rect 1003 1055 1037 1083
-rect 1139 1083 1173 1089
-rect 1139 1055 1173 1083
-rect 1275 1083 1309 1089
-rect 1275 1055 1309 1083
-rect 40 301 74 335
-rect 253 449 287 483
-rect 181 375 215 409
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1089 1452 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 1003 1089
-rect 1037 1055 1139 1089
-rect 1173 1055 1275 1089
-rect 1309 1055 1452 1089
-rect 0 1049 1452 1055
-rect 1365 631 1423 637
-rect 1343 597 1377 631
-rect 1411 597 1423 631
-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 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel viali 198 392 198 392 1 D
-port 1 n
-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 49 68 49 1 gnd
-rlabel viali 68 1063 68 1063 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__dffr_1.mag b/15T_ms/sky130_osu_sc_15T_ms__dffr_1.mag
deleted file mode 100644
index e6bca9f..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__dffr_1.mag
+++ /dev/null
@@ -1,809 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864565
-<< checkpaint >>
-rect -1270 -242 3177 2379
-rect -1210 -1243 3112 -242
-<< nwell >>
-rect -10 529 1917 1119
-<< nmos >>
-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 1089 1914 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1682 1089
-rect 1716 1049 1818 1089
-rect 1852 1049 1914 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 1682 1083 1716 1089
-rect 1682 1055 1716 1083
-rect 1818 1083 1852 1089
-rect 1818 1055 1852 1083
-rect 47 597 81 631
-rect 229 257 263 261
-rect 229 227 263 257
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 1089 1914 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1682 1089
-rect 1716 1055 1818 1089
-rect 1852 1055 1914 1089
-rect 0 1049 1914 1055
-rect 35 631 93 637
-rect 1826 631 1884 637
-rect 35 597 47 631
-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 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel viali 65 614 65 614 1 RN
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__dffr_l.mag b/15T_ms/sky130_osu_sc_15T_ms__dffr_l.mag
deleted file mode 100644
index 9a6c296..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__dffr_l.mag
+++ /dev/null
@@ -1,809 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864565
-<< checkpaint >>
-rect -1270 -242 3177 2379
-rect -1210 -1243 3112 -242
-<< nwell >>
-rect -10 529 1917 1119
-<< nmos >>
-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 1089 1914 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1682 1089
-rect 1716 1049 1818 1089
-rect 1852 1049 1914 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 1682 1083 1716 1089
-rect 1682 1055 1716 1083
-rect 1818 1083 1852 1089
-rect 1818 1055 1852 1083
-rect 47 597 81 631
-rect 229 257 263 261
-rect 229 227 263 257
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 1089 1914 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1682 1089
-rect 1716 1055 1818 1089
-rect 1852 1055 1914 1089
-rect 0 1049 1914 1055
-rect 35 631 93 637
-rect 1826 631 1884 637
-rect 35 597 47 631
-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 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel viali 65 614 65 614 1 RN
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__dffs_1.mag b/15T_ms/sky130_osu_sc_15T_ms__dffs_1.mag
deleted file mode 100644
index a6b2464..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__dffs_1.mag
+++ /dev/null
@@ -1,724 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864565
-<< checkpaint >>
-rect -1270 -242 3001 2379
-rect -1210 -1243 2840 -242
-<< nwell >>
-rect -10 529 1741 1119
-<< nmos >>
-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 1089 1738 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1738 1089
-rect 35 949 69 1049
-rect 35 861 69 877
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 47 227 81 261
-rect 121 301 155 335
-rect 438 449 472 483
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 1089 1738 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1738 1089
-rect 0 1049 1738 1055
-rect 1636 631 1694 637
-rect 1614 597 1648 631
-rect 1682 597 1694 631
-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 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 392 383 392 1 D
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__dffs_l.mag b/15T_ms/sky130_osu_sc_15T_ms__dffs_l.mag
deleted file mode 100644
index 9efb9be..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__dffs_l.mag
+++ /dev/null
@@ -1,724 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864565
-<< checkpaint >>
-rect -1270 -242 3001 2379
-rect -1210 -1243 2840 -242
-<< nwell >>
-rect -10 529 1741 1119
-<< nmos >>
-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 1089 1738 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1738 1089
-rect 35 949 69 1049
-rect 35 861 69 877
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 47 227 81 261
-rect 121 301 155 335
-rect 438 449 472 483
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 1089 1738 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1738 1089
-rect 0 1049 1738 1055
-rect 1636 631 1694 637
-rect 1614 597 1648 631
-rect 1682 597 1694 631
-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 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 392 383 392 1 D
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__dffsr_1.mag b/15T_ms/sky130_osu_sc_15T_ms__dffsr_1.mag
deleted file mode 100644
index aa98eef..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__dffsr_1.mag
+++ /dev/null
@@ -1,901 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864565
-<< checkpaint >>
-rect -1270 -242 3350 2379
-rect -1210 -1243 3248 -242
-<< nwell >>
-rect -10 529 2090 1119
-<< nmos >>
-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 1089 2090 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1682 1089
-rect 1716 1049 1818 1089
-rect 1852 1049 1954 1089
-rect 1988 1049 2090 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 1682 1083 1716 1089
-rect 1682 1055 1716 1083
-rect 1818 1083 1852 1089
-rect 1818 1055 1852 1083
-rect 1954 1083 1988 1089
-rect 1954 1055 1988 1083
-rect 47 597 81 631
-rect 325 523 359 557
-rect 325 301 359 335
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 1089 2090 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1682 1089
-rect 1716 1055 1818 1089
-rect 1852 1055 1954 1089
-rect 1988 1055 2090 1089
-rect 0 1049 2090 1055
-rect 35 631 93 637
-rect 1999 631 2057 637
-rect 35 597 47 631
-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 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel viali 659 392 659 392 1 D
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__dffsr_l.mag b/15T_ms/sky130_osu_sc_15T_ms__dffsr_l.mag
deleted file mode 100644
index a567953..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__dffsr_l.mag
+++ /dev/null
@@ -1,900 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864566
-<< checkpaint >>
-rect -1270 -242 3350 2379
-rect -1210 -1243 3248 -242
-<< nwell >>
-rect -10 529 2090 1119
-<< nmos >>
-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 1089 2090 1110
-rect 0 1049 50 1089
-rect 84 1049 186 1089
-rect 220 1049 322 1089
-rect 356 1049 458 1089
-rect 492 1049 594 1089
-rect 628 1049 730 1089
-rect 764 1049 866 1089
-rect 900 1049 1002 1089
-rect 1036 1049 1138 1089
-rect 1172 1049 1274 1089
-rect 1308 1049 1410 1089
-rect 1444 1049 1546 1089
-rect 1580 1049 1682 1089
-rect 1716 1049 1818 1089
-rect 1852 1049 1954 1089
-rect 1988 1049 2090 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 1083 84 1089
-rect 50 1055 84 1083
-rect 186 1083 220 1089
-rect 186 1055 220 1083
-rect 322 1083 356 1089
-rect 322 1055 356 1083
-rect 458 1083 492 1089
-rect 458 1055 492 1083
-rect 594 1083 628 1089
-rect 594 1055 628 1083
-rect 730 1083 764 1089
-rect 730 1055 764 1083
-rect 866 1083 900 1089
-rect 866 1055 900 1083
-rect 1002 1083 1036 1089
-rect 1002 1055 1036 1083
-rect 1138 1083 1172 1089
-rect 1138 1055 1172 1083
-rect 1274 1083 1308 1089
-rect 1274 1055 1308 1083
-rect 1410 1083 1444 1089
-rect 1410 1055 1444 1083
-rect 1546 1083 1580 1089
-rect 1546 1055 1580 1083
-rect 1682 1083 1716 1089
-rect 1682 1055 1716 1083
-rect 1818 1083 1852 1089
-rect 1818 1055 1852 1083
-rect 1954 1083 1988 1089
-rect 1954 1055 1988 1083
-rect 47 597 81 631
-rect 325 523 359 557
-rect 325 301 359 335
-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 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 1089 2090 1110
-rect 0 1055 50 1089
-rect 84 1055 186 1089
-rect 220 1055 322 1089
-rect 356 1055 458 1089
-rect 492 1055 594 1089
-rect 628 1055 730 1089
-rect 764 1055 866 1089
-rect 900 1055 1002 1089
-rect 1036 1055 1138 1089
-rect 1172 1055 1274 1089
-rect 1308 1055 1410 1089
-rect 1444 1055 1546 1089
-rect 1580 1055 1682 1089
-rect 1716 1055 1818 1089
-rect 1852 1055 1954 1089
-rect 1988 1055 2090 1089
-rect 0 1049 2090 1055
-rect 35 631 93 637
-rect 1998 631 2056 637
-rect 35 597 47 631
-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 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel viali 659 392 659 392 1 D
-port 1 n
-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 48 67 48 1 gnd
-rlabel viali 67 1062 67 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__fill_1.mag b/15T_ms/sky130_osu_sc_15T_ms__fill_1.mag
deleted file mode 100644
index 8d445b8..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__fill_1.mag
+++ /dev/null
@@ -1,24 +0,0 @@
-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_ms/sky130_osu_sc_15T_ms__fill_16.mag b/15T_ms/sky130_osu_sc_15T_ms__fill_16.mag
deleted file mode 100644
index 83c32da..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__fill_16.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-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_ms/sky130_osu_sc_15T_ms__fill_2.mag b/15T_ms/sky130_osu_sc_15T_ms__fill_2.mag
deleted file mode 100644
index bde58ab..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__fill_2.mag
+++ /dev/null
@@ -1,24 +0,0 @@
-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_ms/sky130_osu_sc_15T_ms__fill_32.mag b/15T_ms/sky130_osu_sc_15T_ms__fill_32.mag
deleted file mode 100644
index 4cf67de..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__fill_32.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-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_ms/sky130_osu_sc_15T_ms__fill_4.mag b/15T_ms/sky130_osu_sc_15T_ms__fill_4.mag
deleted file mode 100644
index 8b2fb75..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__fill_4.mag
+++ /dev/null
@@ -1,22 +0,0 @@
-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_ms/sky130_osu_sc_15T_ms__fill_8.mag b/15T_ms/sky130_osu_sc_15T_ms__fill_8.mag
deleted file mode 100644
index 2d49aaa..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__fill_8.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-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_ms/sky130_osu_sc_15T_ms__inv_1.mag b/15T_ms/sky130_osu_sc_15T_ms__inv_1.mag
deleted file mode 100644
index 82e08bb..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__inv_1.mag
+++ /dev/null
@@ -1,115 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864567
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 529 199 1119
-<< nmos >>
-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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 121 227 155 261
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 151 389 151 389 1 Y
-port 1 n
-rlabel viali 64 614 64 614 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__inv_10.mag b/15T_ms/sky130_osu_sc_15T_ms__inv_10.mag
deleted file mode 100644
index f251965..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__inv_10.mag
+++ /dev/null
@@ -1,420 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864567
-<< checkpaint >>
-rect -1269 2461 2250 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2250 -1129
-<< nwell >>
-rect -9 529 990 1119
-<< nmos >>
-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 1089 990 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 990 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 293 523 327 557
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1089 990 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 990 1089
-rect 0 1049 990 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 152 388 152 388 1 Y
-port 1 n
-rlabel viali 64 613 64 613 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__inv_2.mag b/15T_ms/sky130_osu_sc_15T_ms__inv_2.mag
deleted file mode 100644
index f3af0d7..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__inv_2.mag
+++ /dev/null
@@ -1,153 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864567
-<< checkpaint >>
-rect -1269 2461 1547 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1547 -1129
-<< nwell >>
-rect -9 529 287 1119
-<< nmos >>
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 121 227 155 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 152 388 152 388 1 Y
-port 1 n
-rlabel viali 64 613 64 613 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__inv_3.mag b/15T_ms/sky130_osu_sc_15T_ms__inv_3.mag
deleted file mode 100644
index 813b08c..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__inv_3.mag
+++ /dev/null
@@ -1,182 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864567
-<< checkpaint >>
-rect -1269 2461 1635 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1635 -1129
-<< nwell >>
-rect -9 529 375 1119
-<< nmos >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 293 523 327 557
-rect 121 227 155 261
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 152 388 152 388 1 Y
-port 1 n
-rlabel viali 64 613 64 613 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__inv_4.mag b/15T_ms/sky130_osu_sc_15T_ms__inv_4.mag
deleted file mode 100644
index eff9300..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__inv_4.mag
+++ /dev/null
@@ -1,216 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864568
-<< checkpaint >>
-rect -1269 2461 1723 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1723 -1129
-<< nwell >>
-rect -9 529 463 1119
-<< nmos >>
-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 1089 462 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 462 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 293 523 327 557
-rect 121 227 155 261
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 462 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 462 1089
-rect 0 1049 462 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 64 613 64 613 1 A
-port 1 n
-rlabel metal1 152 388 152 388 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__inv_6.mag b/15T_ms/sky130_osu_sc_15T_ms__inv_6.mag
deleted file mode 100644
index 4a0bc0f..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__inv_6.mag
+++ /dev/null
@@ -1,280 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864568
-<< checkpaint >>
-rect -1269 2461 1899 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1899 -1129
-<< nwell >>
-rect -9 529 639 1119
-<< nmos >>
-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 1089 638 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 638 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 293 523 327 557
-rect 465 523 499 557
-rect 121 227 155 261
-rect 293 227 327 261
-rect 465 227 499 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 638 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 638 1089
-rect 0 1049 638 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 64 613 64 613 1 A
-port 1 n
-rlabel metal1 152 388 152 388 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__inv_8.mag b/15T_ms/sky130_osu_sc_15T_ms__inv_8.mag
deleted file mode 100644
index 24cdc95..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__inv_8.mag
+++ /dev/null
@@ -1,343 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864568
-<< checkpaint >>
-rect -1269 2461 2074 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2074 -1129
-<< nwell >>
-rect -9 529 814 1119
-<< nmos >>
-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 1089 814 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 814 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 814 61
-rect 0 0 814 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 293 523 327 557
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-<< metal1 >>
-rect 0 1089 814 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 814 1089
-rect 0 1049 814 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 814 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 814 55
-rect 0 0 814 21
-<< labels >>
-rlabel metal1 152 388 152 388 1 Y
-port 1 n
-rlabel viali 64 613 64 613 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__inv_l.mag b/15T_ms/sky130_osu_sc_15T_ms__inv_l.mag
deleted file mode 100644
index 471bbc4..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__inv_l.mag
+++ /dev/null
@@ -1,114 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864568
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< nwell >>
-rect -9 529 199 1119
-<< nmos >>
-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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 861 69 877
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 47 597 81 631
-rect 121 523 155 557
-rect 121 227 155 261
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 127 631
-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 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 64 614 64 614 1 A
-port 1 n
-rlabel metal1 151 389 151 389 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__mux2_1.mag b/15T_ms/sky130_osu_sc_15T_ms__mux2_1.mag
deleted file mode 100644
index a291e5d..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__mux2_1.mag
+++ /dev/null
@@ -1,227 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864568
-<< checkpaint >>
-rect -1269 2461 1813 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1813 -1129
-<< nwell >>
-rect -9 529 553 1119
-<< nmos >>
-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 1089 550 1110
-rect 0 1049 459 1089
-rect 493 1049 550 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 37 597 71 631
-rect 236 523 270 557
-rect 311 375 345 409
-rect 397 449 431 483
-rect 311 227 345 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 550 1110
-rect 0 1055 459 1089
-rect 493 1055 550 1089
-rect 0 1049 550 1055
-rect 25 631 83 637
-rect 25 597 37 631
-rect 71 597 117 631
-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 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel viali 54 614 54 614 1 S0
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 476 1062 476 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__nand2_1.mag b/15T_ms/sky130_osu_sc_15T_ms__nand2_1.mag
deleted file mode 100644
index 5ef206c..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__nand2_1.mag
+++ /dev/null
@@ -1,157 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864569
-<< checkpaint >>
-rect -1269 2461 1546 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1546 -1129
-<< nwell >>
-rect -9 529 286 1119
-<< nmos >>
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 47 597 81 631
-rect 121 449 155 483
-rect 195 523 229 557
-rect 35 227 69 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 115 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 418 136 418 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__nand2_l.mag b/15T_ms/sky130_osu_sc_15T_ms__nand2_l.mag
deleted file mode 100644
index 76d5b3d..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__nand2_l.mag
+++ /dev/null
@@ -1,156 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864569
-<< checkpaint >>
-rect -1269 -242 1546 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 286 1119
-<< nmos >>
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 1049
-rect 35 861 69 877
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 47 597 81 631
-rect 121 449 155 483
-rect 195 523 229 557
-rect 35 227 69 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 35 631 93 637
-rect 35 597 47 631
-rect 81 597 115 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 418 136 418 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__nor2_1.mag b/15T_ms/sky130_osu_sc_15T_ms__nor2_1.mag
deleted file mode 100644
index 9b1a712..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__nor2_1.mag
+++ /dev/null
@@ -1,157 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864569
-<< checkpaint >>
-rect -1269 2461 1546 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1546 -1129
-<< nwell >>
-rect -9 529 286 1119
-<< nmos >>
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 965
-rect 193 949 227 1049
-rect 193 725 227 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 181 597 215 631
-rect 35 449 69 483
-rect 113 523 147 557
-rect 121 227 155 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 169 631 227 637
-rect 148 597 181 631
-rect 215 597 227 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 137 341 137 341 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__nor2_l.mag b/15T_ms/sky130_osu_sc_15T_ms__nor2_l.mag
deleted file mode 100644
index 960b63f..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__nor2_l.mag
+++ /dev/null
@@ -1,156 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864569
-<< checkpaint >>
-rect -1269 -242 1546 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 286 1119
-<< nmos >>
-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 1089 286 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 286 1089
-rect 35 949 69 965
-rect 35 483 69 809
-rect 193 949 227 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 181 597 215 631
-rect 35 449 69 483
-rect 113 523 147 557
-rect 121 227 155 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 286 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 286 1089
-rect 0 1049 286 1055
-rect 169 631 227 637
-rect 148 597 181 631
-rect 215 597 227 631
-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 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 137 341 137 341 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__oai21_l.mag b/15T_ms/sky130_osu_sc_15T_ms__oai21_l.mag
deleted file mode 100644
index 6d25ae5..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__oai21_l.mag
+++ /dev/null
@@ -1,195 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864569
-<< checkpaint >>
-rect -1269 -242 1634 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 374 1119
-<< nmos >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 193 949 227 1049
-rect 193 793 227 809
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 66 597 100 631
-rect 162 523 196 557
-rect 223 449 257 483
-rect 291 375 325 409
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 54 631 112 637
-rect 54 597 66 631
-rect 100 597 134 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel viali 83 614 83 614 1 A0
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__oai22_l.mag b/15T_ms/sky130_osu_sc_15T_ms__oai22_l.mag
deleted file mode 100644
index ebd7ffc..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__oai22_l.mag
+++ /dev/null
@@ -1,240 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864570
-<< checkpaint >>
-rect -1269 -242 1722 2379
-rect -1209 -1243 1617 -242
-<< nwell >>
-rect -9 529 462 1119
-<< nmos >>
-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 1089 462 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 462 1089
-rect 35 949 69 1049
-rect 35 725 69 741
-rect 200 949 234 965
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 66 597 100 631
-rect 162 523 196 557
-rect 223 449 257 483
-rect 384 376 418 410
-rect 316 301 350 335
-rect 316 227 350 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 462 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 462 1089
-rect 0 1049 462 1055
-rect 54 631 112 637
-rect 54 597 66 631
-rect 100 597 134 631
-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 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 240 466 240 466 1 B0
-port 4 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__or2_1.mag b/15T_ms/sky130_osu_sc_15T_ms__or2_1.mag
deleted file mode 100644
index 38947ff..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__or2_1.mag
+++ /dev/null
@@ -1,188 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864570
-<< checkpaint >>
-rect -1269 2461 1634 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1634 -1129
-<< nwell >>
-rect -9 529 374 1119
-<< nmos >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 207 949 241 1049
-rect 207 725 241 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 37 523 71 557
-rect 173 597 207 631
-rect 293 449 327 483
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 161 631 219 637
-rect 140 597 173 631
-rect 207 597 219 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__or2_2.mag b/15T_ms/sky130_osu_sc_15T_ms__or2_2.mag
deleted file mode 100644
index 722c637..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__or2_2.mag
+++ /dev/null
@@ -1,223 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864570
-<< checkpaint >>
-rect -1269 2461 1722 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1722 -1129
-<< nwell >>
-rect -9 529 462 1119
-<< nmos >>
-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 1089 462 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 462 1089
-rect 35 949 69 965
-rect 207 949 241 1049
-rect 207 725 241 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 37 523 71 557
-rect 173 597 207 631
-rect 293 449 327 483
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1089 462 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 462 1089
-rect 0 1049 462 1055
-rect 161 631 219 637
-rect 140 597 173 631
-rect 207 597 219 631
-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 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__or2_4.mag b/15T_ms/sky130_osu_sc_15T_ms__or2_4.mag
deleted file mode 100644
index d7d10c4..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__or2_4.mag
+++ /dev/null
@@ -1,286 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864570
-<< checkpaint >>
-rect -1269 2461 1898 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1898 -1129
-<< nwell >>
-rect -9 529 638 1119
-<< nmos >>
-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 1089 638 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 638 1089
-rect 35 949 69 965
-rect 207 949 241 1049
-rect 207 725 241 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 37 523 71 557
-rect 173 597 207 631
-rect 293 449 327 483
-rect 465 449 499 483
-rect 293 227 327 261
-rect 465 227 499 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 638 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 638 1089
-rect 0 1049 638 1055
-rect 161 631 219 637
-rect 140 597 173 631
-rect 207 597 219 631
-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 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__or2_8.mag b/15T_ms/sky130_osu_sc_15T_ms__or2_8.mag
deleted file mode 100644
index 0f3e3dd..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__or2_8.mag
+++ /dev/null
@@ -1,428 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864570
-<< checkpaint >>
-rect -1269 2461 2250 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 2250 -1129
-<< nwell >>
-rect -9 529 990 1119
-<< nmos >>
-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 1089 990 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 595 1089
-rect 629 1049 731 1089
-rect 765 1049 867 1089
-rect 901 1049 990 1089
-rect 35 949 69 965
-rect 207 949 241 1049
-rect 207 725 241 741
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 595 1083 629 1089
-rect 595 1055 629 1083
-rect 731 1083 765 1089
-rect 731 1055 765 1083
-rect 867 1083 901 1089
-rect 867 1055 901 1083
-rect 37 523 71 557
-rect 173 597 207 631
-rect 293 449 327 483
-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 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1089 990 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 595 1089
-rect 629 1055 731 1089
-rect 765 1055 867 1089
-rect 901 1055 990 1089
-rect 0 1049 990 1055
-rect 161 631 219 637
-rect 140 597 173 631
-rect 207 597 219 631
-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 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__or2_l.mag b/15T_ms/sky130_osu_sc_15T_ms__or2_l.mag
deleted file mode 100644
index 1fd3951..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__or2_l.mag
+++ /dev/null
@@ -1,187 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864570
-<< checkpaint >>
-rect -1269 -242 1634 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 374 1119
-<< nmos >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 35 691 69 877
-rect 207 949 241 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 37 523 71 557
-rect 173 597 207 631
-rect 293 449 327 483
-rect 293 227 327 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 161 631 219 637
-rect 140 597 173 631
-rect 207 597 219 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 392 311 392 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__tbufi_1.mag b/15T_ms/sky130_osu_sc_15T_ms__tbufi_1.mag
deleted file mode 100644
index 5c0a39e..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__tbufi_1.mag
+++ /dev/null
@@ -1,187 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864571
-<< checkpaint >>
-rect -1269 2461 1635 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1635 -1129
-<< nwell >>
-rect -9 529 375 1119
-<< nmos >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 657 155 673
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 211 597 245 631
-rect 279 449 313 483
-rect 121 301 155 335
-rect 279 227 313 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 199 631 257 637
-rect 177 597 211 631
-rect 245 597 257 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 312 305 312 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__tbufi_l.mag b/15T_ms/sky130_osu_sc_15T_ms__tbufi_l.mag
deleted file mode 100644
index d91a162..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__tbufi_l.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864571
-<< checkpaint >>
-rect -1269 -242 1635 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 375 1119
-<< nmos >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 35 461 69 809
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 211 597 245 631
-rect 279 449 313 483
-rect 121 301 155 335
-rect 279 227 313 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 199 631 257 637
-rect 177 597 211 631
-rect 245 597 257 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 312 305 312 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__tiehi.mag b/15T_ms/sky130_osu_sc_15T_ms__tiehi.mag
deleted file mode 100644
index 296b753..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__tiehi.mag
+++ /dev/null
@@ -1,100 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864571
-<< checkpaint >>
-rect -1269 -242 1459 2379
-rect -1209 -1243 1345 -242
-<< nwell >>
-rect -9 529 199 1119
-<< nmos >>
-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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 589 69 605
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 121 523 155 557
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 94 557 167 563
-rect 94 523 121 557
-rect 155 523 167 557
-rect 94 517 167 523
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 138 540 138 540 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__tielo.mag b/15T_ms/sky130_osu_sc_15T_ms__tielo.mag
deleted file mode 100644
index 4fc6155..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__tielo.mag
+++ /dev/null
@@ -1,101 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864571
-<< checkpaint >>
-rect -1269 2461 1459 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1459 -1129
-<< nwell >>
-rect -9 529 199 1119
-<< nmos >>
-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 1089 198 1110
-rect 0 1049 51 1089
-rect 85 1049 198 1089
-rect 35 949 69 1049
-rect 35 589 69 605
-rect 121 949 155 965
-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 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 121 301 155 335
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1089 198 1110
-rect 0 1055 51 1089
-rect 85 1055 198 1089
-rect 0 1049 198 1055
-rect 94 335 167 341
-rect 94 301 121 335
-rect 155 301 167 335
-rect 94 295 167 301
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 138 318 138 318 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__tnbufi_1.mag b/15T_ms/sky130_osu_sc_15T_ms__tnbufi_1.mag
deleted file mode 100644
index f530156..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__tnbufi_1.mag
+++ /dev/null
@@ -1,182 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864571
-<< checkpaint >>
-rect -1269 2461 1635 2601
-rect -1760 -1129 6260 2461
-rect -1269 -1260 1635 -1129
-<< nwell >>
-rect -9 529 375 1119
-<< nmos >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 657 155 673
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 211 597 245 631
-rect 121 523 155 557
-rect 279 449 313 483
-rect 279 227 313 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 199 631 257 637
-rect 177 597 211 631
-rect 245 597 257 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 312 305 312 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__tnbufi_l.mag b/15T_ms/sky130_osu_sc_15T_ms__tnbufi_l.mag
deleted file mode 100644
index 5e62dda..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__tnbufi_l.mag
+++ /dev/null
@@ -1,181 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864572
-<< checkpaint >>
-rect -1269 -242 1635 2379
-rect -1209 -1243 1481 -242
-<< nwell >>
-rect -9 529 375 1119
-<< nmos >>
-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 1089 374 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 374 1089
-rect 35 949 69 965
-rect 35 400 69 809
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 211 597 245 631
-rect 121 523 155 557
-rect 279 449 313 483
-rect 279 227 313 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1089 374 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 374 1089
-rect 0 1049 374 1055
-rect 199 631 257 637
-rect 177 597 211 631
-rect 245 597 257 631
-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 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 312 305 312 1 Y
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__xnor2_l.mag b/15T_ms/sky130_osu_sc_15T_ms__xnor2_l.mag
deleted file mode 100644
index 1ec9f56..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__xnor2_l.mag
+++ /dev/null
@@ -1,292 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864572
-<< checkpaint >>
-rect -1269 -242 1898 2379
-rect -1209 -1243 1753 -242
-<< nwell >>
-rect -9 529 638 1119
-<< nmos >>
-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 1089 638 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 638 1089
-rect 35 949 69 965
-rect 35 443 69 605
-rect 121 949 155 1049
-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 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 268 605 279 631
-rect 279 605 302 631
-rect 268 597 302 605
-rect 152 227 186 261
-rect 268 301 302 335
-rect 489 301 523 335
-rect 412 227 446 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 638 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 638 1089
-rect 0 1049 638 1055
-rect 256 631 314 637
-rect 256 597 268 631
-rect 302 597 314 631
-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 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 170 244 170 244 1 A
-port 1 n
-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 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/15T_ms/sky130_osu_sc_15T_ms__xor2_l.mag b/15T_ms/sky130_osu_sc_15T_ms__xor2_l.mag
deleted file mode 100644
index 309cba3..0000000
--- a/15T_ms/sky130_osu_sc_15T_ms__xor2_l.mag
+++ /dev/null
@@ -1,291 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864572
-<< checkpaint >>
-rect -1269 -242 1898 2379
-rect -1209 -1243 1753 -242
-<< nwell >>
-rect -9 529 638 1119
-<< nmos >>
-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 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 358 263
-rect 268 131 279 215
-rect 347 131 358 215
-rect 268 115 358 131
-rect 388 115 430 263
-rect 460 215 516 263
-rect 460 131 471 215
-rect 505 131 516 215
-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 741 121 949
-rect 155 741 166 949
-rect 110 565 166 741
-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 741 471 949
-rect 505 741 516 949
-rect 460 565 516 741
-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 215
-rect 279 131 347 215
-rect 471 131 505 215
-rect 557 131 591 215
-<< pdiffc >>
-rect 35 605 69 949
-rect 121 741 155 949
-rect 279 605 347 949
-rect 471 741 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 166 550 196 565
-rect 70 520 196 550
-rect 70 303 100 520
-rect 142 518 196 520
-rect 142 484 152 518
-rect 186 484 196 518
-rect 142 468 196 484
-rect 142 410 196 426
-rect 142 376 152 410
-rect 186 376 196 410
-rect 142 360 196 376
-rect 70 278 110 303
-rect 80 263 110 278
-rect 166 263 196 360
-rect 238 351 268 565
-rect 358 534 388 565
-rect 334 518 388 534
-rect 430 550 460 565
-rect 516 550 546 565
-rect 430 520 546 550
-rect 334 484 344 518
-rect 378 484 388 518
-rect 334 468 388 484
-rect 479 518 546 520
-rect 479 484 489 518
-rect 523 484 546 518
-rect 479 468 546 484
-rect 420 409 474 425
-rect 420 380 430 409
-rect 358 375 430 380
-rect 464 375 474 409
-rect 238 335 292 351
-rect 238 301 248 335
-rect 282 301 292 335
-rect 238 285 292 301
-rect 358 350 474 375
-rect 238 263 268 285
-rect 358 263 388 350
-rect 516 308 546 468
-rect 430 278 546 308
-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 484 186 518
-rect 152 376 186 410
-rect 344 484 378 518
-rect 489 484 523 518
-rect 430 375 464 409
-rect 248 301 282 335
-<< locali >>
-rect 0 1089 638 1110
-rect 0 1049 51 1089
-rect 85 1049 187 1089
-rect 221 1049 323 1089
-rect 357 1049 459 1089
-rect 493 1049 638 1089
-rect 35 949 69 965
-rect 121 949 155 1049
-rect 121 725 155 741
-rect 279 949 347 965
-rect 35 410 69 605
-rect 152 597 200 631
-rect 268 605 279 623
-rect 471 949 505 1049
-rect 471 725 505 741
-rect 557 949 591 965
-rect 152 518 186 597
-rect 268 589 347 605
-rect 136 484 152 518
-rect 186 484 202 518
-rect 268 483 302 589
-rect 344 518 378 534
-rect 344 410 378 484
-rect 35 376 152 410
-rect 186 376 378 410
-rect 412 409 446 597
-rect 489 518 523 523
-rect 489 468 523 484
-rect 35 215 69 376
-rect 412 375 430 409
-rect 464 375 480 409
-rect 557 335 591 606
-rect 232 301 248 335
-rect 282 301 591 335
-rect 35 115 69 131
-rect 121 215 155 231
-rect 121 61 155 131
-rect 279 227 296 231
-rect 330 227 347 231
-rect 279 215 347 227
-rect 279 115 347 131
-rect 471 215 505 231
-rect 471 61 505 131
-rect 557 215 591 301
-rect 557 115 591 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1083 85 1089
-rect 51 1055 85 1083
-rect 187 1083 221 1089
-rect 187 1055 221 1083
-rect 323 1083 357 1089
-rect 323 1055 357 1083
-rect 459 1083 493 1089
-rect 459 1055 493 1083
-rect 200 597 234 631
-rect 412 597 446 631
-rect 268 449 302 483
-rect 489 523 523 557
-rect 296 227 330 261
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1089 638 1110
-rect 0 1055 51 1089
-rect 85 1055 187 1089
-rect 221 1055 323 1089
-rect 357 1055 459 1089
-rect 493 1055 638 1089
-rect 0 1049 638 1055
-rect 188 631 246 637
-rect 400 631 458 637
-rect 188 597 200 631
-rect 234 597 412 631
-rect 446 597 458 631
-rect 188 591 246 597
-rect 400 591 458 597
-rect 477 557 535 563
-rect 455 523 489 557
-rect 523 523 535 557
-rect 477 517 535 523
-rect 256 483 314 489
-rect 256 449 268 483
-rect 302 449 314 483
-rect 256 443 314 449
-rect 268 267 302 443
-rect 268 261 342 267
-rect 268 227 296 261
-rect 330 227 342 261
-rect 284 221 342 227
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel viali 218 614 218 614 1 A
-port 1 n
-rlabel metal1 285 434 285 434 1 Y
-port 2 n
-rlabel viali 506 540 506 540 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1062 68 1062 1 vdd
-<< end >>
diff --git a/18T_hs/.magicrc b/18T_hs/.magicrc
deleted file mode 100755
index 79cac60..0000000
--- a/18T_hs/.magicrc
+++ /dev/null
@@ -1,105 +0,0 @@
-puts stdout "Sourcing design .magicrc for technology EFS8A ..."
-
-# Put grid on 0.005 pitch. This is important, as some commands don't
-# rescale the grid automatically (such as lef read?).
-
-set scalefac [tech lambda]
-if {[lindex $scalefac 1] < 2} {
- scalegrid 1 2
-}
-
-# drc off
-drc euclidean on
-
-#set PDKPATH "~/projects/efabless/tech/SkyWater/EFS8A"
-
-# loading technology
-#tech load $PDKPATH/libs.tech/magic/EFS8A.tech
-tech load ../../char/techfiles/sky130A.tech
-
-# load device generator
-#source $PDKPATH/libs.tech/magic/EFS8A.tcl
-
-# load bind keys (optional)
-# source $PDKPATH/libs.tech/magic/EFS8A-BindKeys
-
-# set units to lambda grid
-snap internal
-
-# add path to reference cells
-#set MAGPATH "${PDKPATH}/libs.ref/mag"
-#addpath ${MAGPATH}/primdev
-#addpath ${MAGPATH}/s8fmlt
-#addpath ${MAGPATH}/s8iom0
-#addpath ${MAGPATH}/scs8hd
-#addpath ${MAGPATH}/scs8hdll
-#addpath ${MAGPATH}/scs8hvl
-#addpath ${MAGPATH}/scs8hs
-#addpath ${MAGPATH}/scs8ms
-#addpath ${MAGPATH}/scs8ls
-#addpath ${MAGPATH}/scs8lp
-
-# add path to GDS cells
-
-# add path to IP from catalog. This procedure defined in the PDK script.
-catch {magic::query_mylib_ip}
-# add path to local IP from user design space. Defined in the PDK script.
-catch {magic::query_my_projects}
-
-macro Shift_G "grid 74"
-macro XK_Left "scroll l .1 w"
-macro Shift_XK_Left "scroll l 1 w"
-macro Control_XK_Left "box grow w 1"
-macro Control_Shift_XK_Left "box shrink e 1"
-macro XK_Right "scroll r .1 w"
-macro Shift_XK_Right "scroll r 1 w"
-macro Control_XK_Right "box grow e 1"
-macro Control_Shift_XK_Right "box shrink w 1"
-macro XK_Up "scroll u .1 w"
-macro Shift_XK_Up "scroll u 1 w"
-macro Control_XK_Up "box grow n 1"
-macro Control_Shift_XK_Up "box shrink s 1"
-macro XK_Down "scroll d .1 w"
-macro Shift_XK_Down "scroll d 1 w"
-macro Control_XK_Down "box grow s 1"
-macro Control_Shift_XK_Down "box shrink n 1"
-
-macro XK_Pointer_Button4 "scroll u .05 w"
-macro XK_Pointer_Button5 "scroll d .05 w"
-macro . "history redo -1"
-
-macro XK_L "select less area {ndif pdif nwell poly}"
-macro XK_K "select less area nwell"
-macro XK_J "select less area {m1 lic}"
-macro XK_H "select less area li1"
-macro Control_Shift_XK_X "rotate"
-macro Shift_XK_Pointer_Button4 "stretch N 74"
-macro Shift_XK_Pointer_Button5 "stretch S 74"
-macro Control_XK_Pointer_Button4 "stretch N 34"
-macro Control_XK_Pointer_Button5 "stretch S 34"
-macro Control_Shift_XK_Q "stretch W 88"
-macro Control_Shift_XK_R "stretch E 88"
-macro Control_Shift_XK_W "stretch N 28"
-macro Control_Shift_XK_E "stretch N 4"
-macro XK_Y "stretch N 6"
-#macro Control_Shift_XK_W "stretch S 6"
-#macro Control_Shift_XK_E "stretch S 8"
-
-macro Control_Shift_XK_Pointer_Button4 "stretch N 17"
-macro Control_Shift_XK_Pointer_Button5 "stretch S 17"
-macro Control_Shift_XK_G "select area {m1 lic}"
-macro Control_Shift_XK_F "select area {poly polycont}"
-macro Control_Shift_XK_D "select area {ndc li1}"
-macro Control_Shift_XK_S "select area ntrans"
-
-macro Shift_D "select clear; move S 10; paint m1c"
-macro Shift_F "select clear; move N 10; paint m1c"
-
-
-macro Shift_B "box height 1.0um; move S 1.655um; select area; erase; select clear; move N 1um; select area; move S 1um; select clear; box height 0.26um; move S 4.35um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.26um; select clear; box height 20um; select area; move S 0.26um"
-
-
-macro Shift_N "box height 1.74um; move S 2.395um; select area; erase; select clear; move N 1.74um; select area; move S 1.74um; select clear; box height 0.48um; move S 3.61um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.48um; select clear; box height 20um; select area; move S 0.48um"
-
-
-macro Shift_M "box height 1.02um; move S 2.015um; select area; erase; select clear; move N 1.02um; box height 1.20um; select area; move S 1.02um; select clear; box height 0.12um; move S 0.56um; select area; erase; select clear; box height 5.00um; select area; move S 0.12um; select clear; move N 0.12um; box height 0.21um; move S 2.98um; select area;erase; select clear; box height 1.105um; move S 1.105um; select area; move N 0.21um; select clear; box height 0.17um; move N 0.825um; select area; erase; move S 0.825um; box height 0.825um; select area; move N 0.17um"
diff --git a/18T_hs/sky130_osu_sc_18T_hs__addf_1.mag b/18T_hs/sky130_osu_sc_18T_hs__addf_1.mag
deleted file mode 100644
index 5814314..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__addf_1.mag
+++ /dev/null
@@ -1,650 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864610
-<< checkpaint >>
-rect -1209 -1243 2569 2575
-<< nwell >>
-rect -9 581 1435 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 410 617 440 1217
-rect 496 617 526 1217
-rect 582 617 612 1217
-rect 668 617 698 1217
-rect 754 617 784 1217
-rect 840 617 870 1217
-rect 922 617 952 1217
-rect 1004 617 1034 1217
-rect 1102 617 1132 1217
-rect 1292 617 1322 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 410 115 440 315
-rect 496 115 526 315
-rect 582 115 612 315
-rect 668 115 698 315
-rect 754 115 784 315
-rect 840 115 870 315
-rect 922 115 952 315
-rect 1004 115 1034 315
-rect 1102 115 1132 315
-rect 1292 115 1322 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 199 166 315
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 115 410 315
-rect 440 267 496 315
-rect 440 131 451 267
-rect 485 131 496 267
-rect 440 115 496 131
-rect 526 267 582 315
-rect 526 131 537 267
-rect 571 131 582 267
-rect 526 115 582 131
-rect 612 199 668 315
-rect 612 131 623 199
-rect 657 131 668 199
-rect 612 115 668 131
-rect 698 267 754 315
-rect 698 131 709 267
-rect 743 131 754 267
-rect 698 115 754 131
-rect 784 199 840 315
-rect 784 131 795 199
-rect 829 131 840 199
-rect 784 115 840 131
-rect 870 115 922 315
-rect 952 115 1004 315
-rect 1034 267 1102 315
-rect 1034 131 1045 267
-rect 1079 131 1102 267
-rect 1034 115 1102 131
-rect 1132 199 1185 315
-rect 1132 131 1143 199
-rect 1177 131 1185 199
-rect 1132 115 1185 131
-rect 1239 199 1292 315
-rect 1239 131 1247 199
-rect 1281 131 1292 199
-rect 1239 115 1292 131
-rect 1322 267 1375 315
-rect 1322 131 1333 267
-rect 1367 131 1375 267
-rect 1322 115 1375 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 725 293 1201
-rect 327 725 338 1201
-rect 282 617 338 725
-rect 368 617 410 1217
-rect 440 1201 496 1217
-rect 440 725 451 1201
-rect 485 725 496 1201
-rect 440 617 496 725
-rect 526 1201 582 1217
-rect 526 725 537 1201
-rect 571 725 582 1201
-rect 526 617 582 725
-rect 612 1201 668 1217
-rect 612 793 623 1201
-rect 657 793 668 1201
-rect 612 617 668 793
-rect 698 1201 754 1217
-rect 698 725 709 1201
-rect 743 725 754 1201
-rect 698 617 754 725
-rect 784 1201 840 1217
-rect 784 725 795 1201
-rect 829 725 840 1201
-rect 784 617 840 725
-rect 870 617 922 1217
-rect 952 617 1004 1217
-rect 1034 1201 1102 1217
-rect 1034 793 1045 1201
-rect 1079 793 1102 1201
-rect 1034 617 1102 793
-rect 1132 1201 1185 1217
-rect 1132 725 1143 1201
-rect 1177 725 1185 1201
-rect 1132 617 1185 725
-rect 1239 1201 1292 1217
-rect 1239 657 1247 1201
-rect 1281 657 1292 1201
-rect 1239 617 1292 657
-rect 1322 1201 1375 1217
-rect 1322 657 1333 1201
-rect 1367 657 1375 1201
-rect 1322 617 1375 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 199
-rect 207 131 241 267
-rect 293 131 327 267
-rect 451 131 485 267
-rect 537 131 571 267
-rect 623 131 657 199
-rect 709 131 743 267
-rect 795 131 829 199
-rect 1045 131 1079 267
-rect 1143 131 1177 199
-rect 1247 131 1281 199
-rect 1333 131 1367 267
-<< pdiffc >>
-rect 35 725 69 1201
-rect 121 793 155 1201
-rect 207 725 241 1201
-rect 293 725 327 1201
-rect 451 725 485 1201
-rect 537 725 571 1201
-rect 623 793 657 1201
-rect 709 725 743 1201
-rect 795 725 829 1201
-rect 1045 793 1079 1201
-rect 1143 725 1177 1201
-rect 1247 657 1281 1201
-rect 1333 657 1367 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-rect 979 1271 1003 1305
-rect 1037 1271 1061 1305
-rect 1115 1271 1139 1305
-rect 1173 1271 1197 1305
-rect 1251 1271 1275 1305
-rect 1309 1271 1333 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-rect 1003 1271 1037 1305
-rect 1139 1271 1173 1305
-rect 1275 1271 1309 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1245
-rect 338 1217 368 1245
-rect 410 1217 440 1243
-rect 496 1217 526 1243
-rect 582 1217 612 1245
-rect 668 1217 698 1245
-rect 754 1217 784 1245
-rect 840 1217 870 1245
-rect 922 1217 952 1245
-rect 1004 1217 1034 1245
-rect 1102 1217 1132 1245
-rect 1292 1217 1322 1245
-rect 80 403 110 617
-rect 166 585 196 617
-rect 152 569 206 585
-rect 152 535 162 569
-rect 196 535 206 569
-rect 152 519 206 535
-rect 70 387 124 403
-rect 70 353 80 387
-rect 114 353 124 387
-rect 70 337 124 353
-rect 80 315 110 337
-rect 166 315 196 519
-rect 252 477 282 617
-rect 338 519 368 617
-rect 410 592 440 617
-rect 496 592 526 617
-rect 410 562 526 592
-rect 338 503 430 519
-rect 238 461 292 477
-rect 238 427 248 461
-rect 282 427 292 461
-rect 238 411 292 427
-rect 338 469 386 503
-rect 420 469 430 503
-rect 338 453 430 469
-rect 252 315 282 411
-rect 338 315 368 453
-rect 472 403 502 562
-rect 582 403 612 617
-rect 668 551 698 617
-rect 656 535 710 551
-rect 656 501 666 535
-rect 700 501 710 535
-rect 656 485 710 501
-rect 472 387 526 403
-rect 472 367 482 387
-rect 410 353 482 367
-rect 516 353 526 387
-rect 410 337 526 353
-rect 568 387 622 403
-rect 568 353 578 387
-rect 612 353 622 387
-rect 568 337 622 353
-rect 410 315 440 337
-rect 496 315 526 337
-rect 582 315 612 337
-rect 668 315 698 485
-rect 754 403 784 617
-rect 840 551 870 617
-rect 826 535 880 551
-rect 826 501 836 535
-rect 870 501 880 535
-rect 826 485 880 501
-rect 922 513 952 617
-rect 1004 585 1034 617
-rect 1004 555 1048 585
-rect 1102 584 1132 617
-rect 922 497 976 513
-rect 742 387 796 403
-rect 742 353 752 387
-rect 786 353 796 387
-rect 742 337 796 353
-rect 754 315 784 337
-rect 840 315 870 485
-rect 922 463 932 497
-rect 966 463 976 497
-rect 922 447 976 463
-rect 922 315 952 447
-rect 1018 403 1048 555
-rect 1090 568 1144 584
-rect 1292 581 1322 617
-rect 1090 534 1100 568
-rect 1134 534 1144 568
-rect 1090 518 1144 534
-rect 1255 565 1322 581
-rect 1255 531 1265 565
-rect 1299 531 1322 565
-rect 1004 387 1058 403
-rect 1004 353 1014 387
-rect 1048 353 1058 387
-rect 1004 337 1058 353
-rect 1004 315 1034 337
-rect 1102 315 1132 518
-rect 1255 515 1322 531
-rect 1292 315 1322 515
-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 535 196 569
-rect 80 353 114 387
-rect 248 427 282 461
-rect 386 469 420 503
-rect 666 501 700 535
-rect 482 353 516 387
-rect 578 353 612 387
-rect 836 501 870 535
-rect 752 353 786 387
-rect 932 463 966 497
-rect 1100 534 1134 568
-rect 1265 531 1299 565
-rect 1014 353 1048 387
-<< locali >>
-rect 0 1311 1408 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 1003 1311
-rect 1037 1271 1139 1311
-rect 1173 1271 1275 1311
-rect 1309 1271 1408 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 709 69 725
-rect 207 709 241 725
-rect 35 675 241 709
-rect 293 1201 327 1217
-rect 293 642 327 725
-rect 451 1201 485 1271
-rect 451 709 485 725
-rect 537 1201 571 1217
-rect 623 1201 657 1271
-rect 623 777 657 793
-rect 709 1201 743 1217
-rect 537 708 571 725
-rect 709 708 743 725
-rect 537 674 743 708
-rect 795 1201 829 1217
-rect 1045 1201 1079 1271
-rect 1045 777 1079 793
-rect 1143 1201 1177 1217
-rect 795 684 829 725
-rect 1143 684 1177 725
-rect 795 650 1100 684
-rect 293 605 350 642
-rect 795 641 829 650
-rect 80 535 162 569
-rect 196 535 212 569
-rect 248 461 282 477
-rect 248 411 282 427
-rect 64 353 80 387
-rect 114 353 130 387
-rect 316 370 350 605
-rect 752 606 829 641
-rect 578 535 612 541
-rect 386 503 444 535
-rect 420 501 444 503
-rect 650 501 666 535
-rect 700 501 716 535
-rect 386 453 420 469
-rect 578 387 612 501
-rect 666 461 700 501
-rect 752 461 786 606
-rect 1066 584 1100 650
-rect 1247 1201 1281 1271
-rect 1177 650 1202 667
-rect 1143 633 1202 650
-rect 1247 641 1281 657
-rect 1333 1201 1367 1217
-rect 1066 568 1134 584
-rect 1066 537 1100 568
-rect 820 501 836 535
-rect 870 501 886 535
-rect 1089 534 1100 537
-rect 1100 518 1134 534
-rect 932 497 966 513
-rect 932 461 966 463
-rect 1168 461 1202 633
-rect 1333 609 1367 657
-rect 752 427 879 461
-rect 1143 427 1202 461
-rect 1265 565 1299 581
-rect 293 336 350 370
-rect 466 353 482 387
-rect 516 353 532 387
-rect 736 353 752 387
-rect 786 353 811 387
-rect 578 337 612 353
-rect 293 313 327 336
-rect 35 267 241 286
-rect 69 252 207 267
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 207 114 241 131
-rect 777 313 811 353
-rect 293 267 327 279
-rect 293 114 327 131
-rect 451 267 485 283
-rect 451 61 485 131
-rect 537 267 743 286
-rect 571 252 709 267
-rect 537 114 571 131
-rect 623 199 657 215
-rect 623 61 657 131
-rect 845 215 879 427
-rect 998 353 1014 387
-rect 1048 353 1064 387
-rect 709 114 743 131
-rect 795 199 879 215
-rect 829 181 879 199
-rect 1045 267 1079 283
-rect 795 114 829 131
-rect 1045 61 1079 131
-rect 1143 199 1177 427
-rect 1265 313 1299 531
-rect 1245 279 1299 313
-rect 1333 267 1367 575
-rect 1143 115 1177 131
-rect 1247 199 1281 215
-rect 1247 61 1281 131
-rect 1333 115 1367 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 1003 1305 1037 1311
-rect 1003 1277 1037 1305
-rect 1139 1305 1173 1311
-rect 1139 1277 1173 1305
-rect 1275 1305 1309 1311
-rect 1275 1277 1309 1305
-rect 80 501 114 535
-rect 248 427 282 461
-rect 80 353 114 387
-rect 444 501 478 535
-rect 578 501 612 535
-rect 666 427 700 461
-rect 1143 650 1177 684
-rect 836 501 870 535
-rect 932 427 966 461
-rect 482 353 516 387
-rect 293 279 327 313
-rect 777 279 811 313
-rect 1014 353 1048 387
-rect 1211 279 1245 313
-rect 1333 575 1367 609
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1311 1408 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 1003 1311
-rect 1037 1277 1139 1311
-rect 1173 1277 1275 1311
-rect 1309 1277 1408 1311
-rect 0 1271 1408 1277
-rect 1131 684 1189 690
-rect 1109 650 1143 684
-rect 1177 650 1189 684
-rect 1131 644 1189 650
-rect 1321 609 1379 615
-rect 1299 575 1333 609
-rect 1367 575 1379 609
-rect 1321 569 1379 575
-rect 68 535 126 541
-rect 432 535 490 541
-rect 566 535 624 541
-rect 824 535 882 541
-rect 68 501 80 535
-rect 114 501 444 535
-rect 478 501 578 535
-rect 612 502 836 535
-rect 612 501 734 502
-rect 812 501 836 502
-rect 870 501 882 535
-rect 68 495 126 501
-rect 432 495 490 501
-rect 566 495 624 501
-rect 824 495 882 501
-rect 236 461 294 467
-rect 654 461 712 467
-rect 920 461 978 467
-rect 80 427 248 461
-rect 282 427 666 461
-rect 700 427 932 461
-rect 966 427 978 461
-rect 236 421 294 427
-rect 654 421 712 427
-rect 920 421 978 427
-rect 68 387 126 393
-rect 470 387 528 393
-rect 1002 387 1060 393
-rect 68 353 80 387
-rect 114 353 482 387
-rect 516 353 1014 387
-rect 1048 353 1060 387
-rect 68 347 126 353
-rect 470 347 528 353
-rect 1002 347 1060 353
-rect 281 313 339 319
-rect 765 313 823 319
-rect 1199 313 1257 319
-rect 281 279 293 313
-rect 327 279 777 313
-rect 811 279 1211 313
-rect 1245 279 1257 313
-rect 281 273 339 279
-rect 765 273 823 279
-rect 1199 273 1257 279
-rect 0 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel metal1 97 370 97 370 1 A
-port 1 n
-rlabel metal1 265 444 265 444 1 CI
-port 2 n
-rlabel metal1 129 518 129 518 1 B
-port 3 n
-rlabel metal1 1228 296 1228 296 1 CON
-port 4 n
-rlabel metal1 1160 667 1160 667 1 S
-port 5 n
-rlabel metal1 1350 592 1350 592 1 CO
-port 6 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__addf_l.mag b/18T_hs/sky130_osu_sc_18T_hs__addf_l.mag
deleted file mode 100644
index 264268a..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__addf_l.mag
+++ /dev/null
@@ -1,652 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864611
-<< checkpaint >>
-rect -1209 -1243 2569 2575
-<< nwell >>
-rect -9 581 1435 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 410 617 440 1217
-rect 496 617 526 1217
-rect 582 617 612 1217
-rect 668 617 698 1217
-rect 754 617 784 1217
-rect 840 617 870 1217
-rect 922 617 952 1217
-rect 1004 617 1034 1217
-rect 1102 817 1132 1217
-rect 1292 817 1322 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 410 115 440 315
-rect 496 115 526 315
-rect 582 115 612 315
-rect 668 115 698 315
-rect 754 115 784 315
-rect 840 115 870 315
-rect 922 115 952 315
-rect 1004 115 1034 315
-rect 1102 115 1132 263
-rect 1292 115 1322 263
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 199 166 315
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 115 410 315
-rect 440 267 496 315
-rect 440 131 451 267
-rect 485 131 496 267
-rect 440 115 496 131
-rect 526 267 582 315
-rect 526 131 537 267
-rect 571 131 582 267
-rect 526 115 582 131
-rect 612 199 668 315
-rect 612 131 623 199
-rect 657 131 668 199
-rect 612 115 668 131
-rect 698 267 754 315
-rect 698 131 709 267
-rect 743 131 754 267
-rect 698 115 754 131
-rect 784 199 840 315
-rect 784 131 795 199
-rect 829 131 840 199
-rect 784 115 840 131
-rect 870 115 922 315
-rect 952 115 1004 315
-rect 1034 267 1087 315
-rect 1034 131 1045 267
-rect 1079 263 1087 267
-rect 1079 131 1102 263
-rect 1034 115 1102 131
-rect 1132 199 1185 263
-rect 1132 131 1143 199
-rect 1177 131 1185 199
-rect 1132 115 1185 131
-rect 1239 199 1292 263
-rect 1239 131 1247 199
-rect 1281 131 1292 199
-rect 1239 115 1292 131
-rect 1322 199 1375 263
-rect 1322 131 1333 199
-rect 1367 131 1375 199
-rect 1322 115 1375 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 725 293 1201
-rect 327 725 338 1201
-rect 282 617 338 725
-rect 368 617 410 1217
-rect 440 1201 496 1217
-rect 440 725 451 1201
-rect 485 725 496 1201
-rect 440 617 496 725
-rect 526 1201 582 1217
-rect 526 725 537 1201
-rect 571 725 582 1201
-rect 526 617 582 725
-rect 612 1201 668 1217
-rect 612 793 623 1201
-rect 657 793 668 1201
-rect 612 617 668 793
-rect 698 1201 754 1217
-rect 698 725 709 1201
-rect 743 725 754 1201
-rect 698 617 754 725
-rect 784 1201 840 1217
-rect 784 725 795 1201
-rect 829 725 840 1201
-rect 784 617 840 725
-rect 870 617 922 1217
-rect 952 617 1004 1217
-rect 1034 1201 1102 1217
-rect 1034 793 1045 1201
-rect 1079 817 1102 1201
-rect 1132 1201 1185 1217
-rect 1132 855 1143 1201
-rect 1177 855 1185 1201
-rect 1132 817 1185 855
-rect 1239 1201 1292 1217
-rect 1239 855 1247 1201
-rect 1281 855 1292 1201
-rect 1239 817 1292 855
-rect 1322 1201 1375 1217
-rect 1322 855 1333 1201
-rect 1367 855 1375 1201
-rect 1322 817 1375 855
-rect 1079 793 1087 817
-rect 1034 617 1087 793
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 199
-rect 207 131 241 267
-rect 293 131 327 267
-rect 451 131 485 267
-rect 537 131 571 267
-rect 623 131 657 199
-rect 709 131 743 267
-rect 795 131 829 199
-rect 1045 131 1079 267
-rect 1143 131 1177 199
-rect 1247 131 1281 199
-rect 1333 131 1367 199
-<< pdiffc >>
-rect 35 725 69 1201
-rect 121 793 155 1201
-rect 207 725 241 1201
-rect 293 725 327 1201
-rect 451 725 485 1201
-rect 537 725 571 1201
-rect 623 793 657 1201
-rect 709 725 743 1201
-rect 795 725 829 1201
-rect 1045 793 1079 1201
-rect 1143 855 1177 1201
-rect 1247 855 1281 1201
-rect 1333 855 1367 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-rect 979 1271 1003 1305
-rect 1037 1271 1061 1305
-rect 1115 1271 1139 1305
-rect 1173 1271 1197 1305
-rect 1251 1271 1275 1305
-rect 1309 1271 1333 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-rect 1003 1271 1037 1305
-rect 1139 1271 1173 1305
-rect 1275 1271 1309 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1245
-rect 338 1217 368 1245
-rect 410 1217 440 1243
-rect 496 1217 526 1243
-rect 582 1217 612 1245
-rect 668 1217 698 1245
-rect 754 1217 784 1245
-rect 840 1217 870 1245
-rect 922 1217 952 1245
-rect 1004 1217 1034 1245
-rect 1102 1217 1132 1245
-rect 1292 1217 1322 1245
-rect 80 403 110 617
-rect 166 585 196 617
-rect 152 569 206 585
-rect 152 535 162 569
-rect 196 535 206 569
-rect 152 519 206 535
-rect 70 387 124 403
-rect 70 353 80 387
-rect 114 353 124 387
-rect 70 337 124 353
-rect 80 315 110 337
-rect 166 315 196 519
-rect 252 477 282 617
-rect 338 519 368 617
-rect 410 592 440 617
-rect 496 592 526 617
-rect 410 562 526 592
-rect 338 503 430 519
-rect 238 461 292 477
-rect 238 427 248 461
-rect 282 427 292 461
-rect 238 411 292 427
-rect 338 469 386 503
-rect 420 469 430 503
-rect 338 453 430 469
-rect 252 315 282 411
-rect 338 315 368 453
-rect 472 403 502 562
-rect 582 403 612 617
-rect 668 551 698 617
-rect 656 535 710 551
-rect 656 501 666 535
-rect 700 501 710 535
-rect 656 485 710 501
-rect 472 387 526 403
-rect 472 367 482 387
-rect 410 353 482 367
-rect 516 353 526 387
-rect 410 337 526 353
-rect 568 387 622 403
-rect 568 353 578 387
-rect 612 353 622 387
-rect 568 337 622 353
-rect 410 315 440 337
-rect 496 315 526 337
-rect 582 315 612 337
-rect 668 315 698 485
-rect 754 403 784 617
-rect 840 551 870 617
-rect 826 535 880 551
-rect 826 501 836 535
-rect 870 501 880 535
-rect 826 485 880 501
-rect 922 513 952 617
-rect 1004 585 1034 617
-rect 1004 555 1048 585
-rect 1102 584 1132 817
-rect 922 497 976 513
-rect 742 387 796 403
-rect 742 353 752 387
-rect 786 353 796 387
-rect 742 337 796 353
-rect 754 315 784 337
-rect 840 315 870 485
-rect 922 463 932 497
-rect 966 463 976 497
-rect 922 447 976 463
-rect 922 315 952 447
-rect 1018 403 1048 555
-rect 1090 568 1144 584
-rect 1292 581 1322 817
-rect 1090 534 1100 568
-rect 1134 534 1144 568
-rect 1090 518 1144 534
-rect 1255 565 1322 581
-rect 1255 531 1265 565
-rect 1299 531 1322 565
-rect 1004 387 1058 403
-rect 1004 353 1014 387
-rect 1048 353 1058 387
-rect 1004 337 1058 353
-rect 1004 315 1034 337
-rect 1102 263 1132 518
-rect 1255 515 1322 531
-rect 1292 263 1322 515
-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 535 196 569
-rect 80 353 114 387
-rect 248 427 282 461
-rect 386 469 420 503
-rect 666 501 700 535
-rect 482 353 516 387
-rect 578 353 612 387
-rect 836 501 870 535
-rect 752 353 786 387
-rect 932 463 966 497
-rect 1100 534 1134 568
-rect 1265 531 1299 565
-rect 1014 353 1048 387
-<< locali >>
-rect 0 1311 1408 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 1003 1311
-rect 1037 1271 1139 1311
-rect 1173 1271 1275 1311
-rect 1309 1271 1408 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 709 69 725
-rect 207 709 241 725
-rect 35 675 241 709
-rect 293 1201 327 1217
-rect 293 642 327 725
-rect 451 1201 485 1271
-rect 451 709 485 725
-rect 537 1201 571 1217
-rect 623 1201 657 1271
-rect 623 777 657 793
-rect 709 1201 743 1217
-rect 537 708 571 725
-rect 709 708 743 725
-rect 537 674 743 708
-rect 795 1201 829 1217
-rect 1045 1201 1079 1271
-rect 1045 777 1079 793
-rect 1143 1201 1177 1217
-rect 795 684 829 725
-rect 1143 690 1177 855
-rect 1247 1201 1281 1271
-rect 1247 839 1281 855
-rect 1333 1201 1367 1217
-rect 795 650 1100 684
-rect 293 605 350 642
-rect 795 641 829 650
-rect 80 535 162 569
-rect 196 535 212 569
-rect 248 461 282 477
-rect 248 411 282 427
-rect 64 353 80 387
-rect 114 353 130 387
-rect 316 370 350 605
-rect 752 606 829 641
-rect 578 535 612 541
-rect 386 503 444 535
-rect 420 501 444 503
-rect 650 501 666 535
-rect 700 501 716 535
-rect 386 453 420 469
-rect 578 387 612 501
-rect 666 461 700 501
-rect 752 461 786 606
-rect 1066 584 1100 650
-rect 1177 656 1202 667
-rect 1143 633 1202 656
-rect 1066 568 1134 584
-rect 1066 537 1100 568
-rect 820 501 836 535
-rect 870 501 886 535
-rect 1089 534 1100 537
-rect 1100 518 1134 534
-rect 932 497 966 513
-rect 932 461 966 463
-rect 1168 461 1202 633
-rect 1333 609 1367 855
-rect 752 427 879 461
-rect 1143 427 1202 461
-rect 1265 565 1299 581
-rect 293 336 350 370
-rect 466 353 482 387
-rect 516 353 532 387
-rect 736 353 752 387
-rect 786 353 811 387
-rect 578 337 612 353
-rect 293 313 327 336
-rect 35 267 241 286
-rect 69 252 207 267
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 207 114 241 131
-rect 777 313 811 353
-rect 293 267 327 279
-rect 293 114 327 131
-rect 451 267 485 283
-rect 451 61 485 131
-rect 537 267 743 286
-rect 571 252 709 267
-rect 537 114 571 131
-rect 623 199 657 215
-rect 623 61 657 131
-rect 845 215 879 427
-rect 998 353 1014 387
-rect 1048 353 1064 387
-rect 709 114 743 131
-rect 795 199 879 215
-rect 829 181 879 199
-rect 1045 267 1079 283
-rect 795 114 829 131
-rect 1045 61 1079 131
-rect 1143 199 1177 427
-rect 1265 313 1299 531
-rect 1245 279 1299 313
-rect 1143 115 1177 131
-rect 1247 199 1281 215
-rect 1247 61 1281 131
-rect 1333 199 1367 575
-rect 1333 115 1367 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 1003 1305 1037 1311
-rect 1003 1277 1037 1305
-rect 1139 1305 1173 1311
-rect 1139 1277 1173 1305
-rect 1275 1305 1309 1311
-rect 1275 1277 1309 1305
-rect 80 501 114 535
-rect 248 427 282 461
-rect 80 353 114 387
-rect 444 501 478 535
-rect 578 501 612 535
-rect 666 427 700 461
-rect 1143 656 1177 690
-rect 836 501 870 535
-rect 932 427 966 461
-rect 482 353 516 387
-rect 293 279 327 313
-rect 777 279 811 313
-rect 1014 353 1048 387
-rect 1211 279 1245 313
-rect 1333 575 1367 609
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1311 1408 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 1003 1311
-rect 1037 1277 1139 1311
-rect 1173 1277 1275 1311
-rect 1309 1277 1408 1311
-rect 0 1271 1408 1277
-rect 1131 690 1189 696
-rect 1109 656 1143 690
-rect 1177 656 1189 690
-rect 1131 650 1189 656
-rect 1321 609 1379 615
-rect 1299 575 1333 609
-rect 1367 575 1379 609
-rect 1321 569 1379 575
-rect 68 535 126 541
-rect 432 535 490 541
-rect 566 535 624 541
-rect 824 535 882 541
-rect 68 501 80 535
-rect 114 501 444 535
-rect 478 501 578 535
-rect 612 502 836 535
-rect 612 501 734 502
-rect 812 501 836 502
-rect 870 501 882 535
-rect 68 495 126 501
-rect 432 495 490 501
-rect 566 495 624 501
-rect 824 495 882 501
-rect 236 461 294 467
-rect 654 461 712 467
-rect 920 461 978 467
-rect 80 427 248 461
-rect 282 427 666 461
-rect 700 427 932 461
-rect 966 427 978 461
-rect 236 421 294 427
-rect 654 421 712 427
-rect 920 421 978 427
-rect 68 387 126 393
-rect 470 387 528 393
-rect 1002 387 1060 393
-rect 68 353 80 387
-rect 114 353 482 387
-rect 516 353 1014 387
-rect 1048 353 1060 387
-rect 68 347 126 353
-rect 470 347 528 353
-rect 1002 347 1060 353
-rect 281 313 339 319
-rect 765 313 823 319
-rect 1199 313 1257 319
-rect 281 279 293 313
-rect 327 279 777 313
-rect 811 279 1211 313
-rect 1245 279 1257 313
-rect 281 273 339 279
-rect 765 273 823 279
-rect 1199 273 1257 279
-rect 0 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel metal1 97 370 97 370 1 A
-port 1 n
-rlabel metal1 265 444 265 444 1 CI
-port 2 n
-rlabel metal1 129 518 129 518 1 B
-port 3 n
-rlabel metal1 1350 592 1350 592 1 CO
-port 5 n
-rlabel metal1 1160 673 1160 673 1 S
-port 6 n
-rlabel metal1 1228 296 1228 296 1 CON
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__addh_1.mag b/18T_hs/sky130_osu_sc_18T_hs__addh_1.mag
deleted file mode 100644
index 382f266..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__addh_1.mag
+++ /dev/null
@@ -1,393 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864611
-<< checkpaint >>
-rect -1209 -1243 2025 2575
-<< nwell >>
-rect -9 581 837 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 178 617 208 1217
-rect 264 617 294 1217
-rect 362 617 392 1217
-rect 552 617 582 1217
-rect 638 617 668 1217
-rect 710 617 740 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 178 115 208 315
-rect 250 115 280 315
-rect 442 115 472 315
-rect 540 115 570 315
-rect 626 115 656 315
-rect 712 115 742 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 178 315
-rect 110 131 133 267
-rect 167 131 178 267
-rect 110 115 178 131
-rect 208 115 250 315
-rect 280 267 333 315
-rect 280 131 291 267
-rect 325 131 333 267
-rect 280 115 333 131
-rect 389 267 442 315
-rect 389 131 397 267
-rect 431 131 442 267
-rect 389 115 442 131
-rect 472 267 540 315
-rect 472 131 495 267
-rect 529 131 540 267
-rect 472 115 540 131
-rect 570 267 626 315
-rect 570 131 581 267
-rect 615 131 626 267
-rect 570 115 626 131
-rect 656 267 712 315
-rect 656 199 667 267
-rect 701 199 712 267
-rect 656 115 712 199
-rect 742 267 795 315
-rect 742 131 753 267
-rect 787 131 795 267
-rect 742 115 795 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 178 1217
-rect 110 657 133 1201
-rect 167 657 178 1201
-rect 110 617 178 657
-rect 208 1201 264 1217
-rect 208 725 219 1201
-rect 253 725 264 1201
-rect 208 617 264 725
-rect 294 1201 362 1217
-rect 294 725 305 1201
-rect 339 725 362 1201
-rect 294 617 362 725
-rect 392 1201 445 1217
-rect 392 657 403 1201
-rect 437 657 445 1201
-rect 392 617 445 657
-rect 499 1201 552 1217
-rect 499 657 507 1201
-rect 541 657 552 1201
-rect 499 617 552 657
-rect 582 1201 638 1217
-rect 582 657 593 1201
-rect 627 657 638 1201
-rect 582 617 638 657
-rect 668 617 710 1217
-rect 740 1201 796 1217
-rect 740 657 751 1201
-rect 785 657 796 1201
-rect 740 617 796 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 133 131 167 267
-rect 291 131 325 267
-rect 397 131 431 267
-rect 495 131 529 267
-rect 581 131 615 267
-rect 667 199 701 267
-rect 753 131 787 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 133 657 167 1201
-rect 219 725 253 1201
-rect 305 725 339 1201
-rect 403 657 437 1201
-rect 507 657 541 1201
-rect 593 657 627 1201
-rect 751 657 785 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 178 1217 208 1243
-rect 264 1217 294 1243
-rect 362 1217 392 1243
-rect 552 1217 582 1243
-rect 638 1217 668 1243
-rect 710 1217 740 1243
-rect 80 403 110 617
-rect 178 477 208 617
-rect 264 551 294 617
-rect 154 461 208 477
-rect 154 427 164 461
-rect 198 427 208 461
-rect 154 411 208 427
-rect 43 387 110 403
-rect 43 353 53 387
-rect 87 353 110 387
-rect 43 337 110 353
-rect 80 315 110 337
-rect 178 315 208 411
-rect 250 535 304 551
-rect 250 501 260 535
-rect 294 501 304 535
-rect 250 485 304 501
-rect 362 549 392 617
-rect 552 549 582 617
-rect 362 519 582 549
-rect 250 315 280 485
-rect 362 424 392 519
-rect 638 477 668 617
-rect 710 551 740 617
-rect 710 535 764 551
-rect 710 501 720 535
-rect 754 501 764 535
-rect 710 485 764 501
-rect 338 408 392 424
-rect 614 461 668 477
-rect 614 427 624 461
-rect 658 427 668 461
-rect 614 411 668 427
-rect 338 374 348 408
-rect 382 375 392 408
-rect 382 374 570 375
-rect 338 345 570 374
-rect 442 315 472 345
-rect 540 315 570 345
-rect 626 315 656 411
-rect 712 315 742 485
-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 427 198 461
-rect 53 353 87 387
-rect 260 501 294 535
-rect 720 501 754 535
-rect 624 427 658 461
-rect 348 374 382 408
-<< locali >>
-rect 0 1311 836 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 836 1311
-rect 35 1201 69 1217
-rect 35 623 69 649
-rect 133 1201 167 1271
-rect 133 641 167 657
-rect 219 1201 253 1217
-rect 219 619 253 725
-rect 305 1201 339 1271
-rect 305 709 339 725
-rect 403 1201 437 1217
-rect 219 585 362 619
-rect 260 535 294 551
-rect 260 485 294 501
-rect 148 427 164 461
-rect 198 427 214 461
-rect 328 424 362 585
-rect 403 609 437 657
-rect 507 1201 541 1217
-rect 403 575 418 609
-rect 328 408 382 424
-rect 328 392 348 408
-rect 37 353 53 387
-rect 87 353 110 387
-rect 291 374 348 392
-rect 291 358 382 374
-rect 35 267 69 278
-rect 35 115 69 131
-rect 133 267 167 283
-rect 133 61 167 131
-rect 291 267 325 358
-rect 418 312 452 575
-rect 507 607 541 657
-rect 593 1201 627 1271
-rect 593 641 627 657
-rect 751 1201 785 1217
-rect 751 607 785 657
-rect 507 573 785 607
-rect 507 387 541 573
-rect 704 501 720 535
-rect 754 501 770 535
-rect 608 427 624 461
-rect 658 427 674 461
-rect 541 353 667 387
-rect 291 115 325 131
-rect 397 277 452 312
-rect 397 267 431 277
-rect 397 115 431 131
-rect 495 267 529 283
-rect 495 61 529 131
-rect 581 267 615 283
-rect 667 267 701 353
-rect 667 183 701 199
-rect 753 267 787 283
-rect 615 131 753 144
-rect 581 110 787 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 35 657 69 683
-rect 35 649 69 657
-rect 260 501 294 535
-rect 164 427 198 461
-rect 418 575 452 609
-rect 110 353 144 387
-rect 35 278 69 312
-rect 720 501 754 535
-rect 624 427 658 461
-rect 507 353 541 387
-rect 667 353 701 387
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1311 836 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 836 1311
-rect 0 1271 836 1277
-rect 23 683 81 689
-rect 23 649 35 683
-rect 69 649 81 683
-rect 23 643 81 649
-rect 35 318 69 643
-rect 406 609 464 615
-rect 406 575 418 609
-rect 452 575 486 609
-rect 406 569 464 575
-rect 248 535 306 541
-rect 708 535 766 541
-rect 248 501 260 535
-rect 294 501 720 535
-rect 754 501 766 535
-rect 248 500 766 501
-rect 248 495 306 500
-rect 708 495 766 500
-rect 152 462 210 467
-rect 612 462 670 467
-rect 152 461 670 462
-rect 152 427 164 461
-rect 198 427 624 461
-rect 658 427 670 461
-rect 152 421 210 427
-rect 612 421 670 427
-rect 98 387 156 393
-rect 495 387 553 393
-rect 655 387 713 393
-rect 98 353 110 387
-rect 144 353 507 387
-rect 541 353 553 387
-rect 633 353 667 387
-rect 701 353 713 387
-rect 98 347 156 353
-rect 495 347 553 353
-rect 655 347 713 353
-rect 23 312 81 318
-rect 23 278 35 312
-rect 69 278 81 312
-rect 23 272 81 278
-rect 0 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 477 50 477 1 S
-port 1 n
-rlabel metal1 737 518 737 518 1 A
-port 2 n
-rlabel metal1 642 444 642 444 1 B
-port 3 n
-rlabel metal1 435 592 435 592 1 CO
-port 4 n
-rlabel metal1 684 370 684 370 1 CON
-port 5 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__addh_l.mag b/18T_hs/sky130_osu_sc_18T_hs__addh_l.mag
deleted file mode 100644
index 09bd484..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__addh_l.mag
+++ /dev/null
@@ -1,396 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864611
-<< checkpaint >>
-rect -1209 -1243 2025 2575
-<< nwell >>
-rect -9 581 837 1341
-<< pmos >>
-rect 80 887 110 1217
-rect 178 617 208 1217
-rect 264 617 294 1217
-rect 362 887 392 1217
-rect 552 617 582 1217
-rect 638 617 668 1217
-rect 710 617 740 1217
-<< nmoslvt >>
-rect 80 115 110 243
-rect 178 115 208 315
-rect 250 115 280 315
-rect 442 115 472 243
-rect 540 115 570 315
-rect 626 115 656 315
-rect 712 115 742 315
-<< ndiff >>
-rect 125 267 178 315
-rect 125 243 133 267
-rect 27 199 80 243
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 131 133 243
-rect 167 131 178 267
-rect 110 115 178 131
-rect 208 115 250 315
-rect 280 267 333 315
-rect 280 131 291 267
-rect 325 131 333 267
-rect 487 267 540 315
-rect 487 243 495 267
-rect 280 115 333 131
-rect 389 199 442 243
-rect 389 131 397 199
-rect 431 131 442 199
-rect 389 115 442 131
-rect 472 131 495 243
-rect 529 131 540 267
-rect 472 115 540 131
-rect 570 267 626 315
-rect 570 131 581 267
-rect 615 131 626 267
-rect 570 115 626 131
-rect 656 267 712 315
-rect 656 199 667 267
-rect 701 199 712 267
-rect 656 115 712 199
-rect 742 267 795 315
-rect 742 131 753 267
-rect 787 131 795 267
-rect 742 115 795 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 887 80 929
-rect 110 1201 178 1217
-rect 110 887 133 1201
-rect 125 657 133 887
-rect 167 657 178 1201
-rect 125 617 178 657
-rect 208 1201 264 1217
-rect 208 725 219 1201
-rect 253 725 264 1201
-rect 208 617 264 725
-rect 294 1201 362 1217
-rect 294 725 305 1201
-rect 339 887 362 1201
-rect 392 1201 445 1217
-rect 392 929 403 1201
-rect 437 929 445 1201
-rect 392 887 445 929
-rect 499 1201 552 1217
-rect 339 725 347 887
-rect 294 617 347 725
-rect 499 657 507 1201
-rect 541 657 552 1201
-rect 499 617 552 657
-rect 582 1201 638 1217
-rect 582 657 593 1201
-rect 627 657 638 1201
-rect 582 617 638 657
-rect 668 617 710 1217
-rect 740 1201 796 1217
-rect 740 657 751 1201
-rect 785 657 796 1201
-rect 740 617 796 657
-<< ndiffc >>
-rect 35 131 69 199
-rect 133 131 167 267
-rect 291 131 325 267
-rect 397 131 431 199
-rect 495 131 529 267
-rect 581 131 615 267
-rect 667 199 701 267
-rect 753 131 787 267
-<< pdiffc >>
-rect 35 929 69 1201
-rect 133 657 167 1201
-rect 219 725 253 1201
-rect 305 725 339 1201
-rect 403 929 437 1201
-rect 507 657 541 1201
-rect 593 657 627 1201
-rect 751 657 785 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 178 1217 208 1243
-rect 264 1217 294 1243
-rect 362 1217 392 1243
-rect 552 1217 582 1243
-rect 638 1217 668 1243
-rect 710 1217 740 1243
-rect 80 403 110 887
-rect 178 477 208 617
-rect 264 551 294 617
-rect 154 461 208 477
-rect 154 427 164 461
-rect 198 427 208 461
-rect 154 411 208 427
-rect 43 387 110 403
-rect 43 353 53 387
-rect 87 353 110 387
-rect 43 337 110 353
-rect 80 243 110 337
-rect 178 315 208 411
-rect 250 535 304 551
-rect 250 501 260 535
-rect 294 501 304 535
-rect 250 485 304 501
-rect 362 549 392 887
-rect 552 549 582 617
-rect 362 519 582 549
-rect 250 315 280 485
-rect 362 424 392 519
-rect 638 477 668 617
-rect 710 551 740 617
-rect 710 535 764 551
-rect 710 501 720 535
-rect 754 501 764 535
-rect 710 485 764 501
-rect 338 408 392 424
-rect 614 461 668 477
-rect 614 427 624 461
-rect 658 427 668 461
-rect 614 411 668 427
-rect 338 374 348 408
-rect 382 375 392 408
-rect 382 374 570 375
-rect 338 345 570 374
-rect 442 243 472 345
-rect 540 315 570 345
-rect 626 315 656 411
-rect 712 315 742 485
-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 427 198 461
-rect 53 353 87 387
-rect 260 501 294 535
-rect 720 501 754 535
-rect 624 427 658 461
-rect 348 374 382 408
-<< locali >>
-rect 0 1311 836 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 836 1311
-rect 35 1201 69 1217
-rect 35 683 69 929
-rect 133 1201 167 1271
-rect 133 641 167 657
-rect 219 1201 253 1217
-rect 219 619 253 725
-rect 305 1201 339 1271
-rect 305 709 339 725
-rect 403 1201 437 1217
-rect 219 585 362 619
-rect 260 535 294 551
-rect 260 485 294 501
-rect 148 427 164 461
-rect 198 427 214 461
-rect 328 424 362 585
-rect 403 609 437 929
-rect 507 1201 541 1217
-rect 403 575 418 609
-rect 328 408 382 424
-rect 328 392 348 408
-rect 37 353 53 387
-rect 87 353 110 387
-rect 291 374 348 392
-rect 291 358 382 374
-rect 35 199 69 278
-rect 35 115 69 131
-rect 133 267 167 283
-rect 133 61 167 131
-rect 291 267 325 358
-rect 418 312 452 575
-rect 507 607 541 657
-rect 593 1201 627 1271
-rect 593 641 627 657
-rect 751 1201 785 1217
-rect 751 607 785 657
-rect 507 573 785 607
-rect 507 387 541 573
-rect 704 501 720 535
-rect 754 501 770 535
-rect 608 427 624 461
-rect 658 427 674 461
-rect 541 353 667 387
-rect 291 115 325 131
-rect 397 277 452 312
-rect 397 199 431 277
-rect 397 115 431 131
-rect 495 267 529 283
-rect 495 61 529 131
-rect 581 267 615 283
-rect 667 267 701 353
-rect 667 183 701 199
-rect 753 267 787 283
-rect 615 131 753 144
-rect 581 110 787 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 35 649 69 683
-rect 260 501 294 535
-rect 164 427 198 461
-rect 418 575 452 609
-rect 110 353 144 387
-rect 35 278 69 312
-rect 720 501 754 535
-rect 624 427 658 461
-rect 507 353 541 387
-rect 667 353 701 387
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1311 836 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 836 1311
-rect 0 1271 836 1277
-rect 23 683 81 689
-rect 23 649 35 683
-rect 69 649 81 683
-rect 23 643 81 649
-rect 35 318 69 643
-rect 406 609 464 615
-rect 406 575 418 609
-rect 452 575 486 609
-rect 406 569 464 575
-rect 248 535 306 541
-rect 708 535 766 541
-rect 248 501 260 535
-rect 294 501 720 535
-rect 754 501 766 535
-rect 248 500 766 501
-rect 248 495 306 500
-rect 708 495 766 500
-rect 152 462 210 467
-rect 612 462 670 467
-rect 152 461 670 462
-rect 152 427 164 461
-rect 198 427 624 461
-rect 658 427 670 461
-rect 152 421 210 427
-rect 612 421 670 427
-rect 98 387 156 393
-rect 495 387 553 393
-rect 655 387 713 393
-rect 98 353 110 387
-rect 144 353 507 387
-rect 541 353 553 387
-rect 633 353 667 387
-rect 701 353 713 387
-rect 98 347 156 353
-rect 495 347 553 353
-rect 655 347 713 353
-rect 23 312 81 318
-rect 23 278 35 312
-rect 69 278 81 312
-rect 23 272 81 278
-rect 0 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 477 50 477 1 S
-port 1 n
-rlabel metal1 737 518 737 518 1 A
-port 2 n
-rlabel metal1 642 444 642 444 1 B
-port 3 n
-rlabel metal1 435 592 435 592 1 CO
-port 4 n
-rlabel metal1 684 370 684 370 1 CON
-port 5 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__and2_1.mag b/18T_hs/sky130_osu_sc_18T_hs__and2_1.mag
deleted file mode 100644
index efba011..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__and2_1.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864611
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 193 267
-rect 227 131 252 267
-rect 182 115 252 131
-rect 282 267 335 315
-rect 282 131 293 267
-rect 327 131 335 267
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 335 1217
-rect 282 657 293 1201
-rect 327 657 335 1201
-rect 282 617 335 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 293 131 327 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 725 155 1201
-rect 207 725 241 1201
-rect 293 657 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 586 110 617
-rect 27 570 110 586
-rect 27 536 37 570
-rect 71 536 110 570
-rect 27 520 110 536
-rect 80 315 110 520
-rect 166 518 196 617
-rect 252 592 282 617
-rect 252 562 289 592
-rect 152 502 217 518
-rect 152 468 173 502
-rect 207 468 217 502
-rect 152 452 217 468
-rect 152 315 182 452
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 370 313 404
-rect 252 354 313 370
-rect 252 315 282 354
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 536 71 570
-rect 173 468 207 502
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 105 725 121 743
-rect 105 709 155 725
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 293 1201 327 1217
-rect 37 570 71 649
-rect 37 520 71 536
-rect 105 404 139 709
-rect 173 502 207 575
-rect 293 535 327 657
-rect 173 452 207 468
-rect 35 370 269 404
-rect 303 370 319 404
-rect 35 267 69 370
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 37 649 71 683
-rect 173 575 207 609
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 105 683
-rect 25 643 83 649
-rect 161 609 219 615
-rect 140 575 173 609
-rect 207 575 219 609
-rect 161 569 219 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 55 666 55 666 1 A
-port 2 n
-rlabel metal1 191 592 191 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__and2_2.mag b/18T_hs/sky130_osu_sc_18T_hs__and2_2.mag
deleted file mode 100644
index c05171d..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__and2_2.mag
+++ /dev/null
@@ -1,221 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864611
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 462 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 338 115 368 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 193 267
-rect 227 131 252 267
-rect 182 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 421 315
-rect 368 131 379 267
-rect 413 131 421 267
-rect 368 115 421 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 421 1217
-rect 368 657 379 1201
-rect 413 657 421 1201
-rect 368 617 421 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 293 131 327 267
-rect 379 131 413 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 725 155 1201
-rect 207 725 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 80 586 110 617
-rect 27 570 110 586
-rect 27 536 37 570
-rect 71 536 110 570
-rect 27 520 110 536
-rect 80 315 110 520
-rect 166 518 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 252 562 368 592
-rect 152 502 217 518
-rect 152 468 173 502
-rect 207 468 217 502
-rect 152 452 217 468
-rect 152 315 182 452
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 303 370 368 384
-rect 252 354 368 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 37 536 71 570
-rect 173 468 207 502
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 462 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 462 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 105 725 121 743
-rect 105 709 155 725
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 293 1201 327 1217
-rect 37 570 71 649
-rect 37 520 71 536
-rect 105 404 139 709
-rect 173 502 207 575
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 173 452 207 468
-rect 35 370 269 404
-rect 303 370 319 404
-rect 35 267 69 370
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 37 649 71 683
-rect 173 575 207 609
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 462 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 462 1311
-rect 0 1271 462 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 105 683
-rect 25 643 83 649
-rect 161 609 219 615
-rect 140 575 173 609
-rect 207 575 219 609
-rect 161 569 219 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 191 592 191 592 1 B
-port 1 n
-rlabel metal1 55 666 55 666 1 A
-port 2 n
-rlabel metal1 311 444 311 444 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__and2_4.mag b/18T_hs/sky130_osu_sc_18T_hs__and2_4.mag
deleted file mode 100644
index 893fdce..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__and2_4.mag
+++ /dev/null
@@ -1,284 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864612
-<< checkpaint >>
-rect -1209 -1243 1753 2575
-<< nwell >>
-rect -9 581 638 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 193 267
-rect 227 131 252 267
-rect 182 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 593 315
-rect 540 131 551 267
-rect 585 131 593 267
-rect 540 115 593 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 593 1217
-rect 540 657 551 1201
-rect 585 657 593 1201
-rect 540 617 593 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 725 155 1201
-rect 207 725 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 80 586 110 617
-rect 27 570 110 586
-rect 27 536 37 570
-rect 71 536 110 570
-rect 27 520 110 536
-rect 80 315 110 520
-rect 166 518 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 252 562 540 592
-rect 152 502 217 518
-rect 152 468 173 502
-rect 207 468 217 502
-rect 152 452 217 468
-rect 152 315 182 452
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 303 370 540 384
-rect 252 354 540 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-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 536 71 570
-rect 173 468 207 502
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 638 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 638 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 105 725 121 743
-rect 105 709 155 725
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 293 1201 327 1217
-rect 37 570 71 649
-rect 37 520 71 536
-rect 105 404 139 709
-rect 173 502 207 575
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 535 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 173 452 207 468
-rect 35 370 269 404
-rect 303 370 319 404
-rect 35 267 69 370
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 37 649 71 683
-rect 173 575 207 609
-rect 293 501 327 535
-rect 465 501 499 535
-rect 293 279 327 313
-rect 465 279 499 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 638 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 638 1311
-rect 0 1271 638 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 105 683
-rect 25 643 83 649
-rect 161 609 219 615
-rect 140 575 173 609
-rect 207 575 219 609
-rect 161 569 219 575
-rect 281 535 339 541
-rect 453 535 511 541
-rect 281 501 293 535
-rect 327 501 465 535
-rect 499 501 511 535
-rect 281 495 339 501
-rect 453 495 511 501
-rect 293 319 327 495
-rect 465 319 499 495
-rect 281 313 339 319
-rect 453 313 511 319
-rect 281 279 293 313
-rect 327 279 465 313
-rect 499 279 511 313
-rect 281 273 339 279
-rect 453 273 511 279
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 55 666 55 666 1 A
-port 2 n
-rlabel metal1 191 592 191 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__and2_6.mag b/18T_hs/sky130_osu_sc_18T_hs__and2_6.mag
deleted file mode 100644
index 1f235e9..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__and2_6.mag
+++ /dev/null
@@ -1,313 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1600380937
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 581 814 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 193 267
-rect 227 131 252 267
-rect 182 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 765 315
-rect 712 131 723 267
-rect 757 131 765 267
-rect 712 115 765 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 765 1217
-rect 712 657 723 1201
-rect 757 657 765 1201
-rect 712 617 765 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 725 155 1201
-rect 207 725 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 80 586 110 617
-rect 20 570 110 586
-rect 20 536 30 570
-rect 64 536 110 570
-rect 20 520 110 536
-rect 80 315 110 520
-rect 166 519 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 596 592 626 617
-rect 682 592 712 617
-rect 252 562 712 592
-rect 152 502 210 519
-rect 152 468 166 502
-rect 200 468 210 502
-rect 152 452 210 468
-rect 152 315 182 452
-rect 252 420 282 562
-rect 252 404 306 420
-rect 252 370 262 404
-rect 296 384 306 404
-rect 596 384 626 562
-rect 296 370 712 384
-rect 252 354 712 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-rect 596 315 626 354
-rect 682 315 712 354
-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 536 64 570
-rect 166 468 200 502
-rect 262 370 296 404
-<< locali >>
-rect 0 1305 814 1332
-rect 0 1271 51 1305
-rect 85 1271 187 1305
-rect 221 1271 323 1305
-rect 357 1271 459 1305
-rect 493 1271 595 1305
-rect 629 1271 814 1305
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 98 725 121 743
-rect 98 709 155 725
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 293 1201 327 1217
-rect 30 570 64 649
-rect 30 520 64 536
-rect 98 404 132 709
-rect 166 502 200 575
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 535 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 637 1201 671 1217
-rect 637 535 671 657
-rect 723 1201 757 1271
-rect 723 641 757 657
-rect 166 452 200 468
-rect 35 370 262 404
-rect 296 370 312 404
-rect 35 267 69 370
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 637 267 671 279
-rect 637 115 671 131
-rect 723 267 757 283
-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 649 64 683
-rect 166 575 200 609
-rect 293 501 327 535
-rect 465 501 499 535
-rect 637 501 671 535
-rect 293 279 327 313
-rect 465 279 499 313
-rect 637 279 671 313
-<< metal1 >>
-rect 0 1271 814 1332
-rect 18 683 76 689
-rect 18 649 30 683
-rect 64 649 98 683
-rect 18 643 76 649
-rect 154 609 212 615
-rect 132 575 166 609
-rect 200 575 212 609
-rect 154 569 212 575
-rect 281 535 339 541
-rect 453 535 511 541
-rect 625 535 683 541
-rect 281 501 293 535
-rect 327 501 465 535
-rect 499 501 637 535
-rect 671 501 683 535
-rect 281 495 339 501
-rect 453 495 511 501
-rect 625 495 683 501
-rect 293 319 327 495
-rect 465 319 499 495
-rect 637 319 671 495
-rect 281 313 339 319
-rect 453 313 511 319
-rect 625 313 683 319
-rect 281 279 293 313
-rect 327 279 465 313
-rect 499 279 637 313
-rect 671 279 683 313
-rect 281 273 339 279
-rect 453 273 511 279
-rect 625 273 683 279
-rect 0 0 814 61
-<< labels >>
-rlabel metal1 68 44 68 44 1 gnd
-rlabel metal1 68 1288 68 1288 1 vdd
-rlabel metal1 184 592 184 592 1 B
-port 1 n
-rlabel metal1 48 666 48 666 1 A
-port 2 n
-rlabel metal1 311 444 311 444 1 Y
-port 3 n
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__and2_8.mag b/18T_hs/sky130_osu_sc_18T_hs__and2_8.mag
deleted file mode 100644
index a2c19d0..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__and2_8.mag
+++ /dev/null
@@ -1,426 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864612
-<< checkpaint >>
-rect -1209 -1243 2161 2575
-<< nwell >>
-rect -9 581 990 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-rect 768 617 798 1217
-rect 854 617 884 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-rect 768 115 798 315
-rect 854 115 884 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 193 267
-rect 227 131 252 267
-rect 182 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 768 315
-rect 712 131 723 267
-rect 757 131 768 267
-rect 712 115 768 131
-rect 798 267 854 315
-rect 798 131 809 267
-rect 843 131 854 267
-rect 798 115 854 131
-rect 884 267 937 315
-rect 884 131 895 267
-rect 929 131 937 267
-rect 884 115 937 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 768 1217
-rect 712 657 723 1201
-rect 757 657 768 1201
-rect 712 617 768 657
-rect 798 1201 854 1217
-rect 798 657 809 1201
-rect 843 657 854 1201
-rect 798 617 854 657
-rect 884 1201 937 1217
-rect 884 657 895 1201
-rect 929 657 937 1201
-rect 884 617 937 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-rect 809 131 843 267
-rect 895 131 929 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 725 155 1201
-rect 207 725 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-rect 809 657 843 1201
-rect 895 657 929 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 768 1217 798 1243
-rect 854 1217 884 1243
-rect 80 586 110 617
-rect 27 570 110 586
-rect 27 536 37 570
-rect 71 536 110 570
-rect 27 520 110 536
-rect 80 315 110 520
-rect 166 518 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 596 592 626 617
-rect 682 592 712 617
-rect 768 592 798 617
-rect 854 592 884 617
-rect 252 562 884 592
-rect 152 502 217 518
-rect 152 468 173 502
-rect 207 468 217 502
-rect 152 452 217 468
-rect 152 315 182 452
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 596 384 626 562
-rect 303 370 884 384
-rect 252 354 884 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-rect 596 315 626 354
-rect 682 315 712 354
-rect 768 315 798 354
-rect 854 315 884 354
-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 536 71 570
-rect 173 468 207 502
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 990 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 990 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 105 725 121 743
-rect 105 709 155 725
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 293 1201 327 1217
-rect 37 570 71 649
-rect 37 520 71 536
-rect 105 404 139 709
-rect 173 502 207 575
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 535 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 637 1201 671 1217
-rect 637 535 671 657
-rect 723 1201 757 1271
-rect 723 641 757 657
-rect 809 1201 843 1217
-rect 809 535 843 657
-rect 895 1201 929 1271
-rect 895 641 929 657
-rect 173 452 207 468
-rect 35 370 269 404
-rect 303 370 319 404
-rect 35 267 69 370
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 637 267 671 279
-rect 637 115 671 131
-rect 723 267 757 283
-rect 723 61 757 131
-rect 809 267 843 279
-rect 809 115 843 131
-rect 895 267 929 283
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 37 649 71 683
-rect 173 575 207 609
-rect 293 501 327 535
-rect 465 501 499 535
-rect 637 501 671 535
-rect 809 501 843 535
-rect 293 279 327 313
-rect 465 279 499 313
-rect 637 279 671 313
-rect 809 279 843 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1311 990 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 990 1311
-rect 0 1271 990 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 105 683
-rect 25 643 83 649
-rect 161 609 219 615
-rect 140 575 173 609
-rect 207 575 219 609
-rect 161 569 219 575
-rect 281 535 339 541
-rect 453 535 511 541
-rect 625 535 683 541
-rect 797 535 855 541
-rect 281 501 293 535
-rect 327 501 465 535
-rect 499 501 637 535
-rect 671 501 809 535
-rect 843 501 855 535
-rect 281 495 339 501
-rect 453 495 511 501
-rect 625 495 683 501
-rect 797 495 855 501
-rect 293 319 327 495
-rect 465 319 499 495
-rect 637 319 671 495
-rect 809 319 843 495
-rect 281 313 339 319
-rect 453 313 511 319
-rect 625 313 683 319
-rect 797 313 855 319
-rect 281 279 293 313
-rect 327 279 465 313
-rect 499 279 637 313
-rect 671 279 683 313
-rect 712 279 809 313
-rect 843 279 855 313
-rect 281 273 339 279
-rect 453 273 511 279
-rect 625 273 683 279
-rect 797 273 855 279
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 191 592 191 592 1 B
-port 1 n
-rlabel metal1 55 666 55 666 1 A
-port 2 n
-rlabel metal1 311 444 311 444 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__and2_l.mag b/18T_hs/sky130_osu_sc_18T_hs__and2_l.mag
deleted file mode 100644
index 8bff734..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__and2_l.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864612
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< pmos >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 252 817 282 1217
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 115 152 263
-rect 182 199 252 263
-rect 182 131 193 199
-rect 227 131 252 199
-rect 182 115 252 131
-rect 282 199 335 263
-rect 282 131 293 199
-rect 327 131 335 199
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 817 166 861
-rect 196 1201 252 1217
-rect 196 861 207 1201
-rect 241 861 252 1201
-rect 196 817 252 861
-rect 282 1201 335 1217
-rect 282 861 293 1201
-rect 327 861 335 1201
-rect 282 817 335 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 193 131 227 199
-rect 293 131 327 199
-<< pdiffc >>
-rect 35 861 69 1201
-rect 121 861 155 1201
-rect 207 861 241 1201
-rect 293 861 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 586 110 817
-rect 27 570 110 586
-rect 27 536 37 570
-rect 71 536 110 570
-rect 27 520 110 536
-rect 80 263 110 520
-rect 166 518 196 817
-rect 252 592 282 817
-rect 252 562 289 592
-rect 152 502 217 518
-rect 152 468 173 502
-rect 207 468 217 502
-rect 152 452 217 468
-rect 152 263 182 452
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 370 313 404
-rect 252 354 313 370
-rect 252 263 282 354
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 536 71 570
-rect 173 468 207 502
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1271
-rect 121 1201 155 1217
-rect 35 845 69 861
-rect 105 861 121 879
-rect 105 845 155 861
-rect 207 1201 241 1271
-rect 207 845 241 861
-rect 293 1201 327 1217
-rect 37 570 71 649
-rect 37 520 71 536
-rect 105 404 139 845
-rect 173 502 207 575
-rect 293 535 327 861
-rect 173 452 207 468
-rect 35 370 269 404
-rect 303 370 319 404
-rect 35 199 69 370
-rect 35 115 69 131
-rect 193 199 227 215
-rect 193 61 227 131
-rect 293 199 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 37 649 71 683
-rect 173 575 207 609
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 105 683
-rect 25 643 83 649
-rect 161 609 219 615
-rect 140 575 173 609
-rect 207 575 219 609
-rect 161 569 219 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 55 666 55 666 1 A
-port 2 n
-rlabel metal1 191 592 191 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__ant.mag b/18T_hs/sky130_osu_sc_18T_hs__ant.mag
deleted file mode 100644
index ba7b69c..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__ant.mag
+++ /dev/null
@@ -1,101 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864612
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< pmos >>
-rect 80 617 110 1217
-<< nmoslvt >>
-rect 80 115 110 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 657 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 551 110 617
-rect 35 535 110 551
-rect 35 501 47 535
-rect 81 501 110 535
-rect 35 485 110 501
-rect 80 315 110 485
-rect 80 89 110 115
-<< polycont >>
-rect 47 501 81 535
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1217
-rect 35 535 69 657
-rect 121 1201 155 1271
-rect 121 641 155 657
-rect 31 501 47 535
-rect 81 501 97 535
-rect 35 417 69 501
-rect 35 383 155 417
-rect 35 267 69 383
-rect 35 115 69 131
-rect 121 267 155 383
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 47 501 81 535
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 35 535 108 541
-rect 35 501 47 535
-rect 81 501 108 535
-rect 35 495 108 501
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 64 518 64 518 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__antfill.mag b/18T_hs/sky130_osu_sc_18T_hs__antfill.mag
deleted file mode 100644
index 71b8c4a..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__antfill.mag
+++ /dev/null
@@ -1,58 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864612
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 535 69 1217
-rect 121 641 155 1271
-rect 31 501 47 535
-rect 81 501 97 535
-rect 35 417 69 501
-rect 35 383 155 417
-rect 35 115 69 383
-rect 121 115 155 383
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 47 501 81 535
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 35 535 108 541
-rect 35 501 47 535
-rect 81 501 108 535
-rect 35 495 108 501
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 64 518 64 518 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__aoi21_l.mag b/18T_hs/sky130_osu_sc_18T_hs__aoi21_l.mag
deleted file mode 100644
index 79d615d..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__aoi21_l.mag
+++ /dev/null
@@ -1,197 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864613
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 250 115 280 263
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 235 315
-rect 182 131 193 267
-rect 227 263 235 267
-rect 227 131 250 263
-rect 182 115 250 131
-rect 280 199 333 263
-rect 280 131 291 199
-rect 325 131 333 199
-rect 280 115 333 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 617 166 861
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1201 335 1217
-rect 282 725 293 1201
-rect 327 725 335 1201
-rect 282 617 335 725
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 291 131 325 199
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 861 155 1201
-rect 207 793 241 1201
-rect 293 725 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 580 110 617
-rect 44 570 110 580
-rect 44 536 60 570
-rect 94 536 110 570
-rect 44 526 110 536
-rect 44 370 74 526
-rect 166 484 196 617
-rect 252 579 282 617
-rect 252 549 309 579
-rect 134 468 196 484
-rect 134 434 146 468
-rect 180 434 196 468
-rect 134 418 196 434
-rect 44 338 110 370
-rect 80 315 110 338
-rect 152 315 182 418
-rect 279 405 309 549
-rect 279 389 333 405
-rect 279 371 289 389
-rect 250 355 289 371
-rect 323 355 333 389
-rect 250 339 333 355
-rect 250 263 280 339
-rect 80 89 110 115
-rect 152 89 182 115
-rect 250 89 280 115
-<< polycont >>
-rect 60 536 94 570
-rect 146 434 180 468
-rect 289 355 323 389
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 207 1201 241 1217
-rect 69 793 207 811
-rect 35 777 241 793
-rect 293 1201 327 1217
-rect 60 570 94 649
-rect 60 520 94 536
-rect 128 484 162 575
-rect 128 468 180 484
-rect 128 434 146 468
-rect 128 418 180 434
-rect 216 389 250 501
-rect 293 461 327 725
-rect 216 355 289 389
-rect 323 355 339 389
-rect 35 267 69 283
-rect 35 61 69 131
-rect 193 267 227 279
-rect 193 115 227 131
-rect 291 199 325 215
-rect 291 61 325 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 60 649 94 683
-rect 128 575 162 609
-rect 216 501 250 535
-rect 293 427 327 461
-rect 193 279 227 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 48 683 106 689
-rect 48 649 60 683
-rect 94 649 128 683
-rect 48 643 106 649
-rect 116 609 174 615
-rect 116 575 128 609
-rect 162 575 196 609
-rect 116 569 174 575
-rect 204 535 262 541
-rect 182 501 216 535
-rect 250 501 262 535
-rect 204 495 262 501
-rect 281 461 339 467
-rect 281 427 293 461
-rect 327 427 339 461
-rect 281 421 339 427
-rect 181 313 239 319
-rect 293 313 327 421
-rect 181 279 193 313
-rect 227 279 327 313
-rect 181 273 239 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 77 666 77 666 1 A0
-port 1 n
-rlabel metal1 233 518 233 518 1 B0
-port 2 n
-rlabel metal1 310 414 310 414 1 Y
-port 3 n
-rlabel metal1 145 592 145 592 1 A1
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__aoi22_l.mag b/18T_hs/sky130_osu_sc_18T_hs__aoi22_l.mag
deleted file mode 100644
index 127d3a7..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__aoi22_l.mag
+++ /dev/null
@@ -1,238 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864613
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 462 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 324 115 354 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 200 267
-rect 234 131 252 267
-rect 182 115 252 131
-rect 282 115 324 315
-rect 354 267 407 315
-rect 354 131 365 267
-rect 399 131 407 267
-rect 354 115 407 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 617 166 861
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1133 338 1217
-rect 282 793 293 1133
-rect 327 793 338 1133
-rect 282 617 338 793
-rect 368 1201 421 1217
-rect 368 793 379 1201
-rect 413 793 421 1201
-rect 368 617 421 793
-<< ndiffc >>
-rect 35 131 69 267
-rect 200 131 234 267
-rect 365 131 399 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 861 155 1201
-rect 207 793 241 1201
-rect 293 793 327 1133
-rect 379 793 413 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1243
-rect 80 580 110 617
-rect 44 570 110 580
-rect 44 536 60 570
-rect 94 536 110 570
-rect 44 526 110 536
-rect 44 370 74 526
-rect 166 514 196 617
-rect 152 484 196 514
-rect 116 468 182 484
-rect 116 434 128 468
-rect 162 434 182 468
-rect 116 418 182 434
-rect 44 338 110 370
-rect 80 315 110 338
-rect 152 315 182 418
-rect 252 413 282 617
-rect 338 478 368 617
-rect 338 462 416 478
-rect 338 434 370 462
-rect 224 397 282 413
-rect 224 363 234 397
-rect 268 363 282 397
-rect 224 347 282 363
-rect 252 315 282 347
-rect 324 428 370 434
-rect 404 428 416 462
-rect 324 412 416 428
-rect 324 404 368 412
-rect 324 315 354 404
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-rect 324 89 354 115
-<< polycont >>
-rect 60 536 94 570
-rect 128 434 162 468
-rect 234 363 268 397
-rect 370 428 404 462
-<< locali >>
-rect 0 1311 462 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 462 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 207 1201 413 1217
-rect 69 793 207 811
-rect 241 1183 379 1201
-rect 35 777 241 793
-rect 293 1133 327 1149
-rect 60 570 94 649
-rect 293 666 327 793
-rect 379 777 413 793
-rect 293 632 336 666
-rect 60 520 94 536
-rect 128 468 162 575
-rect 128 418 162 434
-rect 216 413 250 501
-rect 216 397 268 413
-rect 216 363 234 397
-rect 234 347 268 363
-rect 302 387 336 632
-rect 370 462 404 478
-rect 370 412 404 428
-rect 35 267 69 283
-rect 35 61 69 131
-rect 200 267 234 279
-rect 200 115 234 131
-rect 365 267 399 283
-rect 365 61 399 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 60 649 94 683
-rect 128 575 162 609
-rect 216 501 250 535
-rect 370 428 404 462
-rect 302 353 336 387
-rect 200 279 234 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 462 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 462 1311
-rect 0 1271 462 1277
-rect 48 683 106 689
-rect 48 649 60 683
-rect 94 649 128 683
-rect 48 643 106 649
-rect 116 609 174 615
-rect 116 575 128 609
-rect 162 575 196 609
-rect 116 569 174 575
-rect 204 535 262 541
-rect 182 501 216 535
-rect 250 501 262 535
-rect 204 495 262 501
-rect 358 462 416 468
-rect 336 428 370 462
-rect 404 428 416 462
-rect 358 422 416 428
-rect 290 387 348 393
-rect 290 353 302 387
-rect 336 353 348 387
-rect 290 347 348 353
-rect 188 313 246 319
-rect 304 313 338 347
-rect 188 279 200 313
-rect 234 279 338 313
-rect 188 273 246 279
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 77 666 77 666 1 A0
-port 1 n
-rlabel metal1 233 518 233 518 1 B0
-port 2 n
-rlabel viali 145 592 145 592 1 A1
-port 4 n
-rlabel viali 387 445 387 445 1 B1
-rlabel metal1 321 340 321 340 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__buf_1.mag b/18T_hs/sky130_osu_sc_18T_hs__buf_1.mag
deleted file mode 100644
index 58f8f46..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__buf_1.mag
+++ /dev/null
@@ -1,156 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864613
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 288 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 249 315
-rect 196 131 207 267
-rect 241 131 249 267
-rect 196 115 249 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 249 1217
-rect 196 657 207 1201
-rect 241 657 249 1201
-rect 196 617 249 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 207 657 241 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 80 529 110 617
-rect 166 602 196 617
-rect 166 572 251 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 315 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 370 251 404
-rect 166 354 251 370
-rect 166 315 196 354
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 110 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 404 69 657
-rect 110 513 144 649
-rect 207 609 241 657
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 267 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 207 267 241 279
-rect 207 115 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 110 649 144 683
-rect 207 575 241 609
-rect 207 279 241 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 195 575 207 609
-rect 241 575 253 609
-rect 195 569 253 575
-rect 207 319 241 569
-rect 195 313 253 319
-rect 195 279 207 313
-rect 241 279 253 313
-rect 195 273 253 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 213 455 213 455 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__buf_2.mag b/18T_hs/sky130_osu_sc_18T_hs__buf_2.mag
deleted file mode 100644
index d10e4e5..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__buf_2.mag
+++ /dev/null
@@ -1,177 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864613
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 376 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 335 315
-rect 282 131 293 267
-rect 327 131 335 267
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 335 1217
-rect 282 657 293 1201
-rect 327 657 335 1201
-rect 282 617 335 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1244
-rect 80 529 110 617
-rect 166 602 196 617
-rect 252 602 282 617
-rect 166 572 282 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 315 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 384 251 404
-rect 210 370 282 384
-rect 166 354 282 370
-rect 166 315 196 354
-rect 252 315 282 354
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 110 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 404 69 657
-rect 110 513 144 649
-rect 207 609 241 657
-rect 293 1201 327 1271
-rect 293 641 327 657
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 267 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 207 267 241 279
-rect 207 115 241 131
-rect 293 267 327 283
-rect 293 61 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 110 649 144 683
-rect 207 575 241 609
-rect 207 279 241 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 195 575 207 609
-rect 241 575 253 609
-rect 195 569 253 575
-rect 207 319 241 569
-rect 195 313 253 319
-rect 195 279 207 313
-rect 241 279 253 313
-rect 195 273 253 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 211 454 211 454 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__buf_4.mag b/18T_hs/sky130_osu_sc_18T_hs__buf_4.mag
deleted file mode 100644
index 32f9e32..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__buf_4.mag
+++ /dev/null
@@ -1,242 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864613
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 552 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 507 315
-rect 454 131 465 267
-rect 499 131 507 267
-rect 454 115 507 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 507 1217
-rect 454 657 465 1201
-rect 499 657 507 1201
-rect 454 617 507 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1244
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 80 529 110 617
-rect 166 602 196 617
-rect 252 602 282 617
-rect 338 602 368 617
-rect 424 602 454 617
-rect 166 572 454 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 315 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 384 251 404
-rect 210 370 454 384
-rect 166 354 454 370
-rect 166 315 196 354
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-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 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1311 550 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 550 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 404 69 657
-rect 110 513 144 649
-rect 207 609 241 657
-rect 293 1201 327 1271
-rect 293 641 327 657
-rect 379 1201 413 1217
-rect 379 609 413 657
-rect 465 1201 499 1271
-rect 465 641 499 657
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 267 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 267 155 283
-rect 35 61 69 62
-rect 121 61 155 131
-rect 207 267 241 279
-rect 207 115 241 131
-rect 293 267 327 283
-rect 207 61 241 62
-rect 293 61 327 131
-rect 379 267 413 279
-rect 379 115 413 131
-rect 465 267 499 283
-rect 465 61 499 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 110 649 144 683
-rect 207 575 241 609
-rect 379 575 413 609
-rect 207 279 241 313
-rect 379 279 413 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 550 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 550 1311
-rect 0 1271 550 1277
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 367 609 425 615
-rect 195 575 207 609
-rect 241 575 379 609
-rect 413 575 425 609
-rect 195 569 253 575
-rect 367 569 425 575
-rect 207 319 241 569
-rect 379 319 413 569
-rect 195 313 253 319
-rect 367 313 425 319
-rect 195 279 207 313
-rect 241 279 379 313
-rect 413 279 425 313
-rect 195 273 253 279
-rect 367 273 425 279
-rect 0 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 211 454 211 454 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__buf_6.mag b/18T_hs/sky130_osu_sc_18T_hs__buf_6.mag
deleted file mode 100644
index c815e16..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__buf_6.mag
+++ /dev/null
@@ -1,284 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598479240
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 581 728 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 679 315
-rect 626 131 637 267
-rect 671 131 679 267
-rect 626 115 679 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 679 1217
-rect 626 657 637 1201
-rect 671 657 679 1201
-rect 626 617 679 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1244
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 80 529 110 617
-rect 166 602 196 617
-rect 252 602 282 617
-rect 338 602 368 617
-rect 424 602 454 617
-rect 510 602 540 617
-rect 596 602 626 617
-rect 166 572 626 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 315 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 384 251 404
-rect 510 384 540 572
-rect 210 370 626 384
-rect 166 354 626 370
-rect 166 315 196 354
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-rect 596 315 626 354
-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 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1305 726 1332
-rect 0 1271 51 1305
-rect 85 1271 187 1305
-rect 221 1271 323 1305
-rect 357 1271 459 1305
-rect 493 1271 595 1305
-rect 629 1271 726 1305
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 404 69 657
-rect 110 513 144 649
-rect 207 609 241 657
-rect 293 1201 327 1271
-rect 293 641 327 657
-rect 379 1201 413 1217
-rect 379 609 413 657
-rect 465 1201 499 1271
-rect 465 641 499 657
-rect 551 1201 585 1217
-rect 551 609 585 657
-rect 637 1201 671 1271
-rect 637 641 671 657
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 267 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 207 267 241 279
-rect 207 115 241 131
-rect 293 267 327 283
-rect 293 61 327 131
-rect 379 267 413 279
-rect 379 115 413 131
-rect 465 267 499 283
-rect 465 61 499 131
-rect 551 267 585 279
-rect 551 115 585 131
-rect 637 267 671 283
-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 649 144 683
-rect 207 575 241 609
-rect 379 575 413 609
-rect 551 575 585 609
-rect 207 279 241 313
-rect 379 279 413 313
-rect 551 279 585 313
-<< metal1 >>
-rect 0 1271 726 1332
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 367 609 425 615
-rect 539 609 597 615
-rect 195 575 207 609
-rect 241 575 379 609
-rect 413 575 551 609
-rect 585 575 597 609
-rect 195 569 253 575
-rect 367 569 425 575
-rect 539 569 597 575
-rect 207 319 241 569
-rect 379 319 413 569
-rect 551 319 585 569
-rect 195 313 253 319
-rect 367 313 425 319
-rect 539 313 597 319
-rect 195 279 207 313
-rect 241 279 379 313
-rect 413 279 551 313
-rect 585 279 597 313
-rect 195 273 253 279
-rect 367 273 425 279
-rect 539 273 597 279
-rect 0 0 726 61
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 211 454 211 454 1 Y
-port 2 n
-rlabel metal1 68 44 68 44 1 gnd
-rlabel metal1 68 1288 68 1288 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__buf_8.mag b/18T_hs/sky130_osu_sc_18T_hs__buf_8.mag
deleted file mode 100644
index 19dba7a..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__buf_8.mag
+++ /dev/null
@@ -1,381 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864614
-<< checkpaint >>
-rect -1209 -1243 2025 2575
-<< nwell >>
-rect -9 581 904 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-rect 768 617 798 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-rect 768 115 798 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 768 315
-rect 712 131 723 267
-rect 757 131 768 267
-rect 712 115 768 131
-rect 798 267 851 315
-rect 798 131 809 267
-rect 843 131 851 267
-rect 798 115 851 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 768 1217
-rect 712 657 723 1201
-rect 757 657 768 1201
-rect 712 617 768 657
-rect 798 1201 851 1217
-rect 798 657 809 1201
-rect 843 657 851 1201
-rect 798 617 851 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-rect 809 131 843 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-rect 809 657 843 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1244
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 768 1217 798 1243
-rect 80 529 110 617
-rect 166 602 196 617
-rect 252 602 282 617
-rect 338 602 368 617
-rect 424 602 454 617
-rect 510 602 540 617
-rect 596 602 626 617
-rect 682 602 712 617
-rect 768 602 798 617
-rect 166 572 798 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 315 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 384 251 404
-rect 510 384 540 572
-rect 210 370 798 384
-rect 166 354 798 370
-rect 166 315 196 354
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-rect 596 315 626 354
-rect 682 315 712 354
-rect 768 315 798 354
-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 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1311 902 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 902 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 404 69 657
-rect 110 513 144 649
-rect 207 609 241 657
-rect 293 1201 327 1271
-rect 293 641 327 657
-rect 379 1201 413 1217
-rect 379 609 413 657
-rect 465 1201 499 1271
-rect 465 641 499 657
-rect 551 1201 585 1217
-rect 551 609 585 657
-rect 637 1201 671 1271
-rect 637 641 671 657
-rect 723 1201 757 1217
-rect 723 609 757 657
-rect 809 1201 843 1271
-rect 809 641 843 657
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 267 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 207 267 241 279
-rect 207 115 241 131
-rect 293 267 327 283
-rect 293 61 327 131
-rect 379 267 413 279
-rect 379 115 413 131
-rect 465 267 499 283
-rect 465 61 499 131
-rect 551 267 585 279
-rect 551 115 585 131
-rect 637 267 671 283
-rect 637 61 671 131
-rect 723 267 757 279
-rect 723 115 757 131
-rect 809 267 843 283
-rect 809 61 843 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 902 61
-rect 0 0 902 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 110 649 144 683
-rect 207 575 241 609
-rect 379 575 413 609
-rect 551 575 585 609
-rect 723 575 757 609
-rect 207 279 241 313
-rect 379 279 413 313
-rect 551 279 585 313
-rect 723 279 757 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1311 902 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 902 1311
-rect 0 1271 902 1277
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 367 609 425 615
-rect 539 609 597 615
-rect 711 609 769 615
-rect 195 575 207 609
-rect 241 575 379 609
-rect 413 575 551 609
-rect 585 575 723 609
-rect 757 575 769 609
-rect 195 569 253 575
-rect 367 569 425 575
-rect 539 569 597 575
-rect 711 569 769 575
-rect 207 319 241 569
-rect 379 319 413 569
-rect 551 319 585 569
-rect 723 319 757 569
-rect 195 313 253 319
-rect 367 313 425 319
-rect 539 313 597 319
-rect 711 313 769 319
-rect 195 279 207 313
-rect 241 279 379 313
-rect 413 279 551 313
-rect 585 279 723 313
-rect 757 279 769 313
-rect 195 273 253 279
-rect 367 273 425 279
-rect 539 273 597 279
-rect 711 273 769 279
-rect 0 55 902 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 902 55
-rect 0 0 902 21
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 211 454 211 454 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__buf_l.mag b/18T_hs/sky130_osu_sc_18T_hs__buf_l.mag
deleted file mode 100644
index d60668a..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__buf_l.mag
+++ /dev/null
@@ -1,156 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864614
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 288 1341
-<< pmos >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 166 263
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 199 249 263
-rect 196 131 207 199
-rect 241 131 249 199
-rect 196 115 249 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 817 166 861
-rect 196 1201 249 1217
-rect 196 861 207 1201
-rect 241 861 249 1201
-rect 196 817 249 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-rect 207 131 241 199
-<< pdiffc >>
-rect 35 861 69 1201
-rect 121 861 155 1201
-rect 207 861 241 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 80 529 110 817
-rect 166 602 196 817
-rect 166 572 251 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 263 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 370 251 404
-rect 166 354 251 370
-rect 166 263 196 354
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 110 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1217
-rect 35 404 69 861
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 207 1201 241 1217
-rect 110 513 144 649
-rect 207 609 241 861
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 199 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 207 199 241 279
-rect 207 115 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 110 649 144 683
-rect 207 575 241 609
-rect 207 279 241 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 195 575 207 609
-rect 241 575 253 609
-rect 195 569 253 575
-rect 207 319 241 569
-rect 195 313 253 319
-rect 195 279 207 313
-rect 241 279 253 313
-rect 195 273 253 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 214 452 214 452 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__decap_1.mag b/18T_hs/sky130_osu_sc_18T_hs__decap_1.mag
deleted file mode 100644
index b4bc94b..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__decap_1.mag
+++ /dev/null
@@ -1,83 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864614
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< pmos >>
-rect 80 817 110 1217
-<< nmoslvt >>
-rect 80 115 110 451
-<< ndiff >>
-rect 27 403 80 451
-rect 27 131 35 403
-rect 69 131 80 403
-rect 27 115 80 131
-rect 110 403 163 451
-rect 110 131 121 403
-rect 155 131 163 403
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 1201 163 1217
-rect 110 861 121 1201
-rect 155 861 163 1201
-rect 110 817 163 861
-<< ndiffc >>
-rect 35 131 69 403
-rect 121 131 155 403
-<< pdiffc >>
-rect 35 861 69 1201
-rect 121 861 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 451 110 817
-rect 80 80 110 115
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 845 69 861
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 35 403 69 419
-rect 35 61 69 131
-rect 121 403 155 419
-rect 121 61 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__decap_l.mag b/18T_hs/sky130_osu_sc_18T_hs__decap_l.mag
deleted file mode 100644
index bd3a274..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__decap_l.mag
+++ /dev/null
@@ -1,83 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864614
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< pmos >>
-rect 80 1017 110 1217
-<< nmoslvt >>
-rect 80 115 110 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 1065 35 1201
-rect 69 1065 80 1201
-rect 27 1017 80 1065
-rect 110 1201 163 1217
-rect 110 1065 121 1201
-rect 155 1065 163 1201
-rect 110 1017 163 1065
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-<< pdiffc >>
-rect 35 1065 69 1201
-rect 121 1065 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 315 110 1017
-rect 80 80 110 115
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 1049 69 1065
-rect 121 1201 155 1271
-rect 121 1049 155 1065
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__dff_1.mag b/18T_hs/sky130_osu_sc_18T_hs__dff_1.mag
deleted file mode 100644
index 9a3b896..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__dff_1.mag
+++ /dev/null
@@ -1,634 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864614
-<< checkpaint >>
-rect -1209 -1243 2569 2575
-<< nwell >>
-rect -9 581 1456 1341
-<< pmos >>
-rect 85 617 115 1217
-rect 171 617 201 1217
-rect 243 617 273 1217
-rect 363 617 393 1217
-rect 435 617 465 1217
-rect 521 617 551 1217
-rect 593 617 623 1217
-rect 713 617 743 1217
-rect 785 617 815 1217
-rect 871 617 901 1217
-rect 1061 617 1091 1217
-rect 1251 617 1281 1217
-rect 1337 617 1367 1217
-<< nmoslvt >>
-rect 85 115 115 315
-rect 171 115 201 315
-rect 243 115 273 315
-rect 363 115 393 315
-rect 435 115 465 315
-rect 521 115 551 315
-rect 593 115 623 315
-rect 713 115 743 315
-rect 785 115 815 315
-rect 871 115 901 315
-rect 1061 115 1091 315
-rect 1251 115 1281 315
-rect 1337 115 1367 315
-<< ndiff >>
-rect 32 267 85 315
-rect 32 131 40 267
-rect 74 131 85 267
-rect 32 115 85 131
-rect 115 267 171 315
-rect 115 131 126 267
-rect 160 131 171 267
-rect 115 115 171 131
-rect 201 115 243 315
-rect 273 267 363 315
-rect 273 131 284 267
-rect 352 131 363 267
-rect 273 115 363 131
-rect 393 115 435 315
-rect 465 199 521 315
-rect 465 131 476 199
-rect 510 131 521 199
-rect 465 115 521 131
-rect 551 115 593 315
-rect 623 267 713 315
-rect 623 131 634 267
-rect 702 131 713 267
-rect 623 115 713 131
-rect 743 115 785 315
-rect 815 267 871 315
-rect 815 131 826 267
-rect 860 131 871 267
-rect 815 115 871 131
-rect 901 267 954 315
-rect 901 131 912 267
-rect 946 131 954 267
-rect 901 115 954 131
-rect 1008 267 1061 315
-rect 1008 131 1016 267
-rect 1050 131 1061 267
-rect 1008 115 1061 131
-rect 1091 267 1144 315
-rect 1091 131 1102 267
-rect 1136 131 1144 267
-rect 1091 115 1144 131
-rect 1198 267 1251 315
-rect 1198 131 1206 267
-rect 1240 131 1251 267
-rect 1198 115 1251 131
-rect 1281 267 1337 315
-rect 1281 131 1292 267
-rect 1326 131 1337 267
-rect 1281 115 1337 131
-rect 1367 267 1420 315
-rect 1367 131 1378 267
-rect 1412 131 1420 267
-rect 1367 115 1420 131
-<< pdiff >>
-rect 32 1201 85 1217
-rect 32 657 40 1201
-rect 74 657 85 1201
-rect 32 617 85 657
-rect 115 1201 171 1217
-rect 115 725 126 1201
-rect 160 725 171 1201
-rect 115 617 171 725
-rect 201 617 243 1217
-rect 273 1201 363 1217
-rect 273 657 284 1201
-rect 352 657 363 1201
-rect 273 617 363 657
-rect 393 617 435 1217
-rect 465 1201 521 1217
-rect 465 725 476 1201
-rect 510 725 521 1201
-rect 465 617 521 725
-rect 551 617 593 1217
-rect 623 1201 713 1217
-rect 623 657 634 1201
-rect 702 657 713 1201
-rect 623 617 713 657
-rect 743 617 785 1217
-rect 815 1201 871 1217
-rect 815 657 826 1201
-rect 860 657 871 1201
-rect 815 617 871 657
-rect 901 1201 954 1217
-rect 901 657 912 1201
-rect 946 657 954 1201
-rect 901 617 954 657
-rect 1008 1201 1061 1217
-rect 1008 725 1016 1201
-rect 1050 725 1061 1201
-rect 1008 617 1061 725
-rect 1091 1201 1144 1217
-rect 1091 657 1102 1201
-rect 1136 657 1144 1201
-rect 1091 617 1144 657
-rect 1198 1201 1251 1217
-rect 1198 657 1206 1201
-rect 1240 657 1251 1201
-rect 1198 617 1251 657
-rect 1281 1201 1337 1217
-rect 1281 657 1292 1201
-rect 1326 657 1337 1201
-rect 1281 617 1337 657
-rect 1367 1201 1420 1217
-rect 1367 657 1378 1201
-rect 1412 657 1420 1201
-rect 1367 617 1420 657
-<< ndiffc >>
-rect 40 131 74 267
-rect 126 131 160 267
-rect 284 131 352 267
-rect 476 131 510 199
-rect 634 131 702 267
-rect 826 131 860 267
-rect 912 131 946 267
-rect 1016 131 1050 267
-rect 1102 131 1136 267
-rect 1206 131 1240 267
-rect 1292 131 1326 267
-rect 1378 131 1412 267
-<< pdiffc >>
-rect 40 657 74 1201
-rect 126 725 160 1201
-rect 284 657 352 1201
-rect 476 725 510 1201
-rect 634 657 702 1201
-rect 826 657 860 1201
-rect 912 657 946 1201
-rect 1016 725 1050 1201
-rect 1102 657 1136 1201
-rect 1206 657 1240 1201
-rect 1292 657 1326 1201
-rect 1378 657 1412 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-rect 979 1271 1003 1305
-rect 1037 1271 1061 1305
-rect 1115 1271 1139 1305
-rect 1173 1271 1197 1305
-rect 1251 1271 1275 1305
-rect 1309 1271 1333 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-rect 1003 1271 1037 1305
-rect 1139 1271 1173 1305
-rect 1275 1271 1309 1305
-<< poly >>
-rect 85 1217 115 1243
-rect 171 1217 201 1243
-rect 243 1217 273 1243
-rect 363 1217 393 1243
-rect 435 1217 465 1243
-rect 521 1217 551 1243
-rect 593 1217 623 1243
-rect 713 1217 743 1243
-rect 785 1217 815 1243
-rect 871 1217 901 1243
-rect 1061 1217 1091 1243
-rect 1251 1217 1281 1243
-rect 1337 1217 1367 1243
-rect 85 586 115 617
-rect 75 570 129 586
-rect 75 536 85 570
-rect 119 536 129 570
-rect 75 520 129 536
-rect 75 374 105 520
-rect 171 477 201 617
-rect 243 586 273 617
-rect 243 570 297 586
-rect 243 536 253 570
-rect 287 536 297 570
-rect 243 520 297 536
-rect 171 461 225 477
-rect 363 475 393 617
-rect 435 580 465 617
-rect 521 580 551 617
-rect 435 570 551 580
-rect 435 536 467 570
-rect 501 536 551 570
-rect 435 526 551 536
-rect 593 475 623 617
-rect 713 586 743 617
-rect 689 570 743 586
-rect 689 536 699 570
-rect 733 536 743 570
-rect 689 520 743 536
-rect 171 427 181 461
-rect 215 427 225 461
-rect 171 411 225 427
-rect 267 445 719 475
-rect 75 344 115 374
-rect 85 315 115 344
-rect 171 315 201 411
-rect 267 367 297 445
-rect 689 403 719 445
-rect 785 471 815 617
-rect 871 586 901 617
-rect 871 570 942 586
-rect 871 556 898 570
-rect 882 536 898 556
-rect 932 536 942 570
-rect 882 520 942 536
-rect 785 455 839 471
-rect 785 421 795 455
-rect 829 421 839 455
-rect 785 405 839 421
-rect 243 337 297 367
-rect 339 387 393 403
-rect 339 353 349 387
-rect 383 353 393 387
-rect 339 337 393 353
-rect 243 315 273 337
-rect 363 315 393 337
-rect 435 387 551 397
-rect 435 353 467 387
-rect 501 353 551 387
-rect 435 343 551 353
-rect 435 315 465 343
-rect 521 315 551 343
-rect 593 387 647 403
-rect 593 353 603 387
-rect 637 353 647 387
-rect 593 337 647 353
-rect 689 387 743 403
-rect 689 353 699 387
-rect 733 353 743 387
-rect 689 337 743 353
-rect 593 315 623 337
-rect 713 315 743 337
-rect 785 315 815 405
-rect 882 367 912 520
-rect 1061 403 1091 617
-rect 1251 601 1281 617
-rect 1241 571 1281 601
-rect 1241 471 1271 571
-rect 1337 512 1367 617
-rect 1216 455 1271 471
-rect 1216 421 1226 455
-rect 1260 421 1271 455
-rect 1313 496 1367 512
-rect 1313 462 1323 496
-rect 1357 462 1367 496
-rect 1313 446 1367 462
-rect 1216 405 1271 421
-rect 871 337 912 367
-rect 1008 387 1091 403
-rect 1008 353 1018 387
-rect 1052 353 1091 387
-rect 1008 337 1091 353
-rect 871 315 901 337
-rect 1061 315 1091 337
-rect 1241 360 1271 405
-rect 1241 330 1281 360
-rect 1251 315 1281 330
-rect 1337 315 1367 446
-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 536 119 570
-rect 253 536 287 570
-rect 467 536 501 570
-rect 699 536 733 570
-rect 181 427 215 461
-rect 898 536 932 570
-rect 795 421 829 455
-rect 349 353 383 387
-rect 467 353 501 387
-rect 603 353 637 387
-rect 699 353 733 387
-rect 1226 421 1260 455
-rect 1323 462 1357 496
-rect 1018 353 1052 387
-<< locali >>
-rect 0 1311 1452 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 1003 1311
-rect 1037 1271 1139 1311
-rect 1173 1271 1275 1311
-rect 1309 1271 1452 1311
-rect 40 1201 74 1217
-rect 17 657 40 669
-rect 126 1201 160 1271
-rect 126 709 160 725
-rect 284 1201 352 1217
-rect 17 628 74 657
-rect 476 1201 510 1271
-rect 476 709 510 725
-rect 634 1201 702 1217
-rect 352 657 355 675
-rect 284 654 355 657
-rect 634 654 702 657
-rect 17 387 51 628
-rect 108 620 355 654
-rect 535 620 702 654
-rect 826 1201 860 1271
-rect 826 641 860 657
-rect 912 1201 946 1217
-rect 1016 1201 1050 1271
-rect 1016 709 1050 725
-rect 1102 1201 1136 1217
-rect 912 654 946 657
-rect 912 620 1000 654
-rect 108 586 142 620
-rect 85 570 142 586
-rect 119 536 142 570
-rect 85 520 142 536
-rect 17 353 40 387
-rect 17 332 74 353
-rect 108 370 142 520
-rect 253 570 287 586
-rect 253 535 287 536
-rect 467 570 501 586
-rect 287 501 383 535
-rect 181 461 215 477
-rect 181 411 215 427
-rect 349 387 383 501
-rect 467 387 501 536
-rect 108 336 315 370
-rect 349 337 383 353
-rect 467 337 501 353
-rect 535 387 569 620
-rect 699 570 733 586
-rect 699 535 733 536
-rect 40 267 74 332
-rect 281 283 315 336
-rect 535 303 569 353
-rect 603 501 699 535
-rect 898 570 932 586
-rect 898 535 932 536
-rect 603 387 637 501
-rect 966 455 1000 620
-rect 779 421 795 455
-rect 829 421 845 455
-rect 912 421 1000 455
-rect 1102 455 1136 657
-rect 1206 1201 1240 1217
-rect 1206 609 1240 657
-rect 1292 1201 1326 1271
-rect 1292 641 1326 657
-rect 1378 1201 1412 1217
-rect 1412 649 1435 666
-rect 1378 632 1435 649
-rect 1206 570 1240 575
-rect 1206 536 1357 570
-rect 1323 496 1357 536
-rect 1102 421 1226 455
-rect 1260 421 1276 455
-rect 912 387 946 421
-rect 683 353 699 387
-rect 733 353 946 387
-rect 1002 353 1018 387
-rect 1052 353 1068 387
-rect 603 337 637 353
-rect 40 115 74 131
-rect 126 267 160 283
-rect 281 267 352 283
-rect 535 269 702 303
-rect 281 249 284 267
-rect 126 61 160 131
-rect 634 267 702 269
-rect 284 115 352 131
-rect 476 199 510 215
-rect 476 61 510 131
-rect 634 115 702 131
-rect 826 267 860 283
-rect 826 61 860 131
-rect 912 267 946 353
-rect 912 115 946 131
-rect 1016 267 1050 283
-rect 1016 61 1050 131
-rect 1102 267 1136 421
-rect 1323 387 1357 462
-rect 1102 115 1136 131
-rect 1206 353 1357 387
-rect 1206 267 1240 353
-rect 1401 322 1435 632
-rect 1378 286 1435 322
-rect 1206 115 1240 131
-rect 1292 267 1326 283
-rect 1292 61 1326 131
-rect 1378 267 1412 286
-rect 1378 115 1412 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 1003 1305 1037 1311
-rect 1003 1277 1037 1305
-rect 1139 1305 1173 1311
-rect 1139 1277 1173 1305
-rect 1275 1305 1309 1311
-rect 1275 1277 1309 1305
-rect 40 353 74 387
-rect 253 501 287 535
-rect 181 427 215 461
-rect 449 353 467 387
-rect 467 353 483 387
-rect 535 353 569 387
-rect 699 501 733 535
-rect 898 501 932 535
-rect 795 421 829 455
-rect 1378 657 1412 683
-rect 1378 649 1412 657
-rect 1206 575 1240 609
-rect 1226 421 1260 455
-rect 1018 353 1052 387
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1311 1452 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 1003 1311
-rect 1037 1277 1139 1311
-rect 1173 1277 1275 1311
-rect 1309 1277 1452 1311
-rect 0 1271 1452 1277
-rect 1366 683 1424 689
-rect 1343 649 1378 683
-rect 1412 649 1424 683
-rect 1366 643 1424 649
-rect 1194 609 1252 615
-rect 1172 575 1206 609
-rect 1240 575 1252 609
-rect 1194 569 1252 575
-rect 241 535 299 541
-rect 687 535 745 541
-rect 886 535 944 541
-rect 241 501 253 535
-rect 287 501 699 535
-rect 733 501 898 535
-rect 932 501 944 535
-rect 241 495 299 501
-rect 687 495 745 501
-rect 886 495 944 501
-rect 169 461 227 467
-rect 169 427 181 461
-rect 215 427 249 461
-rect 783 455 841 461
-rect 1214 455 1272 461
-rect 169 421 227 427
-rect 783 421 795 455
-rect 829 421 1226 455
-rect 1260 421 1272 455
-rect 783 415 841 421
-rect 1214 415 1272 421
-rect 28 387 86 393
-rect 437 387 495 393
-rect 28 353 40 387
-rect 74 353 449 387
-rect 483 353 495 387
-rect 28 347 86 353
-rect 437 347 495 353
-rect 523 387 581 393
-rect 1006 387 1064 393
-rect 523 353 535 387
-rect 569 353 1018 387
-rect 1052 353 1064 387
-rect 523 347 581 353
-rect 1006 347 1064 353
-rect 0 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel metal1 198 444 198 444 1 D
-port 1 n
-rlabel metal1 915 518 915 518 1 CK
-port 3 n
-rlabel metal1 1395 666 1395 666 1 Q
-port 4 n
-rlabel metal1 1224 592 1224 592 1 QN
-port 2 n
-rlabel viali 68 49 68 49 1 gnd
-rlabel viali 68 1285 68 1285 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__dff_l.mag b/18T_hs/sky130_osu_sc_18T_hs__dff_l.mag
deleted file mode 100644
index fbbbcbd..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__dff_l.mag
+++ /dev/null
@@ -1,635 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864615
-<< checkpaint >>
-rect -1209 -1243 2569 2575
-<< nwell >>
-rect -9 581 1456 1341
-<< pmos >>
-rect 85 617 115 1217
-rect 171 617 201 1217
-rect 243 617 273 1217
-rect 363 617 393 1217
-rect 435 617 465 1217
-rect 521 617 551 1217
-rect 593 617 623 1217
-rect 713 617 743 1217
-rect 785 617 815 1217
-rect 871 617 901 1217
-rect 1061 617 1091 1217
-rect 1251 817 1281 1217
-rect 1337 817 1367 1217
-<< nmoslvt >>
-rect 85 115 115 315
-rect 171 115 201 315
-rect 243 115 273 315
-rect 363 115 393 315
-rect 435 115 465 315
-rect 521 115 551 315
-rect 593 115 623 315
-rect 713 115 743 315
-rect 785 115 815 315
-rect 871 115 901 315
-rect 1061 115 1091 315
-rect 1251 115 1281 263
-rect 1337 115 1367 263
-<< ndiff >>
-rect 32 267 85 315
-rect 32 131 40 267
-rect 74 131 85 267
-rect 32 115 85 131
-rect 115 267 171 315
-rect 115 131 126 267
-rect 160 131 171 267
-rect 115 115 171 131
-rect 201 115 243 315
-rect 273 267 363 315
-rect 273 131 284 267
-rect 352 131 363 267
-rect 273 115 363 131
-rect 393 115 435 315
-rect 465 199 521 315
-rect 465 131 476 199
-rect 510 131 521 199
-rect 465 115 521 131
-rect 551 115 593 315
-rect 623 267 713 315
-rect 623 131 634 267
-rect 702 131 713 267
-rect 623 115 713 131
-rect 743 115 785 315
-rect 815 267 871 315
-rect 815 131 826 267
-rect 860 131 871 267
-rect 815 115 871 131
-rect 901 267 954 315
-rect 901 131 912 267
-rect 946 131 954 267
-rect 901 115 954 131
-rect 1008 267 1061 315
-rect 1008 131 1016 267
-rect 1050 131 1061 267
-rect 1008 115 1061 131
-rect 1091 267 1144 315
-rect 1091 131 1102 267
-rect 1136 131 1144 267
-rect 1091 115 1144 131
-rect 1198 199 1251 263
-rect 1198 131 1206 199
-rect 1240 131 1251 199
-rect 1198 115 1251 131
-rect 1281 199 1337 263
-rect 1281 131 1292 199
-rect 1326 131 1337 199
-rect 1281 115 1337 131
-rect 1367 199 1420 263
-rect 1367 131 1378 199
-rect 1412 131 1420 199
-rect 1367 115 1420 131
-<< pdiff >>
-rect 32 1201 85 1217
-rect 32 657 40 1201
-rect 74 657 85 1201
-rect 32 617 85 657
-rect 115 1201 171 1217
-rect 115 725 126 1201
-rect 160 725 171 1201
-rect 115 617 171 725
-rect 201 617 243 1217
-rect 273 1201 363 1217
-rect 273 657 284 1201
-rect 352 657 363 1201
-rect 273 617 363 657
-rect 393 617 435 1217
-rect 465 1201 521 1217
-rect 465 725 476 1201
-rect 510 725 521 1201
-rect 465 617 521 725
-rect 551 617 593 1217
-rect 623 1201 713 1217
-rect 623 725 634 1201
-rect 702 725 713 1201
-rect 623 617 713 725
-rect 743 617 785 1217
-rect 815 1201 871 1217
-rect 815 657 826 1201
-rect 860 657 871 1201
-rect 815 617 871 657
-rect 901 1201 954 1217
-rect 901 657 912 1201
-rect 946 657 954 1201
-rect 901 617 954 657
-rect 1008 1201 1061 1217
-rect 1008 725 1016 1201
-rect 1050 725 1061 1201
-rect 1008 617 1061 725
-rect 1091 1201 1144 1217
-rect 1091 657 1102 1201
-rect 1136 657 1144 1201
-rect 1198 1201 1251 1217
-rect 1198 929 1206 1201
-rect 1240 929 1251 1201
-rect 1198 817 1251 929
-rect 1281 1201 1337 1217
-rect 1281 929 1292 1201
-rect 1326 929 1337 1201
-rect 1281 817 1337 929
-rect 1367 1201 1420 1217
-rect 1367 929 1378 1201
-rect 1412 929 1420 1201
-rect 1367 817 1420 929
-rect 1091 617 1144 657
-<< ndiffc >>
-rect 40 131 74 267
-rect 126 131 160 267
-rect 284 131 352 267
-rect 476 131 510 199
-rect 634 131 702 267
-rect 826 131 860 267
-rect 912 131 946 267
-rect 1016 131 1050 267
-rect 1102 131 1136 267
-rect 1206 131 1240 199
-rect 1292 131 1326 199
-rect 1378 131 1412 199
-<< pdiffc >>
-rect 40 657 74 1201
-rect 126 725 160 1201
-rect 284 657 352 1201
-rect 476 725 510 1201
-rect 634 725 702 1201
-rect 826 657 860 1201
-rect 912 657 946 1201
-rect 1016 725 1050 1201
-rect 1102 657 1136 1201
-rect 1206 929 1240 1201
-rect 1292 929 1326 1201
-rect 1378 929 1412 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-rect 979 1271 1003 1305
-rect 1037 1271 1061 1305
-rect 1115 1271 1139 1305
-rect 1173 1271 1197 1305
-rect 1251 1271 1275 1305
-rect 1309 1271 1333 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-rect 1003 1271 1037 1305
-rect 1139 1271 1173 1305
-rect 1275 1271 1309 1305
-<< poly >>
-rect 85 1217 115 1243
-rect 171 1217 201 1243
-rect 243 1217 273 1243
-rect 363 1217 393 1243
-rect 435 1217 465 1243
-rect 521 1217 551 1243
-rect 593 1217 623 1243
-rect 713 1217 743 1243
-rect 785 1217 815 1243
-rect 871 1217 901 1243
-rect 1061 1217 1091 1243
-rect 1251 1217 1281 1243
-rect 1337 1217 1367 1243
-rect 85 586 115 617
-rect 75 570 129 586
-rect 75 536 85 570
-rect 119 536 129 570
-rect 75 520 129 536
-rect 75 374 105 520
-rect 171 477 201 617
-rect 243 586 273 617
-rect 243 570 297 586
-rect 243 536 253 570
-rect 287 536 297 570
-rect 243 520 297 536
-rect 171 461 225 477
-rect 363 475 393 617
-rect 435 580 465 617
-rect 521 580 551 617
-rect 435 570 551 580
-rect 435 536 467 570
-rect 501 536 551 570
-rect 435 526 551 536
-rect 593 475 623 617
-rect 713 586 743 617
-rect 689 570 743 586
-rect 689 536 699 570
-rect 733 536 743 570
-rect 689 520 743 536
-rect 171 427 181 461
-rect 215 427 225 461
-rect 171 411 225 427
-rect 267 445 719 475
-rect 75 344 115 374
-rect 85 315 115 344
-rect 171 315 201 411
-rect 267 367 297 445
-rect 689 403 719 445
-rect 785 471 815 617
-rect 871 586 901 617
-rect 871 570 942 586
-rect 871 556 898 570
-rect 882 536 898 556
-rect 932 536 942 570
-rect 882 520 942 536
-rect 785 455 839 471
-rect 785 421 795 455
-rect 829 421 839 455
-rect 785 405 839 421
-rect 243 337 297 367
-rect 339 387 393 403
-rect 339 353 349 387
-rect 383 353 393 387
-rect 339 337 393 353
-rect 243 315 273 337
-rect 363 315 393 337
-rect 435 387 551 397
-rect 435 353 467 387
-rect 501 353 551 387
-rect 435 343 551 353
-rect 435 315 465 343
-rect 521 315 551 343
-rect 593 387 647 403
-rect 593 353 603 387
-rect 637 353 647 387
-rect 593 337 647 353
-rect 689 387 743 403
-rect 689 353 699 387
-rect 733 353 743 387
-rect 689 337 743 353
-rect 593 315 623 337
-rect 713 315 743 337
-rect 785 315 815 405
-rect 882 367 912 520
-rect 1061 403 1091 617
-rect 1251 601 1281 817
-rect 1241 571 1281 601
-rect 1241 471 1271 571
-rect 1337 512 1367 817
-rect 1216 455 1271 471
-rect 1216 421 1226 455
-rect 1260 421 1271 455
-rect 1313 496 1367 512
-rect 1313 462 1323 496
-rect 1357 462 1367 496
-rect 1313 446 1367 462
-rect 1216 405 1271 421
-rect 871 337 912 367
-rect 1008 387 1091 403
-rect 1008 353 1018 387
-rect 1052 353 1091 387
-rect 1008 337 1091 353
-rect 871 315 901 337
-rect 1061 315 1091 337
-rect 1241 360 1271 405
-rect 1241 330 1281 360
-rect 1251 263 1281 330
-rect 1337 263 1367 446
-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 536 119 570
-rect 253 536 287 570
-rect 467 536 501 570
-rect 699 536 733 570
-rect 181 427 215 461
-rect 898 536 932 570
-rect 795 421 829 455
-rect 349 353 383 387
-rect 467 353 501 387
-rect 603 353 637 387
-rect 699 353 733 387
-rect 1226 421 1260 455
-rect 1323 462 1357 496
-rect 1018 353 1052 387
-<< locali >>
-rect 0 1311 1452 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 1003 1311
-rect 1037 1271 1139 1311
-rect 1173 1271 1275 1311
-rect 1309 1271 1452 1311
-rect 40 1201 74 1217
-rect 17 657 40 669
-rect 126 1201 160 1271
-rect 126 709 160 725
-rect 284 1201 352 1217
-rect 17 635 74 657
-rect 476 1201 510 1271
-rect 476 709 510 725
-rect 634 1201 702 1217
-rect 352 657 355 675
-rect 284 654 355 657
-rect 634 654 702 725
-rect 17 387 51 635
-rect 108 620 355 654
-rect 535 620 702 654
-rect 826 1201 860 1271
-rect 826 641 860 657
-rect 912 1201 946 1217
-rect 1016 1201 1050 1271
-rect 1016 709 1050 725
-rect 1102 1201 1136 1217
-rect 912 654 946 657
-rect 912 620 1000 654
-rect 108 586 142 620
-rect 85 570 142 586
-rect 119 536 142 570
-rect 85 520 142 536
-rect 17 353 40 387
-rect 17 332 74 353
-rect 108 370 142 520
-rect 253 570 287 586
-rect 253 535 287 536
-rect 467 570 501 586
-rect 287 501 383 535
-rect 181 461 215 477
-rect 181 411 215 427
-rect 349 387 383 501
-rect 467 387 501 536
-rect 108 336 315 370
-rect 349 337 383 353
-rect 467 337 501 353
-rect 535 387 569 620
-rect 699 570 733 586
-rect 699 535 733 536
-rect 40 267 74 332
-rect 281 283 315 336
-rect 535 303 569 353
-rect 603 501 699 535
-rect 898 570 932 586
-rect 898 535 932 536
-rect 603 387 637 501
-rect 966 455 1000 620
-rect 779 421 795 455
-rect 829 421 845 455
-rect 912 421 1000 455
-rect 1102 455 1136 657
-rect 1206 1201 1240 1217
-rect 1206 609 1240 929
-rect 1292 1201 1326 1271
-rect 1292 913 1326 929
-rect 1378 1201 1412 1217
-rect 1378 683 1412 929
-rect 1411 666 1412 683
-rect 1411 649 1435 666
-rect 1378 632 1435 649
-rect 1206 570 1240 575
-rect 1206 536 1357 570
-rect 1323 496 1357 536
-rect 1102 421 1226 455
-rect 1260 421 1276 455
-rect 912 387 946 421
-rect 683 353 699 387
-rect 733 353 946 387
-rect 1002 353 1018 387
-rect 1052 353 1068 387
-rect 603 337 637 353
-rect 40 115 74 131
-rect 126 267 160 283
-rect 281 267 352 283
-rect 535 269 702 303
-rect 281 249 284 267
-rect 126 61 160 131
-rect 634 267 702 269
-rect 284 115 352 131
-rect 476 199 510 215
-rect 476 61 510 131
-rect 634 115 702 131
-rect 826 267 860 283
-rect 826 61 860 131
-rect 912 267 946 353
-rect 912 115 946 131
-rect 1016 267 1050 283
-rect 1016 61 1050 131
-rect 1102 267 1136 421
-rect 1323 387 1357 462
-rect 1102 115 1136 131
-rect 1206 353 1357 387
-rect 1206 199 1240 353
-rect 1401 320 1435 632
-rect 1378 286 1435 320
-rect 1206 115 1240 131
-rect 1292 199 1326 215
-rect 1292 61 1326 131
-rect 1378 199 1412 286
-rect 1378 115 1412 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 1003 1305 1037 1311
-rect 1003 1277 1037 1305
-rect 1139 1305 1173 1311
-rect 1139 1277 1173 1305
-rect 1275 1305 1309 1311
-rect 1275 1277 1309 1305
-rect 40 353 74 387
-rect 253 501 287 535
-rect 181 427 215 461
-rect 449 353 467 387
-rect 467 353 483 387
-rect 535 353 569 387
-rect 699 501 733 535
-rect 898 501 932 535
-rect 795 421 829 455
-rect 1377 649 1411 683
-rect 1206 575 1240 609
-rect 1226 421 1260 455
-rect 1018 353 1052 387
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1311 1452 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 1003 1311
-rect 1037 1277 1139 1311
-rect 1173 1277 1275 1311
-rect 1309 1277 1452 1311
-rect 0 1271 1452 1277
-rect 1365 683 1423 689
-rect 1343 649 1377 683
-rect 1411 649 1423 683
-rect 1365 643 1423 649
-rect 1194 609 1252 615
-rect 1172 575 1206 609
-rect 1240 575 1252 609
-rect 1194 569 1252 575
-rect 241 535 299 541
-rect 687 535 745 541
-rect 886 535 944 541
-rect 241 501 253 535
-rect 287 501 699 535
-rect 733 501 898 535
-rect 932 501 944 535
-rect 241 495 299 501
-rect 687 495 745 501
-rect 886 495 944 501
-rect 169 461 227 467
-rect 169 427 181 461
-rect 215 427 249 461
-rect 783 455 841 461
-rect 1214 455 1272 461
-rect 169 421 227 427
-rect 783 421 795 455
-rect 829 421 1226 455
-rect 1260 421 1272 455
-rect 783 415 841 421
-rect 1214 415 1272 421
-rect 28 387 86 393
-rect 437 387 495 393
-rect 28 353 40 387
-rect 74 353 449 387
-rect 483 353 495 387
-rect 28 347 86 353
-rect 437 347 495 353
-rect 523 387 581 393
-rect 1006 387 1064 393
-rect 523 353 535 387
-rect 569 353 1018 387
-rect 1052 353 1064 387
-rect 523 347 581 353
-rect 1006 347 1064 353
-rect 0 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel metal1 198 444 198 444 1 D
-port 1 n
-rlabel metal1 1394 666 1394 666 1 Q
-port 2 n
-rlabel metal1 1224 592 1224 592 1 QN
-port 3 n
-rlabel metal1 915 518 915 518 1 CK
-port 4 n
-rlabel viali 68 49 68 49 1 gnd
-rlabel viali 68 1285 68 1285 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__dffr_1.mag b/18T_hs/sky130_osu_sc_18T_hs__dffr_1.mag
deleted file mode 100644
index 872c2ae..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__dffr_1.mag
+++ /dev/null
@@ -1,807 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864615
-<< checkpaint >>
-rect -1210 -1243 3112 2575
-<< nwell >>
-rect -10 581 1917 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 270 817 300 1217
-rect 342 817 372 1217
-rect 546 617 576 1217
-rect 618 617 648 1217
-rect 738 617 768 1217
-rect 810 617 840 1217
-rect 896 617 926 1217
-rect 968 617 998 1217
-rect 1088 617 1118 1217
-rect 1160 617 1190 1217
-rect 1246 617 1276 1217
-rect 1436 817 1466 1217
-rect 1508 817 1538 1217
-rect 1712 617 1742 1217
-rect 1798 617 1828 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 270 115 300 263
-rect 356 115 386 263
-rect 546 115 576 315
-rect 618 115 648 315
-rect 738 115 768 315
-rect 810 115 840 315
-rect 896 115 926 315
-rect 968 115 998 315
-rect 1088 115 1118 315
-rect 1160 115 1190 315
-rect 1246 115 1276 315
-rect 1436 115 1466 263
-rect 1522 115 1552 263
-rect 1712 115 1742 315
-rect 1798 115 1828 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 493 267 546 315
-rect 110 115 163 131
-rect 217 199 270 263
-rect 217 131 225 199
-rect 259 131 270 199
-rect 217 115 270 131
-rect 300 199 356 263
-rect 300 131 311 199
-rect 345 131 356 199
-rect 300 115 356 131
-rect 386 199 439 263
-rect 386 131 397 199
-rect 431 131 439 199
-rect 386 115 439 131
-rect 493 131 501 267
-rect 535 131 546 267
-rect 493 115 546 131
-rect 576 115 618 315
-rect 648 267 738 315
-rect 648 131 659 267
-rect 727 131 738 267
-rect 648 115 738 131
-rect 768 115 810 315
-rect 840 199 896 315
-rect 840 131 851 199
-rect 885 131 896 199
-rect 840 115 896 131
-rect 926 115 968 315
-rect 998 267 1088 315
-rect 998 131 1009 267
-rect 1077 131 1088 267
-rect 998 115 1088 131
-rect 1118 115 1160 315
-rect 1190 267 1246 315
-rect 1190 131 1201 267
-rect 1235 131 1246 267
-rect 1190 115 1246 131
-rect 1276 267 1329 315
-rect 1276 131 1287 267
-rect 1321 131 1329 267
-rect 1276 115 1329 131
-rect 1383 199 1436 263
-rect 1383 131 1391 199
-rect 1425 131 1436 199
-rect 1383 115 1436 131
-rect 1466 199 1522 263
-rect 1466 131 1477 199
-rect 1511 131 1522 199
-rect 1466 115 1522 131
-rect 1552 199 1605 263
-rect 1552 131 1563 199
-rect 1597 131 1605 199
-rect 1552 115 1605 131
-rect 1659 199 1712 315
-rect 1659 131 1667 199
-rect 1701 131 1712 199
-rect 1659 115 1712 131
-rect 1742 199 1798 315
-rect 1742 131 1753 199
-rect 1787 131 1798 199
-rect 1742 115 1798 131
-rect 1828 199 1881 315
-rect 1828 131 1839 199
-rect 1873 131 1881 199
-rect 1828 115 1881 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 217 1201 270 1217
-rect 217 861 225 1201
-rect 259 861 270 1201
-rect 217 817 270 861
-rect 300 817 342 1217
-rect 372 1201 425 1217
-rect 372 861 383 1201
-rect 417 861 425 1201
-rect 372 817 425 861
-rect 493 1201 546 1217
-rect 110 617 163 657
-rect 493 725 501 1201
-rect 535 725 546 1201
-rect 493 617 546 725
-rect 576 617 618 1217
-rect 648 1201 738 1217
-rect 648 657 659 1201
-rect 727 657 738 1201
-rect 648 617 738 657
-rect 768 617 810 1217
-rect 840 1201 896 1217
-rect 840 725 851 1201
-rect 885 725 896 1201
-rect 840 617 896 725
-rect 926 617 968 1217
-rect 998 1201 1088 1217
-rect 998 725 1009 1201
-rect 1077 725 1088 1201
-rect 998 617 1088 725
-rect 1118 617 1160 1217
-rect 1190 1201 1246 1217
-rect 1190 657 1201 1201
-rect 1235 657 1246 1201
-rect 1190 617 1246 657
-rect 1276 1201 1329 1217
-rect 1276 657 1287 1201
-rect 1321 657 1329 1201
-rect 1383 1201 1436 1217
-rect 1383 861 1391 1201
-rect 1425 861 1436 1201
-rect 1383 817 1436 861
-rect 1466 817 1508 1217
-rect 1538 1201 1591 1217
-rect 1538 861 1549 1201
-rect 1583 861 1591 1201
-rect 1538 817 1591 861
-rect 1659 1201 1712 1217
-rect 1659 861 1667 1201
-rect 1701 861 1712 1201
-rect 1276 617 1329 657
-rect 1659 617 1712 861
-rect 1742 1201 1798 1217
-rect 1742 861 1753 1201
-rect 1787 861 1798 1201
-rect 1742 617 1798 861
-rect 1828 1201 1881 1217
-rect 1828 861 1839 1201
-rect 1873 861 1881 1201
-rect 1828 617 1881 861
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 225 131 259 199
-rect 311 131 345 199
-rect 397 131 431 199
-rect 501 131 535 267
-rect 659 131 727 267
-rect 851 131 885 199
-rect 1009 131 1077 267
-rect 1201 131 1235 267
-rect 1287 131 1321 267
-rect 1391 131 1425 199
-rect 1477 131 1511 199
-rect 1563 131 1597 199
-rect 1667 131 1701 199
-rect 1753 131 1787 199
-rect 1839 131 1873 199
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 225 861 259 1201
-rect 383 861 417 1201
-rect 501 725 535 1201
-rect 659 657 727 1201
-rect 851 725 885 1201
-rect 1009 725 1077 1201
-rect 1201 657 1235 1201
-rect 1287 657 1321 1201
-rect 1391 861 1425 1201
-rect 1549 861 1583 1201
-rect 1667 861 1701 1201
-rect 1753 861 1787 1201
-rect 1839 861 1873 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-rect 1658 1271 1682 1305
-rect 1716 1271 1740 1305
-rect 1794 1271 1818 1305
-rect 1852 1271 1876 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-rect 1682 1271 1716 1305
-rect 1818 1271 1852 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 270 1217 300 1243
-rect 342 1217 372 1243
-rect 546 1217 576 1243
-rect 618 1217 648 1243
-rect 738 1217 768 1243
-rect 810 1217 840 1243
-rect 896 1217 926 1243
-rect 968 1217 998 1243
-rect 1088 1217 1118 1243
-rect 1160 1217 1190 1243
-rect 1246 1217 1276 1243
-rect 1436 1217 1466 1243
-rect 1508 1217 1538 1243
-rect 1712 1217 1742 1243
-rect 1798 1217 1828 1243
-rect 80 494 110 617
-rect 79 478 133 494
-rect 79 444 89 478
-rect 123 444 133 478
-rect 79 428 133 444
-rect 79 427 110 428
-rect 80 315 110 427
-rect 270 351 300 817
-rect 342 584 372 817
-rect 342 568 415 584
-rect 342 534 371 568
-rect 405 534 415 568
-rect 342 518 415 534
-rect 219 335 300 351
-rect 219 301 229 335
-rect 263 301 300 335
-rect 219 285 300 301
-rect 270 263 300 285
-rect 356 263 386 518
-rect 546 477 576 617
-rect 618 586 648 617
-rect 618 570 672 586
-rect 618 536 628 570
-rect 662 536 672 570
-rect 618 520 672 536
-rect 546 461 600 477
-rect 738 475 768 617
-rect 810 580 840 617
-rect 896 580 926 617
-rect 810 570 926 580
-rect 810 536 842 570
-rect 876 536 926 570
-rect 810 526 926 536
-rect 968 475 998 617
-rect 1088 586 1118 617
-rect 1064 570 1118 586
-rect 1064 536 1074 570
-rect 1108 536 1118 570
-rect 1064 520 1118 536
-rect 546 427 556 461
-rect 590 427 600 461
-rect 546 411 600 427
-rect 642 445 1094 475
-rect 546 315 576 411
-rect 642 367 672 445
-rect 1064 403 1094 445
-rect 1160 471 1190 617
-rect 1246 586 1276 617
-rect 1246 570 1317 586
-rect 1246 556 1273 570
-rect 1257 536 1273 556
-rect 1307 536 1317 570
-rect 1257 520 1317 536
-rect 1160 455 1214 471
-rect 1160 421 1170 455
-rect 1204 421 1214 455
-rect 1160 405 1214 421
-rect 618 337 672 367
-rect 714 387 768 403
-rect 714 353 724 387
-rect 758 353 768 387
-rect 714 337 768 353
-rect 618 315 648 337
-rect 738 315 768 337
-rect 810 387 926 397
-rect 810 353 842 387
-rect 876 353 926 387
-rect 810 343 926 353
-rect 810 315 840 343
-rect 896 315 926 343
-rect 968 387 1022 403
-rect 968 353 978 387
-rect 1012 353 1022 387
-rect 968 337 1022 353
-rect 1064 387 1118 403
-rect 1064 353 1074 387
-rect 1108 353 1118 387
-rect 1064 337 1118 353
-rect 968 315 998 337
-rect 1088 315 1118 337
-rect 1160 315 1190 405
-rect 1257 367 1287 520
-rect 1436 403 1466 817
-rect 1246 337 1287 367
-rect 1399 387 1466 403
-rect 1399 353 1409 387
-rect 1443 353 1466 387
-rect 1399 337 1466 353
-rect 1246 315 1276 337
-rect 1423 336 1466 337
-rect 1436 263 1466 336
-rect 1508 351 1538 817
-rect 1712 601 1742 617
-rect 1702 571 1742 601
-rect 1702 471 1732 571
-rect 1798 512 1828 617
-rect 1677 455 1732 471
-rect 1677 421 1687 455
-rect 1721 421 1732 455
-rect 1774 496 1828 512
-rect 1774 462 1784 496
-rect 1818 462 1828 496
-rect 1774 446 1828 462
-rect 1677 405 1732 421
-rect 1702 360 1732 405
-rect 1508 335 1589 351
-rect 1508 301 1545 335
-rect 1579 301 1589 335
-rect 1702 330 1742 360
-rect 1712 315 1742 330
-rect 1798 315 1828 446
-rect 1508 285 1589 301
-rect 1522 263 1552 285
-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 444 123 478
-rect 371 534 405 568
-rect 229 301 263 335
-rect 628 536 662 570
-rect 842 536 876 570
-rect 1074 536 1108 570
-rect 556 427 590 461
-rect 1273 536 1307 570
-rect 1170 421 1204 455
-rect 724 353 758 387
-rect 842 353 876 387
-rect 978 353 1012 387
-rect 1074 353 1108 387
-rect 1409 353 1443 387
-rect 1687 421 1721 455
-rect 1784 462 1818 496
-rect 1545 301 1579 335
-<< locali >>
-rect 0 1311 1914 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1682 1311
-rect 1716 1271 1818 1311
-rect 1852 1271 1914 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 494 81 649
-rect 121 565 155 657
-rect 225 1201 259 1217
-rect 121 531 191 565
-rect 47 478 123 494
-rect 47 444 89 478
-rect 89 428 123 444
-rect 157 335 191 531
-rect 225 421 259 861
-rect 383 1201 417 1271
-rect 383 845 417 861
-rect 501 1201 535 1271
-rect 501 709 535 725
-rect 659 1201 727 1217
-rect 851 1201 885 1271
-rect 851 709 885 725
-rect 1009 1201 1077 1217
-rect 659 654 727 657
-rect 1009 654 1077 725
-rect 405 620 727 654
-rect 910 620 1077 654
-rect 1201 1201 1235 1271
-rect 1201 641 1235 657
-rect 1287 1201 1321 1217
-rect 1391 1201 1425 1217
-rect 1391 773 1425 861
-rect 1549 1201 1583 1271
-rect 1549 845 1583 861
-rect 1667 1201 1701 1217
-rect 1391 739 1511 773
-rect 1287 654 1321 657
-rect 1287 620 1377 654
-rect 405 584 439 620
-rect 371 568 439 584
-rect 405 534 439 568
-rect 371 518 439 534
-rect 225 387 345 421
-rect 229 335 263 351
-rect 121 301 229 335
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 301
-rect 121 115 155 131
-rect 225 199 259 215
-rect 225 61 259 131
-rect 311 199 345 353
-rect 405 370 439 518
-rect 628 570 662 586
-rect 628 535 662 536
-rect 842 570 876 586
-rect 662 501 758 535
-rect 556 461 590 477
-rect 556 411 590 427
-rect 724 387 758 501
-rect 842 387 876 536
-rect 405 336 690 370
-rect 724 337 758 353
-rect 842 337 876 353
-rect 910 387 944 620
-rect 1074 570 1108 586
-rect 1074 535 1108 536
-rect 656 283 690 336
-rect 910 303 944 353
-rect 978 501 1074 535
-rect 1273 570 1307 586
-rect 1273 535 1307 536
-rect 978 387 1012 501
-rect 1341 455 1377 620
-rect 1154 421 1170 455
-rect 1204 421 1220 455
-rect 1287 421 1377 455
-rect 1477 455 1511 739
-rect 1667 609 1701 861
-rect 1753 1201 1787 1271
-rect 1753 845 1787 861
-rect 1839 1201 1873 1217
-rect 1839 683 1873 861
-rect 1872 666 1873 683
-rect 1872 649 1896 666
-rect 1839 632 1896 649
-rect 1667 570 1701 575
-rect 1667 536 1818 570
-rect 1784 496 1818 536
-rect 1477 421 1687 455
-rect 1721 421 1737 455
-rect 1287 387 1321 421
-rect 1058 353 1074 387
-rect 1108 353 1321 387
-rect 978 337 1012 353
-rect 501 267 535 283
-rect 311 115 345 131
-rect 397 199 431 215
-rect 397 61 431 131
-rect 656 267 727 283
-rect 910 269 1077 303
-rect 656 249 659 267
-rect 501 61 535 131
-rect 1009 267 1077 269
-rect 659 115 727 131
-rect 851 199 885 215
-rect 851 61 885 131
-rect 1009 115 1077 131
-rect 1201 267 1235 283
-rect 1201 61 1235 131
-rect 1287 267 1321 353
-rect 1409 387 1443 403
-rect 1409 337 1443 353
-rect 1287 115 1321 131
-rect 1391 199 1425 215
-rect 1391 61 1425 131
-rect 1477 199 1511 421
-rect 1784 387 1818 462
-rect 1667 353 1818 387
-rect 1545 335 1579 351
-rect 1477 115 1511 131
-rect 1563 199 1597 215
-rect 1563 61 1597 131
-rect 1667 199 1701 353
-rect 1862 320 1896 632
-rect 1839 286 1896 320
-rect 1667 115 1701 131
-rect 1753 199 1787 215
-rect 1753 61 1787 131
-rect 1839 199 1873 286
-rect 1839 115 1873 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 1682 1305 1716 1311
-rect 1682 1277 1716 1305
-rect 1818 1305 1852 1311
-rect 1818 1277 1852 1305
-rect 47 649 81 683
-rect 311 353 345 387
-rect 229 301 263 313
-rect 229 279 263 301
-rect 628 501 662 535
-rect 556 427 590 461
-rect 824 353 842 387
-rect 842 353 858 387
-rect 910 353 944 387
-rect 1074 501 1108 535
-rect 1273 501 1307 535
-rect 1170 421 1204 455
-rect 1838 649 1872 683
-rect 1667 575 1701 609
-rect 1687 421 1721 455
-rect 1409 353 1443 387
-rect 1545 301 1579 313
-rect 1545 279 1579 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 1311 1914 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1682 1311
-rect 1716 1277 1818 1311
-rect 1852 1277 1914 1311
-rect 0 1271 1914 1277
-rect 35 683 93 689
-rect 1826 683 1884 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 1804 649 1838 683
-rect 1872 649 1884 683
-rect 35 643 93 649
-rect 1826 643 1884 649
-rect 1655 609 1713 615
-rect 1632 575 1667 609
-rect 1701 575 1713 609
-rect 1655 569 1713 575
-rect 616 535 674 541
-rect 1062 535 1120 541
-rect 1261 535 1319 541
-rect 616 501 628 535
-rect 662 501 1074 535
-rect 1108 501 1273 535
-rect 1307 501 1319 535
-rect 616 495 674 501
-rect 1062 495 1120 501
-rect 1261 495 1319 501
-rect 544 461 602 467
-rect 544 427 556 461
-rect 590 427 624 461
-rect 1158 455 1216 461
-rect 1675 455 1733 461
-rect 544 421 602 427
-rect 1158 421 1170 455
-rect 1204 421 1687 455
-rect 1721 421 1733 455
-rect 1158 415 1216 421
-rect 1675 415 1733 421
-rect 299 387 357 393
-rect 812 387 870 393
-rect 299 353 311 387
-rect 345 353 824 387
-rect 858 353 870 387
-rect 299 347 357 353
-rect 812 347 870 353
-rect 898 387 956 393
-rect 1397 387 1455 393
-rect 898 353 910 387
-rect 944 353 1409 387
-rect 1443 353 1455 387
-rect 898 347 956 353
-rect 1397 347 1455 353
-rect 217 313 275 319
-rect 1533 313 1591 319
-rect 217 279 229 313
-rect 263 279 1545 313
-rect 1579 279 1591 313
-rect 217 273 275 279
-rect 1533 273 1591 279
-rect 0 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel metal1 65 666 65 666 1 RN
-port 1 n
-rlabel metal1 573 444 573 444 1 D
-port 2 n
-rlabel metal1 1290 518 1290 518 1 CK
-port 3 n
-rlabel metal1 1855 666 1855 666 1 Q
-port 4 n
-rlabel metal1 1685 592 1685 592 1 QN
-port 5 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__dffr_l.mag b/18T_hs/sky130_osu_sc_18T_hs__dffr_l.mag
deleted file mode 100644
index 0cd69ad..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__dffr_l.mag
+++ /dev/null
@@ -1,807 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864615
-<< checkpaint >>
-rect -1210 -1243 3112 2575
-<< nwell >>
-rect -10 581 1917 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 270 817 300 1217
-rect 342 817 372 1217
-rect 546 617 576 1217
-rect 618 617 648 1217
-rect 738 617 768 1217
-rect 810 617 840 1217
-rect 896 617 926 1217
-rect 968 617 998 1217
-rect 1088 617 1118 1217
-rect 1160 617 1190 1217
-rect 1246 617 1276 1217
-rect 1436 817 1466 1217
-rect 1508 817 1538 1217
-rect 1712 817 1742 1217
-rect 1798 817 1828 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 270 115 300 263
-rect 356 115 386 263
-rect 546 115 576 315
-rect 618 115 648 315
-rect 738 115 768 315
-rect 810 115 840 315
-rect 896 115 926 315
-rect 968 115 998 315
-rect 1088 115 1118 315
-rect 1160 115 1190 315
-rect 1246 115 1276 315
-rect 1436 115 1466 263
-rect 1522 115 1552 263
-rect 1712 115 1742 263
-rect 1798 115 1828 263
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 493 267 546 315
-rect 110 115 163 131
-rect 217 199 270 263
-rect 217 131 225 199
-rect 259 131 270 199
-rect 217 115 270 131
-rect 300 199 356 263
-rect 300 131 311 199
-rect 345 131 356 199
-rect 300 115 356 131
-rect 386 199 439 263
-rect 386 131 397 199
-rect 431 131 439 199
-rect 386 115 439 131
-rect 493 131 501 267
-rect 535 131 546 267
-rect 493 115 546 131
-rect 576 115 618 315
-rect 648 267 738 315
-rect 648 131 659 267
-rect 727 131 738 267
-rect 648 115 738 131
-rect 768 115 810 315
-rect 840 199 896 315
-rect 840 131 851 199
-rect 885 131 896 199
-rect 840 115 896 131
-rect 926 115 968 315
-rect 998 267 1088 315
-rect 998 131 1009 267
-rect 1077 131 1088 267
-rect 998 115 1088 131
-rect 1118 115 1160 315
-rect 1190 267 1246 315
-rect 1190 131 1201 267
-rect 1235 131 1246 267
-rect 1190 115 1246 131
-rect 1276 267 1329 315
-rect 1276 131 1287 267
-rect 1321 131 1329 267
-rect 1276 115 1329 131
-rect 1383 199 1436 263
-rect 1383 131 1391 199
-rect 1425 131 1436 199
-rect 1383 115 1436 131
-rect 1466 199 1522 263
-rect 1466 131 1477 199
-rect 1511 131 1522 199
-rect 1466 115 1522 131
-rect 1552 199 1605 263
-rect 1552 131 1563 199
-rect 1597 131 1605 199
-rect 1552 115 1605 131
-rect 1659 199 1712 263
-rect 1659 131 1667 199
-rect 1701 131 1712 199
-rect 1659 115 1712 131
-rect 1742 199 1798 263
-rect 1742 131 1753 199
-rect 1787 131 1798 199
-rect 1742 115 1798 131
-rect 1828 199 1881 263
-rect 1828 131 1839 199
-rect 1873 131 1881 199
-rect 1828 115 1881 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 217 1201 270 1217
-rect 217 861 225 1201
-rect 259 861 270 1201
-rect 217 817 270 861
-rect 300 817 342 1217
-rect 372 1201 425 1217
-rect 372 861 383 1201
-rect 417 861 425 1201
-rect 372 817 425 861
-rect 493 1201 546 1217
-rect 110 617 163 657
-rect 493 725 501 1201
-rect 535 725 546 1201
-rect 493 617 546 725
-rect 576 617 618 1217
-rect 648 1201 738 1217
-rect 648 657 659 1201
-rect 727 657 738 1201
-rect 648 617 738 657
-rect 768 617 810 1217
-rect 840 1201 896 1217
-rect 840 725 851 1201
-rect 885 725 896 1201
-rect 840 617 896 725
-rect 926 617 968 1217
-rect 998 1201 1088 1217
-rect 998 725 1009 1201
-rect 1077 725 1088 1201
-rect 998 617 1088 725
-rect 1118 617 1160 1217
-rect 1190 1201 1246 1217
-rect 1190 657 1201 1201
-rect 1235 657 1246 1201
-rect 1190 617 1246 657
-rect 1276 1201 1329 1217
-rect 1276 657 1287 1201
-rect 1321 657 1329 1201
-rect 1383 1201 1436 1217
-rect 1383 861 1391 1201
-rect 1425 861 1436 1201
-rect 1383 817 1436 861
-rect 1466 817 1508 1217
-rect 1538 1201 1591 1217
-rect 1538 861 1549 1201
-rect 1583 861 1591 1201
-rect 1538 817 1591 861
-rect 1659 1201 1712 1217
-rect 1659 861 1667 1201
-rect 1701 861 1712 1201
-rect 1659 817 1712 861
-rect 1742 1201 1798 1217
-rect 1742 861 1753 1201
-rect 1787 861 1798 1201
-rect 1742 817 1798 861
-rect 1828 1201 1881 1217
-rect 1828 861 1839 1201
-rect 1873 861 1881 1201
-rect 1828 817 1881 861
-rect 1276 617 1329 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 225 131 259 199
-rect 311 131 345 199
-rect 397 131 431 199
-rect 501 131 535 267
-rect 659 131 727 267
-rect 851 131 885 199
-rect 1009 131 1077 267
-rect 1201 131 1235 267
-rect 1287 131 1321 267
-rect 1391 131 1425 199
-rect 1477 131 1511 199
-rect 1563 131 1597 199
-rect 1667 131 1701 199
-rect 1753 131 1787 199
-rect 1839 131 1873 199
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 225 861 259 1201
-rect 383 861 417 1201
-rect 501 725 535 1201
-rect 659 657 727 1201
-rect 851 725 885 1201
-rect 1009 725 1077 1201
-rect 1201 657 1235 1201
-rect 1287 657 1321 1201
-rect 1391 861 1425 1201
-rect 1549 861 1583 1201
-rect 1667 861 1701 1201
-rect 1753 861 1787 1201
-rect 1839 861 1873 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-rect 1658 1271 1682 1305
-rect 1716 1271 1740 1305
-rect 1794 1271 1818 1305
-rect 1852 1271 1876 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-rect 1682 1271 1716 1305
-rect 1818 1271 1852 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 270 1217 300 1243
-rect 342 1217 372 1243
-rect 546 1217 576 1243
-rect 618 1217 648 1243
-rect 738 1217 768 1243
-rect 810 1217 840 1243
-rect 896 1217 926 1243
-rect 968 1217 998 1243
-rect 1088 1217 1118 1243
-rect 1160 1217 1190 1243
-rect 1246 1217 1276 1243
-rect 1436 1217 1466 1243
-rect 1508 1217 1538 1243
-rect 1712 1217 1742 1243
-rect 1798 1217 1828 1243
-rect 80 494 110 617
-rect 79 478 133 494
-rect 79 444 89 478
-rect 123 444 133 478
-rect 79 428 133 444
-rect 79 427 110 428
-rect 80 315 110 427
-rect 270 351 300 817
-rect 342 584 372 817
-rect 342 568 415 584
-rect 342 534 371 568
-rect 405 534 415 568
-rect 342 518 415 534
-rect 219 335 300 351
-rect 219 301 229 335
-rect 263 301 300 335
-rect 219 285 300 301
-rect 270 263 300 285
-rect 356 263 386 518
-rect 546 477 576 617
-rect 618 586 648 617
-rect 618 570 672 586
-rect 618 536 628 570
-rect 662 536 672 570
-rect 618 520 672 536
-rect 546 461 600 477
-rect 738 475 768 617
-rect 810 580 840 617
-rect 896 580 926 617
-rect 810 570 926 580
-rect 810 536 842 570
-rect 876 536 926 570
-rect 810 526 926 536
-rect 968 475 998 617
-rect 1088 586 1118 617
-rect 1064 570 1118 586
-rect 1064 536 1074 570
-rect 1108 536 1118 570
-rect 1064 520 1118 536
-rect 546 427 556 461
-rect 590 427 600 461
-rect 546 411 600 427
-rect 642 445 1094 475
-rect 546 315 576 411
-rect 642 367 672 445
-rect 1064 403 1094 445
-rect 1160 471 1190 617
-rect 1246 586 1276 617
-rect 1246 570 1317 586
-rect 1246 556 1273 570
-rect 1257 536 1273 556
-rect 1307 536 1317 570
-rect 1257 520 1317 536
-rect 1160 455 1214 471
-rect 1160 421 1170 455
-rect 1204 421 1214 455
-rect 1160 405 1214 421
-rect 618 337 672 367
-rect 714 387 768 403
-rect 714 353 724 387
-rect 758 353 768 387
-rect 714 337 768 353
-rect 618 315 648 337
-rect 738 315 768 337
-rect 810 387 926 397
-rect 810 353 842 387
-rect 876 353 926 387
-rect 810 343 926 353
-rect 810 315 840 343
-rect 896 315 926 343
-rect 968 387 1022 403
-rect 968 353 978 387
-rect 1012 353 1022 387
-rect 968 337 1022 353
-rect 1064 387 1118 403
-rect 1064 353 1074 387
-rect 1108 353 1118 387
-rect 1064 337 1118 353
-rect 968 315 998 337
-rect 1088 315 1118 337
-rect 1160 315 1190 405
-rect 1257 367 1287 520
-rect 1436 403 1466 817
-rect 1246 337 1287 367
-rect 1399 387 1466 403
-rect 1399 353 1409 387
-rect 1443 353 1466 387
-rect 1399 337 1466 353
-rect 1246 315 1276 337
-rect 1423 336 1466 337
-rect 1436 263 1466 336
-rect 1508 351 1538 817
-rect 1712 601 1742 817
-rect 1702 571 1742 601
-rect 1702 471 1732 571
-rect 1798 512 1828 817
-rect 1677 455 1732 471
-rect 1677 421 1687 455
-rect 1721 421 1732 455
-rect 1774 496 1828 512
-rect 1774 462 1784 496
-rect 1818 462 1828 496
-rect 1774 446 1828 462
-rect 1677 405 1732 421
-rect 1702 360 1732 405
-rect 1508 335 1589 351
-rect 1508 301 1545 335
-rect 1579 301 1589 335
-rect 1702 330 1742 360
-rect 1508 285 1589 301
-rect 1522 263 1552 285
-rect 1712 263 1742 330
-rect 1798 263 1828 446
-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 444 123 478
-rect 371 534 405 568
-rect 229 301 263 335
-rect 628 536 662 570
-rect 842 536 876 570
-rect 1074 536 1108 570
-rect 556 427 590 461
-rect 1273 536 1307 570
-rect 1170 421 1204 455
-rect 724 353 758 387
-rect 842 353 876 387
-rect 978 353 1012 387
-rect 1074 353 1108 387
-rect 1409 353 1443 387
-rect 1687 421 1721 455
-rect 1784 462 1818 496
-rect 1545 301 1579 335
-<< locali >>
-rect 0 1311 1914 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1682 1311
-rect 1716 1271 1818 1311
-rect 1852 1271 1914 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 494 81 649
-rect 121 565 155 657
-rect 225 1201 259 1217
-rect 121 531 191 565
-rect 47 478 123 494
-rect 47 444 89 478
-rect 89 428 123 444
-rect 157 335 191 531
-rect 225 421 259 861
-rect 383 1201 417 1271
-rect 383 845 417 861
-rect 501 1201 535 1271
-rect 501 709 535 725
-rect 659 1201 727 1217
-rect 851 1201 885 1271
-rect 851 709 885 725
-rect 1009 1201 1077 1217
-rect 659 654 727 657
-rect 1009 654 1077 725
-rect 405 620 727 654
-rect 910 620 1077 654
-rect 1201 1201 1235 1271
-rect 1201 641 1235 657
-rect 1287 1201 1321 1217
-rect 1391 1201 1425 1217
-rect 1391 773 1425 861
-rect 1549 1201 1583 1271
-rect 1549 845 1583 861
-rect 1667 1201 1701 1217
-rect 1391 739 1511 773
-rect 1287 654 1321 657
-rect 1287 620 1377 654
-rect 405 584 439 620
-rect 371 568 439 584
-rect 405 534 439 568
-rect 371 518 439 534
-rect 225 387 345 421
-rect 229 335 263 351
-rect 121 301 229 335
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 301
-rect 121 115 155 131
-rect 225 199 259 215
-rect 225 61 259 131
-rect 311 199 345 353
-rect 405 370 439 518
-rect 628 570 662 586
-rect 628 535 662 536
-rect 842 570 876 586
-rect 662 501 758 535
-rect 556 461 590 477
-rect 556 411 590 427
-rect 724 387 758 501
-rect 842 387 876 536
-rect 405 336 690 370
-rect 724 337 758 353
-rect 842 337 876 353
-rect 910 387 944 620
-rect 1074 570 1108 586
-rect 1074 535 1108 536
-rect 656 283 690 336
-rect 910 303 944 353
-rect 978 501 1074 535
-rect 1273 570 1307 586
-rect 1273 535 1307 536
-rect 978 387 1012 501
-rect 1341 455 1377 620
-rect 1154 421 1170 455
-rect 1204 421 1220 455
-rect 1287 421 1377 455
-rect 1477 455 1511 739
-rect 1667 609 1701 861
-rect 1753 1201 1787 1271
-rect 1753 845 1787 861
-rect 1839 1201 1873 1217
-rect 1839 683 1873 861
-rect 1872 666 1873 683
-rect 1872 649 1896 666
-rect 1839 632 1896 649
-rect 1667 570 1701 575
-rect 1667 536 1818 570
-rect 1784 496 1818 536
-rect 1477 421 1687 455
-rect 1721 421 1737 455
-rect 1287 387 1321 421
-rect 1058 353 1074 387
-rect 1108 353 1321 387
-rect 978 337 1012 353
-rect 501 267 535 283
-rect 311 115 345 131
-rect 397 199 431 215
-rect 397 61 431 131
-rect 656 267 727 283
-rect 910 269 1077 303
-rect 656 249 659 267
-rect 501 61 535 131
-rect 1009 267 1077 269
-rect 659 115 727 131
-rect 851 199 885 215
-rect 851 61 885 131
-rect 1009 115 1077 131
-rect 1201 267 1235 283
-rect 1201 61 1235 131
-rect 1287 267 1321 353
-rect 1409 387 1443 403
-rect 1409 337 1443 353
-rect 1287 115 1321 131
-rect 1391 199 1425 215
-rect 1391 61 1425 131
-rect 1477 199 1511 421
-rect 1784 387 1818 462
-rect 1667 353 1818 387
-rect 1545 335 1579 351
-rect 1477 115 1511 131
-rect 1563 199 1597 215
-rect 1563 61 1597 131
-rect 1667 199 1701 353
-rect 1862 320 1896 632
-rect 1839 286 1896 320
-rect 1667 115 1701 131
-rect 1753 199 1787 215
-rect 1753 61 1787 131
-rect 1839 199 1873 286
-rect 1839 115 1873 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 1682 1305 1716 1311
-rect 1682 1277 1716 1305
-rect 1818 1305 1852 1311
-rect 1818 1277 1852 1305
-rect 47 649 81 683
-rect 311 353 345 387
-rect 229 301 263 313
-rect 229 279 263 301
-rect 628 501 662 535
-rect 556 427 590 461
-rect 824 353 842 387
-rect 842 353 858 387
-rect 910 353 944 387
-rect 1074 501 1108 535
-rect 1273 501 1307 535
-rect 1170 421 1204 455
-rect 1838 649 1872 683
-rect 1667 575 1701 609
-rect 1687 421 1721 455
-rect 1409 353 1443 387
-rect 1545 301 1579 313
-rect 1545 279 1579 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 1311 1914 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1682 1311
-rect 1716 1277 1818 1311
-rect 1852 1277 1914 1311
-rect 0 1271 1914 1277
-rect 35 683 93 689
-rect 1826 683 1884 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 1804 649 1838 683
-rect 1872 649 1884 683
-rect 35 643 93 649
-rect 1826 643 1884 649
-rect 1655 609 1713 615
-rect 1632 575 1667 609
-rect 1701 575 1713 609
-rect 1655 569 1713 575
-rect 616 535 674 541
-rect 1062 535 1120 541
-rect 1261 535 1319 541
-rect 616 501 628 535
-rect 662 501 1074 535
-rect 1108 501 1273 535
-rect 1307 501 1319 535
-rect 616 495 674 501
-rect 1062 495 1120 501
-rect 1261 495 1319 501
-rect 544 461 602 467
-rect 544 427 556 461
-rect 590 427 624 461
-rect 1158 455 1216 461
-rect 1675 455 1733 461
-rect 544 421 602 427
-rect 1158 421 1170 455
-rect 1204 421 1687 455
-rect 1721 421 1733 455
-rect 1158 415 1216 421
-rect 1675 415 1733 421
-rect 299 387 357 393
-rect 812 387 870 393
-rect 299 353 311 387
-rect 345 353 824 387
-rect 858 353 870 387
-rect 299 347 357 353
-rect 812 347 870 353
-rect 898 387 956 393
-rect 1397 387 1455 393
-rect 898 353 910 387
-rect 944 353 1409 387
-rect 1443 353 1455 387
-rect 898 347 956 353
-rect 1397 347 1455 353
-rect 217 313 275 319
-rect 1533 313 1591 319
-rect 217 279 229 313
-rect 263 279 1545 313
-rect 1579 279 1591 313
-rect 217 273 275 279
-rect 1533 273 1591 279
-rect 0 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel metal1 65 666 65 666 1 RN
-port 1 n
-rlabel metal1 573 444 573 444 1 D
-port 2 n
-rlabel metal1 1290 518 1290 518 1 CK
-port 3 n
-rlabel metal1 1855 666 1855 666 1 Q
-port 4 n
-rlabel metal1 1685 592 1685 592 1 QN
-port 5 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__dffs_1.mag b/18T_hs/sky130_osu_sc_18T_hs__dffs_1.mag
deleted file mode 100644
index 971eec1..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__dffs_1.mag
+++ /dev/null
@@ -1,721 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864615
-<< checkpaint >>
-rect -1210 -1243 2840 2575
-<< nwell >>
-rect -10 581 1741 1341
-<< pmos >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 356 617 386 1217
-rect 428 617 458 1217
-rect 548 617 578 1217
-rect 620 617 650 1217
-rect 706 617 736 1217
-rect 778 617 808 1217
-rect 898 617 928 1217
-rect 970 617 1000 1217
-rect 1056 617 1086 1217
-rect 1246 817 1276 1217
-rect 1332 817 1362 1217
-rect 1522 617 1552 1217
-rect 1608 617 1638 1217
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 356 115 386 315
-rect 428 115 458 315
-rect 548 115 578 315
-rect 620 115 650 315
-rect 706 115 736 315
-rect 778 115 808 315
-rect 898 115 928 315
-rect 970 115 1000 315
-rect 1056 115 1086 315
-rect 1246 115 1276 263
-rect 1318 115 1348 263
-rect 1522 115 1552 315
-rect 1608 115 1638 315
-<< ndiff >>
-rect 303 267 356 315
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 115 152 263
-rect 182 199 235 263
-rect 182 131 193 199
-rect 227 131 235 199
-rect 182 115 235 131
-rect 303 131 311 267
-rect 345 131 356 267
-rect 303 115 356 131
-rect 386 115 428 315
-rect 458 267 548 315
-rect 458 131 469 267
-rect 537 131 548 267
-rect 458 115 548 131
-rect 578 115 620 315
-rect 650 199 706 315
-rect 650 131 661 199
-rect 695 131 706 199
-rect 650 115 706 131
-rect 736 115 778 315
-rect 808 267 898 315
-rect 808 131 819 267
-rect 887 131 898 267
-rect 808 115 898 131
-rect 928 115 970 315
-rect 1000 267 1056 315
-rect 1000 131 1011 267
-rect 1045 131 1056 267
-rect 1000 115 1056 131
-rect 1086 267 1139 315
-rect 1086 131 1097 267
-rect 1131 131 1139 267
-rect 1086 115 1139 131
-rect 1193 199 1246 263
-rect 1193 131 1201 199
-rect 1235 131 1246 199
-rect 1193 115 1246 131
-rect 1276 115 1318 263
-rect 1348 199 1401 263
-rect 1348 131 1359 199
-rect 1393 131 1401 199
-rect 1348 115 1401 131
-rect 1469 199 1522 315
-rect 1469 131 1477 199
-rect 1511 131 1522 199
-rect 1469 115 1522 131
-rect 1552 199 1608 315
-rect 1552 131 1563 199
-rect 1597 131 1608 199
-rect 1552 115 1608 131
-rect 1638 199 1691 315
-rect 1638 131 1649 199
-rect 1683 131 1691 199
-rect 1638 115 1691 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 817 80 929
-rect 110 1201 166 1217
-rect 110 929 121 1201
-rect 155 929 166 1201
-rect 110 817 166 929
-rect 196 1201 249 1217
-rect 196 929 207 1201
-rect 241 929 249 1201
-rect 196 817 249 929
-rect 303 1201 356 1217
-rect 303 725 311 1201
-rect 345 725 356 1201
-rect 303 617 356 725
-rect 386 617 428 1217
-rect 458 1201 548 1217
-rect 458 657 469 1201
-rect 537 657 548 1201
-rect 458 617 548 657
-rect 578 617 620 1217
-rect 650 1201 706 1217
-rect 650 725 661 1201
-rect 695 725 706 1201
-rect 650 617 706 725
-rect 736 617 778 1217
-rect 808 1201 898 1217
-rect 808 725 819 1201
-rect 887 725 898 1201
-rect 808 617 898 725
-rect 928 617 970 1217
-rect 1000 1201 1056 1217
-rect 1000 657 1011 1201
-rect 1045 657 1056 1201
-rect 1000 617 1056 657
-rect 1086 1201 1139 1217
-rect 1086 657 1097 1201
-rect 1131 657 1139 1201
-rect 1193 1201 1246 1217
-rect 1193 929 1201 1201
-rect 1235 929 1246 1201
-rect 1193 817 1246 929
-rect 1276 1201 1332 1217
-rect 1276 929 1287 1201
-rect 1321 929 1332 1201
-rect 1276 817 1332 929
-rect 1362 1201 1415 1217
-rect 1362 929 1373 1201
-rect 1407 929 1415 1201
-rect 1362 817 1415 929
-rect 1469 1201 1522 1217
-rect 1469 861 1477 1201
-rect 1511 861 1522 1201
-rect 1086 617 1139 657
-rect 1469 617 1522 861
-rect 1552 1201 1608 1217
-rect 1552 861 1563 1201
-rect 1597 861 1608 1201
-rect 1552 617 1608 861
-rect 1638 1201 1691 1217
-rect 1638 861 1649 1201
-rect 1683 861 1691 1201
-rect 1638 617 1691 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 193 131 227 199
-rect 311 131 345 267
-rect 469 131 537 267
-rect 661 131 695 199
-rect 819 131 887 267
-rect 1011 131 1045 267
-rect 1097 131 1131 267
-rect 1201 131 1235 199
-rect 1359 131 1393 199
-rect 1477 131 1511 199
-rect 1563 131 1597 199
-rect 1649 131 1683 199
-<< pdiffc >>
-rect 35 929 69 1201
-rect 121 929 155 1201
-rect 207 929 241 1201
-rect 311 725 345 1201
-rect 469 657 537 1201
-rect 661 725 695 1201
-rect 819 725 887 1201
-rect 1011 657 1045 1201
-rect 1097 657 1131 1201
-rect 1201 929 1235 1201
-rect 1287 929 1321 1201
-rect 1373 929 1407 1201
-rect 1477 861 1511 1201
-rect 1563 861 1597 1201
-rect 1649 861 1683 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 356 1217 386 1243
-rect 428 1217 458 1243
-rect 548 1217 578 1243
-rect 620 1217 650 1243
-rect 706 1217 736 1243
-rect 778 1217 808 1243
-rect 898 1217 928 1243
-rect 970 1217 1000 1243
-rect 1056 1217 1086 1243
-rect 1246 1217 1276 1243
-rect 1332 1217 1362 1243
-rect 1522 1217 1552 1243
-rect 1608 1217 1638 1243
-rect 80 403 110 817
-rect 166 494 196 817
-rect 37 387 110 403
-rect 37 353 47 387
-rect 81 353 110 387
-rect 37 337 110 353
-rect 80 263 110 337
-rect 152 478 233 494
-rect 152 444 189 478
-rect 223 444 233 478
-rect 152 428 233 444
-rect 356 477 386 617
-rect 428 586 458 617
-rect 428 570 482 586
-rect 428 536 438 570
-rect 472 536 482 570
-rect 428 520 482 536
-rect 356 461 410 477
-rect 548 475 578 617
-rect 620 580 650 617
-rect 706 580 736 617
-rect 620 570 736 580
-rect 620 536 652 570
-rect 686 536 736 570
-rect 620 526 736 536
-rect 778 475 808 617
-rect 898 586 928 617
-rect 874 570 928 586
-rect 874 536 884 570
-rect 918 536 928 570
-rect 874 520 928 536
-rect 152 263 182 428
-rect 356 427 366 461
-rect 400 427 410 461
-rect 356 411 410 427
-rect 452 445 904 475
-rect 356 315 386 411
-rect 452 367 482 445
-rect 874 403 904 445
-rect 970 471 1000 617
-rect 1056 586 1086 617
-rect 1056 570 1127 586
-rect 1056 556 1083 570
-rect 1067 536 1083 556
-rect 1117 536 1127 570
-rect 1067 520 1127 536
-rect 970 455 1024 471
-rect 970 421 980 455
-rect 1014 421 1024 455
-rect 970 405 1024 421
-rect 428 337 482 367
-rect 524 387 578 403
-rect 524 353 534 387
-rect 568 353 578 387
-rect 524 337 578 353
-rect 428 315 458 337
-rect 548 315 578 337
-rect 620 387 736 397
-rect 620 353 652 387
-rect 686 353 736 387
-rect 620 343 736 353
-rect 620 315 650 343
-rect 706 315 736 343
-rect 778 387 832 403
-rect 778 353 788 387
-rect 822 353 832 387
-rect 778 337 832 353
-rect 874 387 928 403
-rect 874 353 884 387
-rect 918 353 928 387
-rect 874 337 928 353
-rect 778 315 808 337
-rect 898 315 928 337
-rect 970 315 1000 405
-rect 1067 367 1097 520
-rect 1246 403 1276 817
-rect 1056 337 1097 367
-rect 1193 387 1276 403
-rect 1193 353 1203 387
-rect 1237 353 1276 387
-rect 1193 337 1276 353
-rect 1056 315 1086 337
-rect 1246 263 1276 337
-rect 1332 351 1362 817
-rect 1522 601 1552 617
-rect 1512 571 1552 601
-rect 1512 471 1542 571
-rect 1608 512 1638 617
-rect 1487 455 1542 471
-rect 1487 421 1497 455
-rect 1531 421 1542 455
-rect 1584 496 1638 512
-rect 1584 462 1594 496
-rect 1628 462 1638 496
-rect 1584 446 1638 462
-rect 1487 405 1542 421
-rect 1512 360 1542 405
-rect 1332 335 1399 351
-rect 1318 301 1355 335
-rect 1389 301 1399 335
-rect 1512 330 1552 360
-rect 1522 315 1552 330
-rect 1608 315 1638 446
-rect 1318 285 1399 301
-rect 1318 263 1348 285
-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 353 81 387
-rect 189 444 223 478
-rect 438 536 472 570
-rect 652 536 686 570
-rect 884 536 918 570
-rect 366 427 400 461
-rect 1083 536 1117 570
-rect 980 421 1014 455
-rect 534 353 568 387
-rect 652 353 686 387
-rect 788 353 822 387
-rect 884 353 918 387
-rect 1203 353 1237 387
-rect 1497 421 1531 455
-rect 1594 462 1628 496
-rect 1355 301 1389 335
-<< locali >>
-rect 0 1311 1738 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1738 1311
-rect 35 1201 69 1271
-rect 35 913 69 929
-rect 121 1201 155 1217
-rect 47 387 81 403
-rect 47 313 81 353
-rect 121 387 155 929
-rect 207 1201 241 1271
-rect 207 913 241 929
-rect 311 1201 345 1271
-rect 311 709 345 725
-rect 469 1201 537 1217
-rect 661 1201 695 1271
-rect 661 709 695 725
-rect 819 1201 887 1217
-rect 469 654 537 657
-rect 819 654 887 725
-rect 121 233 155 353
-rect 189 620 537 654
-rect 720 620 887 654
-rect 1011 1201 1045 1271
-rect 1011 641 1045 657
-rect 1097 1201 1131 1217
-rect 1201 1201 1235 1271
-rect 1201 913 1235 929
-rect 1287 1201 1321 1217
-rect 1097 654 1131 657
-rect 1097 620 1187 654
-rect 189 478 223 620
-rect 438 570 472 586
-rect 438 535 472 536
-rect 652 570 686 586
-rect 472 501 568 535
-rect 189 370 223 444
-rect 366 461 400 477
-rect 366 411 400 427
-rect 534 387 568 501
-rect 652 387 686 536
-rect 189 336 500 370
-rect 534 337 568 353
-rect 652 337 686 353
-rect 720 387 754 620
-rect 884 570 918 586
-rect 884 535 918 536
-rect 466 283 500 336
-rect 720 303 754 353
-rect 788 501 884 535
-rect 1083 570 1117 586
-rect 1083 535 1117 536
-rect 788 387 822 501
-rect 1151 467 1187 620
-rect 964 421 980 455
-rect 1014 421 1030 455
-rect 1097 433 1187 467
-rect 1287 455 1321 929
-rect 1373 1201 1407 1271
-rect 1373 913 1407 929
-rect 1477 1201 1511 1217
-rect 1477 609 1511 861
-rect 1563 1201 1597 1271
-rect 1563 845 1597 861
-rect 1649 1201 1683 1217
-rect 1649 683 1683 861
-rect 1682 666 1683 683
-rect 1682 649 1706 666
-rect 1649 632 1706 649
-rect 1477 570 1511 575
-rect 1477 536 1628 570
-rect 1594 496 1628 536
-rect 1097 387 1131 433
-rect 1287 421 1497 455
-rect 1531 421 1547 455
-rect 868 353 884 387
-rect 918 353 1131 387
-rect 1187 353 1203 387
-rect 1237 353 1253 387
-rect 788 337 822 353
-rect 35 199 155 233
-rect 311 267 345 283
-rect 193 199 227 215
-rect 35 115 69 131
-rect 193 61 227 131
-rect 466 267 537 283
-rect 720 269 887 303
-rect 466 249 469 267
-rect 311 61 345 131
-rect 819 267 887 269
-rect 469 115 537 131
-rect 661 199 695 215
-rect 661 61 695 131
-rect 819 115 887 131
-rect 1011 267 1045 283
-rect 1011 61 1045 131
-rect 1097 267 1131 353
-rect 1287 233 1321 421
-rect 1594 387 1628 462
-rect 1477 353 1628 387
-rect 1355 335 1389 351
-rect 1097 115 1131 131
-rect 1201 199 1321 233
-rect 1359 199 1393 215
-rect 1201 115 1235 131
-rect 1359 61 1393 131
-rect 1477 199 1511 353
-rect 1672 320 1706 632
-rect 1649 286 1706 320
-rect 1477 115 1511 131
-rect 1563 199 1597 215
-rect 1563 61 1597 131
-rect 1649 199 1683 286
-rect 1649 115 1683 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 47 279 81 313
-rect 121 353 155 387
-rect 438 501 472 535
-rect 366 427 400 461
-rect 634 353 652 387
-rect 652 353 668 387
-rect 720 353 754 387
-rect 884 501 918 535
-rect 1083 501 1117 535
-rect 980 421 1014 455
-rect 1648 649 1682 683
-rect 1477 575 1511 609
-rect 1497 421 1531 455
-rect 1203 353 1237 387
-rect 1355 301 1389 313
-rect 1355 279 1389 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 1311 1738 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1738 1311
-rect 0 1271 1738 1277
-rect 1636 683 1694 689
-rect 1614 649 1648 683
-rect 1682 649 1694 683
-rect 1636 643 1694 649
-rect 1465 609 1523 615
-rect 1442 575 1477 609
-rect 1511 575 1523 609
-rect 1465 569 1523 575
-rect 426 535 484 541
-rect 872 535 930 541
-rect 1071 535 1129 541
-rect 426 501 438 535
-rect 472 501 884 535
-rect 918 501 1083 535
-rect 1117 501 1129 535
-rect 426 495 484 501
-rect 872 495 930 501
-rect 1071 495 1129 501
-rect 354 461 412 467
-rect 354 427 366 461
-rect 400 427 434 461
-rect 968 455 1026 461
-rect 1485 455 1543 461
-rect 354 421 412 427
-rect 968 421 980 455
-rect 1014 421 1497 455
-rect 1531 421 1543 455
-rect 968 415 1026 421
-rect 1485 415 1543 421
-rect 109 387 167 393
-rect 622 387 680 393
-rect 109 353 121 387
-rect 155 353 634 387
-rect 668 353 680 387
-rect 109 347 167 353
-rect 622 347 680 353
-rect 708 387 766 393
-rect 1191 387 1249 393
-rect 708 353 720 387
-rect 754 353 1203 387
-rect 1237 353 1249 387
-rect 708 347 766 353
-rect 1191 347 1249 353
-rect 35 313 93 319
-rect 1343 313 1401 319
-rect 35 279 47 313
-rect 81 279 1355 313
-rect 1389 279 1401 313
-rect 35 273 93 279
-rect 1343 273 1401 279
-rect 0 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 444 383 444 1 D
-port 1 n
-rlabel viali 1100 518 1100 518 1 CK
-port 2 n
-rlabel viali 1665 666 1665 666 1 Q
-port 4 n
-rlabel viali 1495 592 1495 592 1 QN
-port 3 n
-rlabel viali 64 296 64 296 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__dffs_l.mag b/18T_hs/sky130_osu_sc_18T_hs__dffs_l.mag
deleted file mode 100644
index 2c8e524..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__dffs_l.mag
+++ /dev/null
@@ -1,721 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864615
-<< checkpaint >>
-rect -1210 -1243 2840 2575
-<< nwell >>
-rect -10 581 1741 1341
-<< pmos >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 356 617 386 1217
-rect 428 617 458 1217
-rect 548 617 578 1217
-rect 620 617 650 1217
-rect 706 617 736 1217
-rect 778 617 808 1217
-rect 898 617 928 1217
-rect 970 617 1000 1217
-rect 1056 617 1086 1217
-rect 1246 817 1276 1217
-rect 1332 817 1362 1217
-rect 1522 817 1552 1217
-rect 1608 817 1638 1217
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 356 115 386 315
-rect 428 115 458 315
-rect 548 115 578 315
-rect 620 115 650 315
-rect 706 115 736 315
-rect 778 115 808 315
-rect 898 115 928 315
-rect 970 115 1000 315
-rect 1056 115 1086 315
-rect 1246 115 1276 263
-rect 1318 115 1348 263
-rect 1522 115 1552 263
-rect 1608 115 1638 263
-<< ndiff >>
-rect 303 267 356 315
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 115 152 263
-rect 182 199 235 263
-rect 182 131 193 199
-rect 227 131 235 199
-rect 182 115 235 131
-rect 303 131 311 267
-rect 345 131 356 267
-rect 303 115 356 131
-rect 386 115 428 315
-rect 458 267 548 315
-rect 458 131 469 267
-rect 537 131 548 267
-rect 458 115 548 131
-rect 578 115 620 315
-rect 650 199 706 315
-rect 650 131 661 199
-rect 695 131 706 199
-rect 650 115 706 131
-rect 736 115 778 315
-rect 808 267 898 315
-rect 808 131 819 267
-rect 887 131 898 267
-rect 808 115 898 131
-rect 928 115 970 315
-rect 1000 267 1056 315
-rect 1000 131 1011 267
-rect 1045 131 1056 267
-rect 1000 115 1056 131
-rect 1086 267 1139 315
-rect 1086 131 1097 267
-rect 1131 131 1139 267
-rect 1086 115 1139 131
-rect 1193 199 1246 263
-rect 1193 131 1201 199
-rect 1235 131 1246 199
-rect 1193 115 1246 131
-rect 1276 115 1318 263
-rect 1348 199 1401 263
-rect 1348 131 1359 199
-rect 1393 131 1401 199
-rect 1348 115 1401 131
-rect 1469 199 1522 263
-rect 1469 131 1477 199
-rect 1511 131 1522 199
-rect 1469 115 1522 131
-rect 1552 199 1608 263
-rect 1552 131 1563 199
-rect 1597 131 1608 199
-rect 1552 115 1608 131
-rect 1638 199 1691 263
-rect 1638 131 1649 199
-rect 1683 131 1691 199
-rect 1638 115 1691 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 817 80 929
-rect 110 1201 166 1217
-rect 110 929 121 1201
-rect 155 929 166 1201
-rect 110 817 166 929
-rect 196 1201 249 1217
-rect 196 929 207 1201
-rect 241 929 249 1201
-rect 196 817 249 929
-rect 303 1201 356 1217
-rect 303 725 311 1201
-rect 345 725 356 1201
-rect 303 617 356 725
-rect 386 617 428 1217
-rect 458 1201 548 1217
-rect 458 657 469 1201
-rect 537 657 548 1201
-rect 458 617 548 657
-rect 578 617 620 1217
-rect 650 1201 706 1217
-rect 650 725 661 1201
-rect 695 725 706 1201
-rect 650 617 706 725
-rect 736 617 778 1217
-rect 808 1201 898 1217
-rect 808 725 819 1201
-rect 887 725 898 1201
-rect 808 617 898 725
-rect 928 617 970 1217
-rect 1000 1201 1056 1217
-rect 1000 657 1011 1201
-rect 1045 657 1056 1201
-rect 1000 617 1056 657
-rect 1086 1201 1139 1217
-rect 1086 657 1097 1201
-rect 1131 657 1139 1201
-rect 1193 1201 1246 1217
-rect 1193 929 1201 1201
-rect 1235 929 1246 1201
-rect 1193 817 1246 929
-rect 1276 1201 1332 1217
-rect 1276 929 1287 1201
-rect 1321 929 1332 1201
-rect 1276 817 1332 929
-rect 1362 1201 1415 1217
-rect 1362 929 1373 1201
-rect 1407 929 1415 1201
-rect 1362 817 1415 929
-rect 1469 1201 1522 1217
-rect 1469 861 1477 1201
-rect 1511 861 1522 1201
-rect 1469 817 1522 861
-rect 1552 1201 1608 1217
-rect 1552 861 1563 1201
-rect 1597 861 1608 1201
-rect 1552 817 1608 861
-rect 1638 1201 1691 1217
-rect 1638 861 1649 1201
-rect 1683 861 1691 1201
-rect 1638 817 1691 861
-rect 1086 617 1139 657
-<< ndiffc >>
-rect 35 131 69 199
-rect 193 131 227 199
-rect 311 131 345 267
-rect 469 131 537 267
-rect 661 131 695 199
-rect 819 131 887 267
-rect 1011 131 1045 267
-rect 1097 131 1131 267
-rect 1201 131 1235 199
-rect 1359 131 1393 199
-rect 1477 131 1511 199
-rect 1563 131 1597 199
-rect 1649 131 1683 199
-<< pdiffc >>
-rect 35 929 69 1201
-rect 121 929 155 1201
-rect 207 929 241 1201
-rect 311 725 345 1201
-rect 469 657 537 1201
-rect 661 725 695 1201
-rect 819 725 887 1201
-rect 1011 657 1045 1201
-rect 1097 657 1131 1201
-rect 1201 929 1235 1201
-rect 1287 929 1321 1201
-rect 1373 929 1407 1201
-rect 1477 861 1511 1201
-rect 1563 861 1597 1201
-rect 1649 861 1683 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 356 1217 386 1243
-rect 428 1217 458 1243
-rect 548 1217 578 1243
-rect 620 1217 650 1243
-rect 706 1217 736 1243
-rect 778 1217 808 1243
-rect 898 1217 928 1243
-rect 970 1217 1000 1243
-rect 1056 1217 1086 1243
-rect 1246 1217 1276 1243
-rect 1332 1217 1362 1243
-rect 1522 1217 1552 1243
-rect 1608 1217 1638 1243
-rect 80 403 110 817
-rect 166 494 196 817
-rect 37 387 110 403
-rect 37 353 47 387
-rect 81 353 110 387
-rect 37 337 110 353
-rect 80 263 110 337
-rect 152 478 233 494
-rect 152 444 189 478
-rect 223 444 233 478
-rect 152 428 233 444
-rect 356 477 386 617
-rect 428 586 458 617
-rect 428 570 482 586
-rect 428 536 438 570
-rect 472 536 482 570
-rect 428 520 482 536
-rect 356 461 410 477
-rect 548 475 578 617
-rect 620 580 650 617
-rect 706 580 736 617
-rect 620 570 736 580
-rect 620 536 652 570
-rect 686 536 736 570
-rect 620 526 736 536
-rect 778 475 808 617
-rect 898 586 928 617
-rect 874 570 928 586
-rect 874 536 884 570
-rect 918 536 928 570
-rect 874 520 928 536
-rect 152 263 182 428
-rect 356 427 366 461
-rect 400 427 410 461
-rect 356 411 410 427
-rect 452 445 904 475
-rect 356 315 386 411
-rect 452 367 482 445
-rect 874 403 904 445
-rect 970 471 1000 617
-rect 1056 586 1086 617
-rect 1056 570 1127 586
-rect 1056 556 1083 570
-rect 1067 536 1083 556
-rect 1117 536 1127 570
-rect 1067 520 1127 536
-rect 970 455 1024 471
-rect 970 421 980 455
-rect 1014 421 1024 455
-rect 970 405 1024 421
-rect 428 337 482 367
-rect 524 387 578 403
-rect 524 353 534 387
-rect 568 353 578 387
-rect 524 337 578 353
-rect 428 315 458 337
-rect 548 315 578 337
-rect 620 387 736 397
-rect 620 353 652 387
-rect 686 353 736 387
-rect 620 343 736 353
-rect 620 315 650 343
-rect 706 315 736 343
-rect 778 387 832 403
-rect 778 353 788 387
-rect 822 353 832 387
-rect 778 337 832 353
-rect 874 387 928 403
-rect 874 353 884 387
-rect 918 353 928 387
-rect 874 337 928 353
-rect 778 315 808 337
-rect 898 315 928 337
-rect 970 315 1000 405
-rect 1067 367 1097 520
-rect 1246 403 1276 817
-rect 1056 337 1097 367
-rect 1193 387 1276 403
-rect 1193 353 1203 387
-rect 1237 353 1276 387
-rect 1193 337 1276 353
-rect 1056 315 1086 337
-rect 1246 263 1276 337
-rect 1332 351 1362 817
-rect 1522 601 1552 817
-rect 1512 571 1552 601
-rect 1512 471 1542 571
-rect 1608 512 1638 817
-rect 1487 455 1542 471
-rect 1487 421 1497 455
-rect 1531 421 1542 455
-rect 1584 496 1638 512
-rect 1584 462 1594 496
-rect 1628 462 1638 496
-rect 1584 446 1638 462
-rect 1487 405 1542 421
-rect 1512 360 1542 405
-rect 1332 335 1399 351
-rect 1318 301 1355 335
-rect 1389 301 1399 335
-rect 1512 330 1552 360
-rect 1318 285 1399 301
-rect 1318 263 1348 285
-rect 1522 263 1552 330
-rect 1608 263 1638 446
-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 353 81 387
-rect 189 444 223 478
-rect 438 536 472 570
-rect 652 536 686 570
-rect 884 536 918 570
-rect 366 427 400 461
-rect 1083 536 1117 570
-rect 980 421 1014 455
-rect 534 353 568 387
-rect 652 353 686 387
-rect 788 353 822 387
-rect 884 353 918 387
-rect 1203 353 1237 387
-rect 1497 421 1531 455
-rect 1594 462 1628 496
-rect 1355 301 1389 335
-<< locali >>
-rect 0 1311 1738 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1738 1311
-rect 35 1201 69 1271
-rect 35 913 69 929
-rect 121 1201 155 1217
-rect 47 387 81 403
-rect 47 313 81 353
-rect 121 387 155 929
-rect 207 1201 241 1271
-rect 207 913 241 929
-rect 311 1201 345 1271
-rect 311 709 345 725
-rect 469 1201 537 1217
-rect 661 1201 695 1271
-rect 661 709 695 725
-rect 819 1201 887 1217
-rect 469 654 537 657
-rect 819 654 887 725
-rect 121 233 155 353
-rect 189 620 537 654
-rect 720 620 887 654
-rect 1011 1201 1045 1271
-rect 1011 641 1045 657
-rect 1097 1201 1131 1217
-rect 1201 1201 1235 1271
-rect 1201 913 1235 929
-rect 1287 1201 1321 1217
-rect 1097 654 1131 657
-rect 1097 620 1187 654
-rect 189 478 223 620
-rect 438 570 472 586
-rect 438 535 472 536
-rect 652 570 686 586
-rect 472 501 568 535
-rect 189 370 223 444
-rect 366 461 400 477
-rect 366 411 400 427
-rect 534 387 568 501
-rect 652 387 686 536
-rect 189 336 500 370
-rect 534 337 568 353
-rect 652 337 686 353
-rect 720 387 754 620
-rect 884 570 918 586
-rect 884 535 918 536
-rect 466 283 500 336
-rect 720 303 754 353
-rect 788 501 884 535
-rect 1083 570 1117 586
-rect 1083 535 1117 536
-rect 788 387 822 501
-rect 1151 467 1187 620
-rect 964 421 980 455
-rect 1014 421 1030 455
-rect 1097 433 1187 467
-rect 1287 455 1321 929
-rect 1373 1201 1407 1271
-rect 1373 913 1407 929
-rect 1477 1201 1511 1217
-rect 1477 609 1511 861
-rect 1563 1201 1597 1271
-rect 1563 845 1597 861
-rect 1649 1201 1683 1217
-rect 1649 683 1683 861
-rect 1682 666 1683 683
-rect 1682 649 1706 666
-rect 1649 632 1706 649
-rect 1477 570 1511 575
-rect 1477 536 1628 570
-rect 1594 496 1628 536
-rect 1097 387 1131 433
-rect 1287 421 1497 455
-rect 1531 421 1547 455
-rect 868 353 884 387
-rect 918 353 1131 387
-rect 1187 353 1203 387
-rect 1237 353 1253 387
-rect 788 337 822 353
-rect 35 199 155 233
-rect 311 267 345 283
-rect 193 199 227 215
-rect 35 115 69 131
-rect 193 61 227 131
-rect 466 267 537 283
-rect 720 269 887 303
-rect 466 249 469 267
-rect 311 61 345 131
-rect 819 267 887 269
-rect 469 115 537 131
-rect 661 199 695 215
-rect 661 61 695 131
-rect 819 115 887 131
-rect 1011 267 1045 283
-rect 1011 61 1045 131
-rect 1097 267 1131 353
-rect 1287 233 1321 421
-rect 1594 387 1628 462
-rect 1477 353 1628 387
-rect 1355 335 1389 351
-rect 1097 115 1131 131
-rect 1201 199 1321 233
-rect 1359 199 1393 215
-rect 1201 115 1235 131
-rect 1359 61 1393 131
-rect 1477 199 1511 353
-rect 1672 320 1706 632
-rect 1649 286 1706 320
-rect 1477 115 1511 131
-rect 1563 199 1597 215
-rect 1563 61 1597 131
-rect 1649 199 1683 286
-rect 1649 115 1683 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 47 279 81 313
-rect 121 353 155 387
-rect 438 501 472 535
-rect 366 427 400 461
-rect 634 353 652 387
-rect 652 353 668 387
-rect 720 353 754 387
-rect 884 501 918 535
-rect 1083 501 1117 535
-rect 980 421 1014 455
-rect 1648 649 1682 683
-rect 1477 575 1511 609
-rect 1497 421 1531 455
-rect 1203 353 1237 387
-rect 1355 301 1389 313
-rect 1355 279 1389 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 1311 1738 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1738 1311
-rect 0 1271 1738 1277
-rect 1636 683 1694 689
-rect 1614 649 1648 683
-rect 1682 649 1694 683
-rect 1636 643 1694 649
-rect 1465 609 1523 615
-rect 1442 575 1477 609
-rect 1511 575 1523 609
-rect 1465 569 1523 575
-rect 426 535 484 541
-rect 872 535 930 541
-rect 1071 535 1129 541
-rect 426 501 438 535
-rect 472 501 884 535
-rect 918 501 1083 535
-rect 1117 501 1129 535
-rect 426 495 484 501
-rect 872 495 930 501
-rect 1071 495 1129 501
-rect 354 461 412 467
-rect 354 427 366 461
-rect 400 427 434 461
-rect 968 455 1026 461
-rect 1485 455 1543 461
-rect 354 421 412 427
-rect 968 421 980 455
-rect 1014 421 1497 455
-rect 1531 421 1543 455
-rect 968 415 1026 421
-rect 1485 415 1543 421
-rect 109 387 167 393
-rect 622 387 680 393
-rect 109 353 121 387
-rect 155 353 634 387
-rect 668 353 680 387
-rect 109 347 167 353
-rect 622 347 680 353
-rect 708 387 766 393
-rect 1191 387 1249 393
-rect 708 353 720 387
-rect 754 353 1203 387
-rect 1237 353 1249 387
-rect 708 347 766 353
-rect 1191 347 1249 353
-rect 35 313 93 319
-rect 1343 313 1401 319
-rect 35 279 47 313
-rect 81 279 1355 313
-rect 1389 279 1401 313
-rect 35 273 93 279
-rect 1343 273 1401 279
-rect 0 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 444 383 444 1 D
-port 1 n
-rlabel viali 1100 518 1100 518 1 CK
-port 2 n
-rlabel viali 1665 666 1665 666 1 Q
-port 4 n
-rlabel viali 1495 592 1495 592 1 QN
-port 3 n
-rlabel viali 64 296 64 296 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__dffsr_1.mag b/18T_hs/sky130_osu_sc_18T_hs__dffsr_1.mag
deleted file mode 100644
index 01fca41..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__dffsr_1.mag
+++ /dev/null
@@ -1,900 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864616
-<< checkpaint >>
-rect -1210 -1243 3248 2575
-<< nwell >>
-rect -10 581 2090 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 270 617 300 1217
-rect 356 617 386 1217
-rect 442 617 472 1217
-rect 632 617 662 1217
-rect 704 617 734 1217
-rect 824 617 854 1217
-rect 896 617 926 1217
-rect 982 617 1012 1217
-rect 1054 617 1084 1217
-rect 1174 617 1204 1217
-rect 1246 617 1276 1217
-rect 1332 617 1362 1217
-rect 1522 617 1552 1217
-rect 1608 617 1638 1217
-rect 1694 617 1724 1217
-rect 1884 617 1914 1217
-rect 1970 617 2000 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 272 115 302 263
-rect 370 115 400 315
-rect 442 115 472 315
-rect 632 115 662 315
-rect 704 115 734 315
-rect 824 115 854 315
-rect 896 115 926 315
-rect 982 115 1012 315
-rect 1054 115 1084 315
-rect 1174 115 1204 315
-rect 1246 115 1276 315
-rect 1332 115 1362 315
-rect 1522 115 1552 315
-rect 1594 115 1624 315
-rect 1692 115 1722 263
-rect 1884 115 1914 315
-rect 1970 115 2000 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 317 267 370 315
-rect 317 263 325 267
-rect 110 115 163 131
-rect 219 199 272 263
-rect 219 131 227 199
-rect 261 131 272 199
-rect 219 115 272 131
-rect 302 131 325 263
-rect 359 131 370 267
-rect 302 115 370 131
-rect 400 115 442 315
-rect 472 267 525 315
-rect 472 131 483 267
-rect 517 131 525 267
-rect 472 115 525 131
-rect 579 267 632 315
-rect 579 131 587 267
-rect 621 131 632 267
-rect 579 115 632 131
-rect 662 115 704 315
-rect 734 267 824 315
-rect 734 131 745 267
-rect 813 131 824 267
-rect 734 115 824 131
-rect 854 115 896 315
-rect 926 199 982 315
-rect 926 131 937 199
-rect 971 131 982 199
-rect 926 115 982 131
-rect 1012 115 1054 315
-rect 1084 267 1174 315
-rect 1084 131 1095 267
-rect 1163 131 1174 267
-rect 1084 115 1174 131
-rect 1204 115 1246 315
-rect 1276 267 1332 315
-rect 1276 131 1287 267
-rect 1321 131 1332 267
-rect 1276 115 1332 131
-rect 1362 267 1415 315
-rect 1362 131 1373 267
-rect 1407 131 1415 267
-rect 1362 115 1415 131
-rect 1469 267 1522 315
-rect 1469 131 1477 267
-rect 1511 131 1522 267
-rect 1469 115 1522 131
-rect 1552 115 1594 315
-rect 1624 267 1677 315
-rect 1624 131 1635 267
-rect 1669 263 1677 267
-rect 1831 267 1884 315
-rect 1669 131 1692 263
-rect 1624 115 1692 131
-rect 1722 199 1775 263
-rect 1722 131 1733 199
-rect 1767 131 1775 199
-rect 1722 115 1775 131
-rect 1831 131 1839 267
-rect 1873 131 1884 267
-rect 1831 115 1884 131
-rect 1914 267 1970 315
-rect 1914 131 1925 267
-rect 1959 131 1970 267
-rect 1914 115 1970 131
-rect 2000 267 2053 315
-rect 2000 131 2011 267
-rect 2045 131 2053 267
-rect 2000 115 2053 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-rect 217 1201 270 1217
-rect 217 725 225 1201
-rect 259 725 270 1201
-rect 217 617 270 725
-rect 300 1201 356 1217
-rect 300 725 311 1201
-rect 345 725 356 1201
-rect 300 617 356 725
-rect 386 1201 442 1217
-rect 386 793 397 1201
-rect 431 793 442 1201
-rect 386 617 442 793
-rect 472 1201 525 1217
-rect 472 725 483 1201
-rect 517 725 525 1201
-rect 472 617 525 725
-rect 579 1201 632 1217
-rect 579 725 587 1201
-rect 621 725 632 1201
-rect 579 617 632 725
-rect 662 617 704 1217
-rect 734 1201 824 1217
-rect 734 657 745 1201
-rect 813 657 824 1201
-rect 734 617 824 657
-rect 854 617 896 1217
-rect 926 1201 982 1217
-rect 926 725 937 1201
-rect 971 725 982 1201
-rect 926 617 982 725
-rect 1012 617 1054 1217
-rect 1084 1201 1174 1217
-rect 1084 725 1095 1201
-rect 1163 725 1174 1201
-rect 1084 617 1174 725
-rect 1204 617 1246 1217
-rect 1276 1201 1332 1217
-rect 1276 657 1287 1201
-rect 1321 657 1332 1201
-rect 1276 617 1332 657
-rect 1362 1201 1415 1217
-rect 1362 657 1373 1201
-rect 1407 657 1415 1201
-rect 1362 617 1415 657
-rect 1469 1201 1522 1217
-rect 1469 725 1477 1201
-rect 1511 725 1522 1201
-rect 1469 617 1522 725
-rect 1552 1201 1608 1217
-rect 1552 793 1563 1201
-rect 1597 793 1608 1201
-rect 1552 617 1608 793
-rect 1638 1201 1694 1217
-rect 1638 725 1649 1201
-rect 1683 725 1694 1201
-rect 1638 617 1694 725
-rect 1724 1201 1777 1217
-rect 1724 725 1735 1201
-rect 1769 725 1777 1201
-rect 1724 617 1777 725
-rect 1831 1201 1884 1217
-rect 1831 657 1839 1201
-rect 1873 657 1884 1201
-rect 1831 617 1884 657
-rect 1914 1201 1970 1217
-rect 1914 657 1925 1201
-rect 1959 657 1970 1201
-rect 1914 617 1970 657
-rect 2000 1201 2053 1217
-rect 2000 657 2011 1201
-rect 2045 657 2053 1201
-rect 2000 617 2053 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 227 131 261 199
-rect 325 131 359 267
-rect 483 131 517 267
-rect 587 131 621 267
-rect 745 131 813 267
-rect 937 131 971 199
-rect 1095 131 1163 267
-rect 1287 131 1321 267
-rect 1373 131 1407 267
-rect 1477 131 1511 267
-rect 1635 131 1669 267
-rect 1733 131 1767 199
-rect 1839 131 1873 267
-rect 1925 131 1959 267
-rect 2011 131 2045 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 225 725 259 1201
-rect 311 725 345 1201
-rect 397 793 431 1201
-rect 483 725 517 1201
-rect 587 725 621 1201
-rect 745 657 813 1201
-rect 937 725 971 1201
-rect 1095 725 1163 1201
-rect 1287 657 1321 1201
-rect 1373 657 1407 1201
-rect 1477 725 1511 1201
-rect 1563 793 1597 1201
-rect 1649 725 1683 1201
-rect 1735 725 1769 1201
-rect 1839 657 1873 1201
-rect 1925 657 1959 1201
-rect 2011 657 2045 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-rect 1658 1271 1682 1305
-rect 1716 1271 1740 1305
-rect 1794 1271 1818 1305
-rect 1852 1271 1876 1305
-rect 1930 1271 1954 1305
-rect 1988 1271 2012 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-rect 1682 1271 1716 1305
-rect 1818 1271 1852 1305
-rect 1954 1271 1988 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 270 1217 300 1243
-rect 356 1217 386 1243
-rect 442 1217 472 1243
-rect 632 1217 662 1243
-rect 704 1217 734 1243
-rect 824 1217 854 1243
-rect 896 1217 926 1243
-rect 982 1217 1012 1243
-rect 1054 1217 1084 1243
-rect 1174 1217 1204 1243
-rect 1246 1217 1276 1243
-rect 1332 1217 1362 1243
-rect 1522 1217 1552 1243
-rect 1608 1217 1638 1243
-rect 1694 1217 1724 1243
-rect 1884 1217 1914 1243
-rect 1970 1217 2000 1243
-rect 80 494 110 617
-rect 270 579 300 617
-rect 243 549 300 579
-rect 79 478 133 494
-rect 79 444 89 478
-rect 123 444 133 478
-rect 79 428 133 444
-rect 79 427 110 428
-rect 80 315 110 427
-rect 243 351 273 549
-rect 356 507 386 617
-rect 442 586 472 617
-rect 432 570 486 586
-rect 432 536 442 570
-rect 476 536 486 570
-rect 432 520 486 536
-rect 315 491 386 507
-rect 315 457 325 491
-rect 359 477 386 491
-rect 359 457 400 477
-rect 315 441 400 457
-rect 356 355 400 441
-rect 219 335 273 351
-rect 219 301 229 335
-rect 263 317 273 335
-rect 263 301 302 317
-rect 370 315 400 355
-rect 442 315 472 520
-rect 632 477 662 617
-rect 704 586 734 617
-rect 704 570 758 586
-rect 704 536 714 570
-rect 748 536 758 570
-rect 704 520 758 536
-rect 632 461 686 477
-rect 824 475 854 617
-rect 896 580 926 617
-rect 982 580 1012 617
-rect 896 570 1012 580
-rect 896 536 928 570
-rect 962 536 1012 570
-rect 896 526 1012 536
-rect 1054 475 1084 617
-rect 1174 586 1204 617
-rect 1150 570 1204 586
-rect 1150 536 1160 570
-rect 1194 536 1204 570
-rect 1150 520 1204 536
-rect 632 427 642 461
-rect 676 427 686 461
-rect 632 411 686 427
-rect 728 445 1180 475
-rect 632 315 662 411
-rect 728 367 758 445
-rect 1150 403 1180 445
-rect 1246 471 1276 617
-rect 1332 586 1362 617
-rect 1332 570 1403 586
-rect 1522 580 1552 617
-rect 1332 556 1359 570
-rect 1343 536 1359 556
-rect 1393 536 1403 570
-rect 1343 520 1403 536
-rect 1486 570 1552 580
-rect 1486 536 1502 570
-rect 1536 536 1552 570
-rect 1486 526 1552 536
-rect 1246 455 1300 471
-rect 1246 421 1256 455
-rect 1290 421 1300 455
-rect 1246 405 1300 421
-rect 704 337 758 367
-rect 800 387 854 403
-rect 800 353 810 387
-rect 844 353 854 387
-rect 800 337 854 353
-rect 704 315 734 337
-rect 824 315 854 337
-rect 896 387 1012 397
-rect 896 353 928 387
-rect 962 353 1012 387
-rect 896 343 1012 353
-rect 896 315 926 343
-rect 982 315 1012 343
-rect 1054 387 1108 403
-rect 1054 353 1064 387
-rect 1098 353 1108 387
-rect 1054 337 1108 353
-rect 1150 387 1204 403
-rect 1150 353 1160 387
-rect 1194 353 1204 387
-rect 1150 337 1204 353
-rect 1054 315 1084 337
-rect 1174 315 1204 337
-rect 1246 315 1276 405
-rect 1343 367 1373 520
-rect 1332 337 1373 367
-rect 1486 370 1516 526
-rect 1608 484 1638 617
-rect 1694 579 1724 617
-rect 1884 601 1914 617
-rect 1694 553 1751 579
-rect 1874 571 1914 601
-rect 1694 549 1775 553
-rect 1721 521 1775 549
-rect 1576 468 1638 484
-rect 1576 434 1588 468
-rect 1622 434 1638 468
-rect 1576 418 1638 434
-rect 1486 338 1552 370
-rect 1332 315 1362 337
-rect 1522 315 1552 338
-rect 1594 315 1624 418
-rect 1745 351 1775 521
-rect 1874 471 1904 571
-rect 1970 512 2000 617
-rect 1849 455 1904 471
-rect 1849 421 1859 455
-rect 1893 421 1904 455
-rect 1946 496 2000 512
-rect 1946 462 1956 496
-rect 1990 462 2000 496
-rect 1946 446 2000 462
-rect 1849 405 1904 421
-rect 1874 360 1904 405
-rect 1745 335 1799 351
-rect 1745 315 1755 335
-rect 219 285 302 301
-rect 272 263 302 285
-rect 1692 301 1755 315
-rect 1789 301 1799 335
-rect 1874 330 1914 360
-rect 1884 315 1914 330
-rect 1970 315 2000 446
-rect 1692 285 1799 301
-rect 1692 263 1722 285
-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 444 123 478
-rect 442 536 476 570
-rect 325 457 359 491
-rect 229 301 263 335
-rect 714 536 748 570
-rect 928 536 962 570
-rect 1160 536 1194 570
-rect 642 427 676 461
-rect 1359 536 1393 570
-rect 1502 536 1536 570
-rect 1256 421 1290 455
-rect 810 353 844 387
-rect 928 353 962 387
-rect 1064 353 1098 387
-rect 1160 353 1194 387
-rect 1588 434 1622 468
-rect 1859 421 1893 455
-rect 1956 462 1990 496
-rect 1755 301 1789 335
-<< locali >>
-rect 0 1311 2090 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1682 1311
-rect 1716 1271 1818 1311
-rect 1852 1271 1954 1311
-rect 1988 1271 2090 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 494 81 649
-rect 121 565 155 657
-rect 225 1201 259 1217
-rect 121 531 191 565
-rect 47 478 123 494
-rect 47 444 89 478
-rect 89 428 123 444
-rect 157 335 191 531
-rect 225 421 259 725
-rect 311 1201 345 1217
-rect 397 1201 431 1271
-rect 397 777 431 793
-rect 483 1201 517 1217
-rect 345 725 483 743
-rect 311 709 517 725
-rect 587 1201 621 1271
-rect 587 709 621 725
-rect 745 1201 813 1217
-rect 937 1201 971 1271
-rect 937 709 971 725
-rect 1095 1201 1163 1217
-rect 813 657 816 675
-rect 745 654 816 657
-rect 1095 654 1163 725
-rect 442 620 816 654
-rect 996 620 1163 654
-rect 1287 1201 1321 1271
-rect 1287 641 1321 657
-rect 1373 1201 1407 1217
-rect 1477 1201 1511 1217
-rect 1563 1201 1597 1271
-rect 1563 777 1597 793
-rect 1649 1201 1683 1217
-rect 1511 725 1649 743
-rect 1477 709 1683 725
-rect 1735 1201 1769 1217
-rect 1373 654 1407 657
-rect 1373 620 1461 654
-rect 325 491 359 575
-rect 442 570 476 620
-rect 309 457 325 491
-rect 359 457 375 491
-rect 225 387 359 421
-rect 121 301 229 335
-rect 263 301 279 335
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 301
-rect 325 267 359 353
-rect 442 370 476 536
-rect 714 570 748 586
-rect 714 535 748 536
-rect 928 570 962 586
-rect 748 501 844 535
-rect 642 461 676 477
-rect 642 411 676 427
-rect 810 387 844 501
-rect 928 387 962 536
-rect 442 336 776 370
-rect 810 337 844 353
-rect 928 337 962 353
-rect 996 387 1030 620
-rect 1160 570 1194 586
-rect 1160 535 1194 536
-rect 742 283 776 336
-rect 996 303 1030 353
-rect 1064 501 1160 535
-rect 1359 570 1393 586
-rect 1359 535 1393 536
-rect 1064 387 1098 501
-rect 1427 455 1461 620
-rect 1240 421 1256 455
-rect 1290 421 1306 455
-rect 1373 421 1461 455
-rect 1502 570 1536 586
-rect 1373 387 1407 421
-rect 1144 353 1160 387
-rect 1194 353 1407 387
-rect 1502 387 1536 536
-rect 1570 484 1604 575
-rect 1570 468 1638 484
-rect 1570 434 1588 468
-rect 1622 434 1638 468
-rect 1735 455 1769 725
-rect 1839 1201 1873 1217
-rect 1839 609 1873 657
-rect 1925 1201 1959 1271
-rect 1925 641 1959 657
-rect 2011 1201 2045 1217
-rect 2011 635 2045 649
-rect 2011 601 2068 635
-rect 1839 570 1873 575
-rect 1839 536 1990 570
-rect 1956 496 1990 536
-rect 1672 421 1859 455
-rect 1893 421 1909 455
-rect 1672 399 1706 421
-rect 1635 365 1706 399
-rect 1956 387 1990 462
-rect 1064 337 1098 353
-rect 121 115 155 131
-rect 227 199 261 215
-rect 227 61 261 131
-rect 325 115 359 131
-rect 483 267 517 283
-rect 483 61 517 131
-rect 587 267 621 283
-rect 742 267 813 283
-rect 996 269 1163 303
-rect 742 249 745 267
-rect 587 61 621 131
-rect 1095 267 1163 269
-rect 745 115 813 131
-rect 937 199 971 215
-rect 937 61 971 131
-rect 1095 115 1163 131
-rect 1287 267 1321 283
-rect 1287 61 1321 131
-rect 1373 267 1407 353
-rect 1373 115 1407 131
-rect 1477 267 1511 283
-rect 1477 61 1511 131
-rect 1635 267 1669 365
-rect 1839 353 1990 387
-rect 1739 301 1755 335
-rect 1789 301 1805 335
-rect 1839 267 1873 353
-rect 2034 320 2068 601
-rect 2011 286 2068 320
-rect 1635 115 1669 131
-rect 1733 199 1767 215
-rect 1733 61 1767 131
-rect 1839 115 1873 131
-rect 1925 267 1959 283
-rect 1925 61 1959 131
-rect 2011 267 2045 286
-rect 2011 115 2045 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 1682 1305 1716 1311
-rect 1682 1277 1716 1305
-rect 1818 1305 1852 1311
-rect 1818 1277 1852 1305
-rect 1954 1305 1988 1311
-rect 1954 1277 1988 1305
-rect 47 649 81 683
-rect 325 575 359 609
-rect 325 353 359 387
-rect 229 301 263 313
-rect 229 279 263 301
-rect 714 501 748 535
-rect 642 427 676 461
-rect 910 353 928 387
-rect 928 353 944 387
-rect 996 353 1030 387
-rect 1160 501 1194 535
-rect 1359 501 1393 535
-rect 1256 421 1290 455
-rect 1570 575 1604 609
-rect 2011 657 2045 683
-rect 2011 649 2045 657
-rect 1839 575 1873 609
-rect 1859 421 1893 455
-rect 1502 353 1536 387
-rect 1755 301 1789 313
-rect 1755 279 1789 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 1311 2090 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1682 1311
-rect 1716 1277 1818 1311
-rect 1852 1277 1954 1311
-rect 1988 1277 2090 1311
-rect 0 1271 2090 1277
-rect 35 683 93 689
-rect 1999 683 2057 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 1977 649 2011 683
-rect 2045 649 2057 683
-rect 35 643 93 649
-rect 1999 643 2057 649
-rect 313 609 371 615
-rect 1558 609 1616 615
-rect 1827 609 1885 615
-rect 313 575 325 609
-rect 359 575 1570 609
-rect 1604 575 1616 609
-rect 1804 575 1839 609
-rect 1873 575 1885 609
-rect 313 569 371 575
-rect 1558 569 1616 575
-rect 1827 569 1885 575
-rect 702 535 760 541
-rect 1148 535 1206 541
-rect 1347 535 1405 541
-rect 702 501 714 535
-rect 748 501 1160 535
-rect 1194 501 1359 535
-rect 1393 501 1405 535
-rect 702 495 760 501
-rect 1148 495 1206 501
-rect 1347 495 1405 501
-rect 630 461 688 467
-rect 630 427 642 461
-rect 676 427 710 461
-rect 1244 455 1302 461
-rect 1847 455 1905 461
-rect 630 421 688 427
-rect 1244 421 1256 455
-rect 1290 421 1859 455
-rect 1893 421 1905 455
-rect 1244 415 1302 421
-rect 1847 415 1905 421
-rect 313 387 371 393
-rect 898 387 956 393
-rect 313 353 325 387
-rect 359 353 910 387
-rect 944 353 956 387
-rect 313 347 371 353
-rect 898 347 956 353
-rect 984 387 1042 393
-rect 1490 387 1548 393
-rect 984 353 996 387
-rect 1030 353 1502 387
-rect 1536 353 1548 387
-rect 984 347 1042 353
-rect 1490 347 1548 353
-rect 217 313 275 319
-rect 1743 313 1801 319
-rect 217 279 229 313
-rect 263 279 1755 313
-rect 1789 279 1801 313
-rect 217 273 275 279
-rect 1743 273 1801 279
-rect 0 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel metal1 659 444 659 444 1 D
-port 1 n
-rlabel metal1 1376 518 1376 518 1 CK
-port 2 n
-rlabel metal1 1857 592 1857 592 1 QN
-port 3 n
-rlabel metal1 1587 592 1587 592 1 SN
-port 4 n
-rlabel metal1 65 666 65 666 1 RN
-port 5 n
-rlabel metal1 2028 666 2028 666 1 Q
-port 6 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__dffsr_l.mag b/18T_hs/sky130_osu_sc_18T_hs__dffsr_l.mag
deleted file mode 100644
index deaac25..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__dffsr_l.mag
+++ /dev/null
@@ -1,899 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864616
-<< checkpaint >>
-rect -1210 -1243 3248 2575
-<< nwell >>
-rect -10 581 2090 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 270 617 300 1217
-rect 356 617 386 1217
-rect 442 617 472 1217
-rect 632 617 662 1217
-rect 704 617 734 1217
-rect 824 617 854 1217
-rect 896 617 926 1217
-rect 982 617 1012 1217
-rect 1054 617 1084 1217
-rect 1174 617 1204 1217
-rect 1246 617 1276 1217
-rect 1332 617 1362 1217
-rect 1522 617 1552 1217
-rect 1608 617 1638 1217
-rect 1694 617 1724 1217
-rect 1884 817 1914 1217
-rect 1970 817 2000 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 272 115 302 263
-rect 370 115 400 315
-rect 442 115 472 315
-rect 632 115 662 315
-rect 704 115 734 315
-rect 824 115 854 315
-rect 896 115 926 315
-rect 982 115 1012 315
-rect 1054 115 1084 315
-rect 1174 115 1204 315
-rect 1246 115 1276 315
-rect 1332 115 1362 315
-rect 1522 115 1552 315
-rect 1594 115 1624 315
-rect 1692 115 1722 263
-rect 1884 115 1914 263
-rect 1970 115 2000 263
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 317 267 370 315
-rect 317 263 325 267
-rect 110 115 163 131
-rect 219 199 272 263
-rect 219 131 227 199
-rect 261 131 272 199
-rect 219 115 272 131
-rect 302 131 325 263
-rect 359 131 370 267
-rect 302 115 370 131
-rect 400 115 442 315
-rect 472 267 525 315
-rect 472 131 483 267
-rect 517 131 525 267
-rect 472 115 525 131
-rect 579 267 632 315
-rect 579 131 587 267
-rect 621 131 632 267
-rect 579 115 632 131
-rect 662 115 704 315
-rect 734 267 824 315
-rect 734 131 745 267
-rect 813 131 824 267
-rect 734 115 824 131
-rect 854 115 896 315
-rect 926 199 982 315
-rect 926 131 937 199
-rect 971 131 982 199
-rect 926 115 982 131
-rect 1012 115 1054 315
-rect 1084 267 1174 315
-rect 1084 131 1095 267
-rect 1163 131 1174 267
-rect 1084 115 1174 131
-rect 1204 115 1246 315
-rect 1276 267 1332 315
-rect 1276 131 1287 267
-rect 1321 131 1332 267
-rect 1276 115 1332 131
-rect 1362 267 1415 315
-rect 1362 131 1373 267
-rect 1407 131 1415 267
-rect 1362 115 1415 131
-rect 1469 267 1522 315
-rect 1469 131 1477 267
-rect 1511 131 1522 267
-rect 1469 115 1522 131
-rect 1552 115 1594 315
-rect 1624 267 1677 315
-rect 1624 131 1635 267
-rect 1669 263 1677 267
-rect 1669 131 1692 263
-rect 1624 115 1692 131
-rect 1722 199 1775 263
-rect 1722 131 1733 199
-rect 1767 131 1775 199
-rect 1722 115 1775 131
-rect 1831 199 1884 263
-rect 1831 131 1839 199
-rect 1873 131 1884 199
-rect 1831 115 1884 131
-rect 1914 199 1970 263
-rect 1914 131 1925 199
-rect 1959 131 1970 199
-rect 1914 115 1970 131
-rect 2000 199 2053 263
-rect 2000 131 2011 199
-rect 2045 131 2053 199
-rect 2000 115 2053 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-rect 217 1201 270 1217
-rect 217 725 225 1201
-rect 259 725 270 1201
-rect 217 617 270 725
-rect 300 1201 356 1217
-rect 300 725 311 1201
-rect 345 725 356 1201
-rect 300 617 356 725
-rect 386 1201 442 1217
-rect 386 793 397 1201
-rect 431 793 442 1201
-rect 386 617 442 793
-rect 472 1201 525 1217
-rect 472 725 483 1201
-rect 517 725 525 1201
-rect 472 617 525 725
-rect 579 1201 632 1217
-rect 579 725 587 1201
-rect 621 725 632 1201
-rect 579 617 632 725
-rect 662 617 704 1217
-rect 734 1201 824 1217
-rect 734 657 745 1201
-rect 813 657 824 1201
-rect 734 617 824 657
-rect 854 617 896 1217
-rect 926 1201 982 1217
-rect 926 725 937 1201
-rect 971 725 982 1201
-rect 926 617 982 725
-rect 1012 617 1054 1217
-rect 1084 1201 1174 1217
-rect 1084 725 1095 1201
-rect 1163 725 1174 1201
-rect 1084 617 1174 725
-rect 1204 617 1246 1217
-rect 1276 1201 1332 1217
-rect 1276 657 1287 1201
-rect 1321 657 1332 1201
-rect 1276 617 1332 657
-rect 1362 1201 1415 1217
-rect 1362 657 1373 1201
-rect 1407 657 1415 1201
-rect 1362 617 1415 657
-rect 1469 1201 1522 1217
-rect 1469 725 1477 1201
-rect 1511 725 1522 1201
-rect 1469 617 1522 725
-rect 1552 1201 1608 1217
-rect 1552 793 1563 1201
-rect 1597 793 1608 1201
-rect 1552 617 1608 793
-rect 1638 1201 1694 1217
-rect 1638 725 1649 1201
-rect 1683 725 1694 1201
-rect 1638 617 1694 725
-rect 1724 1201 1777 1217
-rect 1724 725 1735 1201
-rect 1769 725 1777 1201
-rect 1831 1201 1884 1217
-rect 1831 861 1839 1201
-rect 1873 861 1884 1201
-rect 1831 817 1884 861
-rect 1914 1201 1970 1217
-rect 1914 861 1925 1201
-rect 1959 861 1970 1201
-rect 1914 817 1970 861
-rect 2000 1201 2053 1217
-rect 2000 861 2011 1201
-rect 2045 861 2053 1201
-rect 2000 817 2053 861
-rect 1724 617 1777 725
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 227 131 261 199
-rect 325 131 359 267
-rect 483 131 517 267
-rect 587 131 621 267
-rect 745 131 813 267
-rect 937 131 971 199
-rect 1095 131 1163 267
-rect 1287 131 1321 267
-rect 1373 131 1407 267
-rect 1477 131 1511 267
-rect 1635 131 1669 267
-rect 1733 131 1767 199
-rect 1839 131 1873 199
-rect 1925 131 1959 199
-rect 2011 131 2045 199
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 225 725 259 1201
-rect 311 725 345 1201
-rect 397 793 431 1201
-rect 483 725 517 1201
-rect 587 725 621 1201
-rect 745 657 813 1201
-rect 937 725 971 1201
-rect 1095 725 1163 1201
-rect 1287 657 1321 1201
-rect 1373 657 1407 1201
-rect 1477 725 1511 1201
-rect 1563 793 1597 1201
-rect 1649 725 1683 1201
-rect 1735 725 1769 1201
-rect 1839 861 1873 1201
-rect 1925 861 1959 1201
-rect 2011 861 2045 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-rect 1658 1271 1682 1305
-rect 1716 1271 1740 1305
-rect 1794 1271 1818 1305
-rect 1852 1271 1876 1305
-rect 1930 1271 1954 1305
-rect 1988 1271 2012 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-rect 1682 1271 1716 1305
-rect 1818 1271 1852 1305
-rect 1954 1271 1988 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 270 1217 300 1243
-rect 356 1217 386 1243
-rect 442 1217 472 1243
-rect 632 1217 662 1243
-rect 704 1217 734 1243
-rect 824 1217 854 1243
-rect 896 1217 926 1243
-rect 982 1217 1012 1243
-rect 1054 1217 1084 1243
-rect 1174 1217 1204 1243
-rect 1246 1217 1276 1243
-rect 1332 1217 1362 1243
-rect 1522 1217 1552 1243
-rect 1608 1217 1638 1243
-rect 1694 1217 1724 1243
-rect 1884 1217 1914 1243
-rect 1970 1217 2000 1243
-rect 80 494 110 617
-rect 270 579 300 617
-rect 243 549 300 579
-rect 79 478 133 494
-rect 79 444 89 478
-rect 123 444 133 478
-rect 79 428 133 444
-rect 79 427 110 428
-rect 80 315 110 427
-rect 243 351 273 549
-rect 356 507 386 617
-rect 442 586 472 617
-rect 432 570 486 586
-rect 432 536 442 570
-rect 476 536 486 570
-rect 432 520 486 536
-rect 315 491 386 507
-rect 315 457 325 491
-rect 359 457 386 491
-rect 315 441 386 457
-rect 356 385 386 441
-rect 356 355 400 385
-rect 219 335 273 351
-rect 219 301 229 335
-rect 263 317 273 335
-rect 263 301 302 317
-rect 370 315 400 355
-rect 442 315 472 520
-rect 632 477 662 617
-rect 704 586 734 617
-rect 704 570 758 586
-rect 704 536 714 570
-rect 748 536 758 570
-rect 704 520 758 536
-rect 632 461 686 477
-rect 824 475 854 617
-rect 896 580 926 617
-rect 982 580 1012 617
-rect 896 570 1012 580
-rect 896 536 928 570
-rect 962 536 1012 570
-rect 896 526 1012 536
-rect 1054 475 1084 617
-rect 1174 586 1204 617
-rect 1150 570 1204 586
-rect 1150 536 1160 570
-rect 1194 536 1204 570
-rect 1150 520 1204 536
-rect 632 427 642 461
-rect 676 427 686 461
-rect 632 411 686 427
-rect 728 445 1180 475
-rect 632 315 662 411
-rect 728 367 758 445
-rect 1150 403 1180 445
-rect 1246 471 1276 617
-rect 1332 586 1362 617
-rect 1332 570 1403 586
-rect 1522 580 1552 617
-rect 1332 556 1359 570
-rect 1343 536 1359 556
-rect 1393 536 1403 570
-rect 1343 520 1403 536
-rect 1486 570 1552 580
-rect 1486 536 1502 570
-rect 1536 536 1552 570
-rect 1486 526 1552 536
-rect 1246 455 1300 471
-rect 1246 421 1256 455
-rect 1290 421 1300 455
-rect 1246 405 1300 421
-rect 704 337 758 367
-rect 800 387 854 403
-rect 800 353 810 387
-rect 844 353 854 387
-rect 800 337 854 353
-rect 704 315 734 337
-rect 824 315 854 337
-rect 896 387 1012 397
-rect 896 353 928 387
-rect 962 353 1012 387
-rect 896 343 1012 353
-rect 896 315 926 343
-rect 982 315 1012 343
-rect 1054 387 1108 403
-rect 1054 353 1064 387
-rect 1098 353 1108 387
-rect 1054 337 1108 353
-rect 1150 387 1204 403
-rect 1150 353 1160 387
-rect 1194 353 1204 387
-rect 1150 337 1204 353
-rect 1054 315 1084 337
-rect 1174 315 1204 337
-rect 1246 315 1276 405
-rect 1343 367 1373 520
-rect 1332 337 1373 367
-rect 1486 370 1516 526
-rect 1608 484 1638 617
-rect 1694 579 1724 617
-rect 1884 601 1914 817
-rect 1694 549 1775 579
-rect 1576 468 1638 484
-rect 1576 434 1588 468
-rect 1622 434 1638 468
-rect 1576 418 1638 434
-rect 1486 338 1552 370
-rect 1332 315 1362 337
-rect 1522 315 1552 338
-rect 1594 315 1624 418
-rect 1745 351 1775 549
-rect 1874 571 1914 601
-rect 1874 471 1904 571
-rect 1970 512 2000 817
-rect 1849 455 1904 471
-rect 1849 421 1859 455
-rect 1893 421 1904 455
-rect 1946 496 2000 512
-rect 1946 462 1956 496
-rect 1990 462 2000 496
-rect 1946 446 2000 462
-rect 1849 405 1904 421
-rect 1874 360 1904 405
-rect 1745 335 1799 351
-rect 1745 315 1755 335
-rect 219 285 302 301
-rect 272 263 302 285
-rect 1692 301 1755 315
-rect 1789 301 1799 335
-rect 1874 330 1914 360
-rect 1692 285 1799 301
-rect 1692 263 1722 285
-rect 1884 263 1914 330
-rect 1970 263 2000 446
-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 444 123 478
-rect 442 536 476 570
-rect 325 457 359 491
-rect 229 301 263 335
-rect 714 536 748 570
-rect 928 536 962 570
-rect 1160 536 1194 570
-rect 642 427 676 461
-rect 1359 536 1393 570
-rect 1502 536 1536 570
-rect 1256 421 1290 455
-rect 810 353 844 387
-rect 928 353 962 387
-rect 1064 353 1098 387
-rect 1160 353 1194 387
-rect 1588 434 1622 468
-rect 1859 421 1893 455
-rect 1956 462 1990 496
-rect 1755 301 1789 335
-<< locali >>
-rect 0 1311 2090 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1682 1311
-rect 1716 1271 1818 1311
-rect 1852 1271 1954 1311
-rect 1988 1271 2090 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 494 81 649
-rect 121 565 155 657
-rect 225 1201 259 1217
-rect 121 531 191 565
-rect 47 478 123 494
-rect 47 444 89 478
-rect 89 428 123 444
-rect 157 335 191 531
-rect 225 421 259 725
-rect 311 1201 345 1217
-rect 397 1201 431 1271
-rect 397 777 431 793
-rect 483 1201 517 1217
-rect 345 725 483 743
-rect 311 709 517 725
-rect 587 1201 621 1271
-rect 587 709 621 725
-rect 745 1201 813 1217
-rect 937 1201 971 1271
-rect 937 709 971 725
-rect 1095 1201 1163 1217
-rect 813 657 816 675
-rect 745 654 816 657
-rect 1095 654 1163 725
-rect 442 620 816 654
-rect 996 620 1163 654
-rect 1287 1201 1321 1271
-rect 1287 641 1321 657
-rect 1373 1201 1407 1217
-rect 1477 1201 1511 1217
-rect 1563 1201 1597 1271
-rect 1563 777 1597 793
-rect 1649 1201 1683 1217
-rect 1511 725 1649 743
-rect 1477 709 1683 725
-rect 1735 1201 1769 1217
-rect 1373 654 1407 657
-rect 1373 620 1461 654
-rect 325 491 359 575
-rect 442 570 476 620
-rect 309 457 325 491
-rect 359 457 375 491
-rect 225 387 359 421
-rect 121 301 229 335
-rect 263 301 279 335
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 301
-rect 325 267 359 353
-rect 442 370 476 536
-rect 714 570 748 586
-rect 714 535 748 536
-rect 928 570 962 586
-rect 748 501 844 535
-rect 642 461 676 477
-rect 642 411 676 427
-rect 810 387 844 501
-rect 928 387 962 536
-rect 442 336 776 370
-rect 810 337 844 353
-rect 928 337 962 353
-rect 996 387 1030 620
-rect 1160 570 1194 586
-rect 1160 535 1194 536
-rect 742 283 776 336
-rect 996 303 1030 353
-rect 1064 501 1160 535
-rect 1359 570 1393 586
-rect 1359 535 1393 536
-rect 1064 387 1098 501
-rect 1427 455 1461 620
-rect 1240 421 1256 455
-rect 1290 421 1306 455
-rect 1373 421 1461 455
-rect 1502 570 1536 586
-rect 1373 387 1407 421
-rect 1144 353 1160 387
-rect 1194 353 1407 387
-rect 1502 387 1536 536
-rect 1570 484 1604 575
-rect 1570 468 1638 484
-rect 1570 434 1588 468
-rect 1622 434 1638 468
-rect 1735 455 1769 725
-rect 1839 1201 1873 1217
-rect 1839 609 1873 861
-rect 1925 1201 1959 1271
-rect 1925 845 1959 861
-rect 2011 1201 2045 1217
-rect 2011 683 2045 861
-rect 2044 666 2045 683
-rect 2044 649 2068 666
-rect 2011 632 2068 649
-rect 1839 570 1873 575
-rect 1839 536 1990 570
-rect 1956 496 1990 536
-rect 1672 421 1859 455
-rect 1893 421 1909 455
-rect 1672 399 1706 421
-rect 1635 365 1706 399
-rect 1956 387 1990 462
-rect 1064 337 1098 353
-rect 121 115 155 131
-rect 227 199 261 215
-rect 227 61 261 131
-rect 325 115 359 131
-rect 483 267 517 283
-rect 483 61 517 131
-rect 587 267 621 283
-rect 742 267 813 283
-rect 996 269 1163 303
-rect 742 249 745 267
-rect 587 61 621 131
-rect 1095 267 1163 269
-rect 745 115 813 131
-rect 937 199 971 215
-rect 937 61 971 131
-rect 1095 115 1163 131
-rect 1287 267 1321 283
-rect 1287 61 1321 131
-rect 1373 267 1407 353
-rect 1373 115 1407 131
-rect 1477 267 1511 283
-rect 1477 61 1511 131
-rect 1635 267 1669 365
-rect 1839 353 1990 387
-rect 1739 301 1755 335
-rect 1789 301 1805 335
-rect 1635 115 1669 131
-rect 1733 199 1767 215
-rect 1733 61 1767 131
-rect 1839 199 1873 353
-rect 2034 320 2068 632
-rect 2011 286 2068 320
-rect 1839 115 1873 131
-rect 1925 199 1959 215
-rect 1925 61 1959 131
-rect 2011 199 2045 286
-rect 2011 115 2045 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 1682 1305 1716 1311
-rect 1682 1277 1716 1305
-rect 1818 1305 1852 1311
-rect 1818 1277 1852 1305
-rect 1954 1305 1988 1311
-rect 1954 1277 1988 1305
-rect 47 649 81 683
-rect 325 575 359 609
-rect 325 353 359 387
-rect 229 301 263 313
-rect 229 279 263 301
-rect 714 501 748 535
-rect 642 427 676 461
-rect 910 353 928 387
-rect 928 353 944 387
-rect 996 353 1030 387
-rect 1160 501 1194 535
-rect 1359 501 1393 535
-rect 1256 421 1290 455
-rect 1570 575 1604 609
-rect 2010 649 2044 683
-rect 1839 575 1873 609
-rect 1859 421 1893 455
-rect 1502 353 1536 387
-rect 1755 301 1789 313
-rect 1755 279 1789 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 1311 2090 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1682 1311
-rect 1716 1277 1818 1311
-rect 1852 1277 1954 1311
-rect 1988 1277 2090 1311
-rect 0 1271 2090 1277
-rect 35 683 93 689
-rect 1998 683 2056 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 1976 649 2010 683
-rect 2044 649 2056 683
-rect 35 643 93 649
-rect 1998 643 2056 649
-rect 313 609 371 615
-rect 1558 609 1616 615
-rect 1827 609 1885 615
-rect 313 575 325 609
-rect 359 575 1570 609
-rect 1604 575 1616 609
-rect 1804 575 1839 609
-rect 1873 575 1885 609
-rect 313 569 371 575
-rect 1558 569 1616 575
-rect 1827 569 1885 575
-rect 702 535 760 541
-rect 1148 535 1206 541
-rect 1347 535 1405 541
-rect 702 501 714 535
-rect 748 501 1160 535
-rect 1194 501 1359 535
-rect 1393 501 1405 535
-rect 702 495 760 501
-rect 1148 495 1206 501
-rect 1347 495 1405 501
-rect 630 461 688 467
-rect 630 427 642 461
-rect 676 427 710 461
-rect 1244 455 1302 461
-rect 1847 455 1905 461
-rect 630 421 688 427
-rect 1244 421 1256 455
-rect 1290 421 1859 455
-rect 1893 421 1905 455
-rect 1244 415 1302 421
-rect 1847 415 1905 421
-rect 313 387 371 393
-rect 898 387 956 393
-rect 313 353 325 387
-rect 359 353 910 387
-rect 944 353 956 387
-rect 313 347 371 353
-rect 898 347 956 353
-rect 984 387 1042 393
-rect 1490 387 1548 393
-rect 984 353 996 387
-rect 1030 353 1502 387
-rect 1536 353 1548 387
-rect 984 347 1042 353
-rect 1490 347 1548 353
-rect 217 313 275 319
-rect 1743 313 1801 319
-rect 217 279 229 313
-rect 263 279 1755 313
-rect 1789 279 1801 313
-rect 217 273 275 279
-rect 1743 273 1801 279
-rect 0 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel metal1 659 444 659 444 1 D
-port 1 n
-rlabel metal1 1376 518 1376 518 1 CK
-port 2 n
-rlabel metal1 1857 592 1857 592 1 QN
-port 3 n
-rlabel metal1 2027 666 2027 666 1 Q
-port 4 n
-rlabel metal1 1587 592 1587 592 1 SN
-port 5 n
-rlabel metal1 65 666 65 666 1 RN
-port 6 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__fill_1.mag b/18T_hs/sky130_osu_sc_18T_hs__fill_1.mag
deleted file mode 100644
index 8d5ce0c..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__fill_1.mag
+++ /dev/null
@@ -1,22 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548551
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< error_p >>
-rect 0 1271 34 1332
-rect 41 581 154 1341
-rect 0 0 34 61
-<< nwell >>
-rect -14 581 41 1341
-<< locali >>
-rect 0 1271 22 1332
-rect 0 0 22 61
-<< metal1 >>
-rect 0 1271 22 1332
-rect 0 0 22 61
-<< labels >>
-rlabel metal1 11 28 11 28 1 gnd
-rlabel metal1 11 1299 11 1299 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__fill_16.mag b/18T_hs/sky130_osu_sc_18T_hs__fill_16.mag
deleted file mode 100644
index 877376a..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__fill_16.mag
+++ /dev/null
@@ -1,18 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548584
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 581 355 1341
-<< locali >>
-rect 0 1271 352 1332
-rect 0 0 352 61
-<< metal1 >>
-rect 0 1271 352 1332
-rect 0 0 352 61
-<< labels >>
-rlabel metal1 196 30 196 30 1 gnd
-rlabel metal1 199 1300 199 1300 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__fill_2.mag b/18T_hs/sky130_osu_sc_18T_hs__fill_2.mag
deleted file mode 100644
index 65e2cf3..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__fill_2.mag
+++ /dev/null
@@ -1,22 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548559
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< error_p >>
-rect 0 1271 44 1332
-rect 50 581 161 1341
-rect 0 0 44 61
-<< nwell >>
-rect -7 581 50 1341
-<< locali >>
-rect 0 1271 44 1332
-rect 0 0 44 61
-<< metal1 >>
-rect 0 1271 44 1332
-rect 0 0 44 61
-<< labels >>
-rlabel metal1 23 28 23 28 1 gnd
-rlabel metal1 22 1300 22 1300 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__fill_32.mag b/18T_hs/sky130_osu_sc_18T_hs__fill_32.mag
deleted file mode 100644
index bcb8614..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__fill_32.mag
+++ /dev/null
@@ -1,18 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548594
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 581 707 1341
-<< locali >>
-rect 0 1271 704 1332
-rect 0 0 704 61
-<< metal1 >>
-rect 0 1271 704 1332
-rect 0 0 704 61
-<< labels >>
-rlabel metal1 363 26 363 26 1 gnd
-rlabel metal1 374 1298 374 1298 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__fill_4.mag b/18T_hs/sky130_osu_sc_18T_hs__fill_4.mag
deleted file mode 100644
index b47e23b..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__fill_4.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548567
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< error_p >>
-rect 96 581 159 1341
-<< nwell >>
-rect -9 581 96 1341
-<< locali >>
-rect 0 1271 88 1332
-rect 0 0 88 61
-<< metal1 >>
-rect 0 1271 88 1332
-rect 0 0 88 61
-<< labels >>
-rlabel metal1 71 28 71 28 1 gnd
-rlabel metal1 72 1301 72 1301 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__fill_8.mag b/18T_hs/sky130_osu_sc_18T_hs__fill_8.mag
deleted file mode 100644
index 024779e..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__fill_8.mag
+++ /dev/null
@@ -1,18 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548573
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 581 179 1341
-<< locali >>
-rect 0 1271 176 1332
-rect 0 0 176 61
-<< metal1 >>
-rect 0 1271 176 1332
-rect 0 0 176 61
-<< labels >>
-rlabel metal1 112 28 112 28 1 gnd
-rlabel metal1 111 1303 111 1303 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__inv_1.mag b/18T_hs/sky130_osu_sc_18T_hs__inv_1.mag
deleted file mode 100644
index ddc1a20..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__inv_1.mag
+++ /dev/null
@@ -1,113 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864617
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< pmos >>
-rect 80 617 110 1217
-<< nmoslvt >>
-rect 80 115 110 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 494 110 617
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 315 110 428
-rect 80 89 110 115
-<< polycont >>
-rect 90 444 124 478
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 121 279 155 313
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 109 575 121 609
-rect 155 575 167 609
-rect 109 569 167 575
-rect 121 319 155 569
-rect 109 313 167 319
-rect 109 279 121 313
-rect 155 279 167 313
-rect 109 273 167 279
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 151 441 151 441 1 Y
-port 1 n
-rlabel metal1 64 666 64 666 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__inv_10.mag b/18T_hs/sky130_osu_sc_18T_hs__inv_10.mag
deleted file mode 100644
index 827ee0e..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__inv_10.mag
+++ /dev/null
@@ -1,418 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864617
-<< checkpaint >>
-rect -1209 -1243 2161 2575
-<< nwell >>
-rect -9 581 990 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-rect 768 617 798 1217
-rect 854 617 884 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-rect 768 115 798 315
-rect 854 115 884 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 768 315
-rect 712 131 723 267
-rect 757 131 768 267
-rect 712 115 768 131
-rect 798 267 854 315
-rect 798 131 809 267
-rect 843 131 854 267
-rect 798 115 854 131
-rect 884 267 937 315
-rect 884 131 895 267
-rect 929 131 937 267
-rect 884 115 937 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 768 1217
-rect 712 657 723 1201
-rect 757 657 768 1201
-rect 712 617 768 657
-rect 798 1201 854 1217
-rect 798 657 809 1201
-rect 843 657 854 1201
-rect 798 617 854 657
-rect 884 1201 937 1217
-rect 884 657 895 1201
-rect 929 657 937 1201
-rect 884 617 937 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-rect 809 131 843 267
-rect 895 131 929 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-rect 809 657 843 1201
-rect 895 657 929 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 768 1217 798 1243
-rect 854 1217 884 1243
-rect 80 592 110 617
-rect 166 592 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 596 592 626 617
-rect 682 592 712 617
-rect 768 592 798 617
-rect 854 592 884 617
-rect 80 562 884 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 424 370 454 562
-rect 80 340 884 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 252 315 282 340
-rect 338 315 368 340
-rect 424 315 454 340
-rect 510 315 540 340
-rect 596 315 626 340
-rect 682 315 712 340
-rect 768 315 798 340
-rect 854 315 884 340
-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 444 124 478
-<< locali >>
-rect 0 1311 990 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 990 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 293 1201 327 1217
-rect 293 609 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 609 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 637 1201 671 1217
-rect 637 609 671 657
-rect 723 1201 757 1271
-rect 723 641 757 657
-rect 809 1201 843 1217
-rect 809 609 843 657
-rect 895 1201 929 1271
-rect 895 641 929 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 637 267 671 279
-rect 637 115 671 131
-rect 723 267 757 283
-rect 723 61 757 131
-rect 809 267 843 279
-rect 809 115 843 131
-rect 895 267 929 283
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 293 575 327 609
-rect 465 575 499 609
-rect 637 575 671 609
-rect 809 575 843 609
-rect 121 279 155 313
-rect 293 279 327 313
-rect 465 279 499 313
-rect 637 279 671 313
-rect 809 279 843 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1311 990 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 990 1311
-rect 0 1271 990 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 281 609 339 615
-rect 453 609 511 615
-rect 625 609 683 615
-rect 797 609 855 615
-rect 109 575 121 609
-rect 155 575 293 609
-rect 327 575 465 609
-rect 499 575 637 609
-rect 671 575 809 609
-rect 843 575 855 609
-rect 109 569 167 575
-rect 281 569 339 575
-rect 453 569 511 575
-rect 625 569 683 575
-rect 797 569 855 575
-rect 121 319 155 569
-rect 293 319 327 569
-rect 465 319 499 569
-rect 637 319 671 569
-rect 809 319 843 569
-rect 109 313 167 319
-rect 281 313 339 319
-rect 453 313 511 319
-rect 625 313 683 319
-rect 797 313 855 319
-rect 109 279 121 313
-rect 155 279 293 313
-rect 327 279 465 313
-rect 499 279 637 313
-rect 671 279 809 313
-rect 843 279 855 313
-rect 109 273 167 279
-rect 281 273 339 279
-rect 453 273 511 279
-rect 625 273 683 279
-rect 797 273 855 279
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 152 440 152 440 1 Y
-port 1 n
-rlabel metal1 64 665 64 665 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__inv_2.mag b/18T_hs/sky130_osu_sc_18T_hs__inv_2.mag
deleted file mode 100644
index 1b95287..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__inv_2.mag
+++ /dev/null
@@ -1,151 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864617
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 287 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 249 315
-rect 196 131 207 267
-rect 241 131 249 267
-rect 196 115 249 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 249 1217
-rect 196 657 207 1201
-rect 241 657 249 1201
-rect 196 617 249 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1244
-rect 80 592 110 617
-rect 166 592 196 617
-rect 80 562 196 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 80 340 196 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 90 444 124 478
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 121 279 155 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 109 575 121 609
-rect 155 575 167 609
-rect 109 569 167 575
-rect 121 319 155 569
-rect 109 313 167 319
-rect 109 279 121 313
-rect 155 279 167 313
-rect 109 273 167 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 152 440 152 440 1 Y
-port 1 n
-rlabel metal1 64 665 64 665 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__inv_3.mag b/18T_hs/sky130_osu_sc_18T_hs__inv_3.mag
deleted file mode 100644
index 2b006d4..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__inv_3.mag
+++ /dev/null
@@ -1,180 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864618
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 375 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 335 315
-rect 282 131 293 267
-rect 327 131 335 267
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 335 1217
-rect 282 657 293 1201
-rect 327 657 335 1201
-rect 282 617 335 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 592 110 617
-rect 166 592 196 617
-rect 252 592 282 617
-rect 80 562 282 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 80 340 282 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 252 315 282 340
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 90 444 124 478
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 293 1201 327 1217
-rect 293 609 327 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 293 575 327 609
-rect 121 279 155 313
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 281 609 339 615
-rect 109 575 121 609
-rect 155 575 293 609
-rect 327 575 339 609
-rect 109 569 167 575
-rect 281 569 339 575
-rect 121 319 155 569
-rect 293 319 327 569
-rect 109 313 167 319
-rect 281 313 339 319
-rect 109 279 121 313
-rect 155 279 293 313
-rect 327 279 339 313
-rect 109 273 167 279
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 152 440 152 440 1 Y
-port 1 n
-rlabel metal1 64 665 64 665 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__inv_4.mag b/18T_hs/sky130_osu_sc_18T_hs__inv_4.mag
deleted file mode 100644
index 23660e8..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__inv_4.mag
+++ /dev/null
@@ -1,214 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864618
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 463 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 421 315
-rect 368 131 379 267
-rect 413 131 421 267
-rect 368 115 421 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 421 1217
-rect 368 657 379 1201
-rect 413 657 421 1201
-rect 368 617 421 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1243
-rect 80 592 110 617
-rect 166 592 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 80 562 368 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 80 340 368 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 252 315 282 340
-rect 338 315 368 340
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 90 444 124 478
-<< locali >>
-rect 0 1311 462 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 462 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 293 1201 327 1217
-rect 293 609 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 293 575 327 609
-rect 121 279 155 313
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 462 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 462 1311
-rect 0 1271 462 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 281 609 339 615
-rect 109 575 121 609
-rect 155 575 293 609
-rect 327 575 339 609
-rect 109 569 167 575
-rect 281 569 339 575
-rect 121 319 155 569
-rect 293 319 327 569
-rect 109 313 167 319
-rect 281 313 339 319
-rect 109 279 121 313
-rect 155 279 293 313
-rect 327 279 339 313
-rect 109 273 167 279
-rect 281 273 339 279
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 64 665 64 665 1 A
-port 1 n
-rlabel metal1 152 440 152 440 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__inv_6.mag b/18T_hs/sky130_osu_sc_18T_hs__inv_6.mag
deleted file mode 100644
index fc7b91b..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__inv_6.mag
+++ /dev/null
@@ -1,278 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864618
-<< checkpaint >>
-rect -1209 -1243 1753 2575
-<< nwell >>
-rect -9 581 639 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 593 315
-rect 540 131 551 267
-rect 585 131 593 267
-rect 540 115 593 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 593 1217
-rect 540 657 551 1201
-rect 585 657 593 1201
-rect 540 617 593 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 80 592 110 617
-rect 166 592 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 80 562 540 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 424 370 454 562
-rect 80 340 540 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 252 315 282 340
-rect 338 315 368 340
-rect 424 315 454 340
-rect 510 315 540 340
-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 444 124 478
-<< locali >>
-rect 0 1311 638 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 638 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 293 1201 327 1217
-rect 293 609 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 609 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 293 575 327 609
-rect 465 575 499 609
-rect 121 279 155 313
-rect 293 279 327 313
-rect 465 279 499 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 638 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 638 1311
-rect 0 1271 638 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 281 609 339 615
-rect 453 609 511 615
-rect 109 575 121 609
-rect 155 575 293 609
-rect 327 575 465 609
-rect 499 575 511 609
-rect 109 569 167 575
-rect 281 569 339 575
-rect 453 569 511 575
-rect 121 319 155 569
-rect 293 319 327 569
-rect 465 319 499 569
-rect 109 313 167 319
-rect 281 313 339 319
-rect 453 313 511 319
-rect 109 279 121 313
-rect 155 279 293 313
-rect 327 279 465 313
-rect 499 279 511 313
-rect 109 273 167 279
-rect 281 273 339 279
-rect 453 273 511 279
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 64 665 64 665 1 A
-port 1 n
-rlabel metal1 152 440 152 440 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__inv_8.mag b/18T_hs/sky130_osu_sc_18T_hs__inv_8.mag
deleted file mode 100644
index a78d844..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__inv_8.mag
+++ /dev/null
@@ -1,341 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864618
-<< checkpaint >>
-rect -1209 -1243 1889 2575
-<< nwell >>
-rect -9 581 814 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 765 315
-rect 712 131 723 267
-rect 757 131 765 267
-rect 712 115 765 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 765 1217
-rect 712 657 723 1201
-rect 757 657 765 1201
-rect 712 617 765 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 80 592 110 617
-rect 166 592 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 596 592 626 617
-rect 682 592 712 617
-rect 80 562 712 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 424 370 454 562
-rect 80 340 712 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 252 315 282 340
-rect 338 315 368 340
-rect 424 315 454 340
-rect 510 315 540 340
-rect 596 315 626 340
-rect 682 315 712 340
-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 444 124 478
-<< locali >>
-rect 0 1311 814 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 814 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 293 1201 327 1217
-rect 293 609 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 609 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 637 1201 671 1217
-rect 637 609 671 657
-rect 723 1201 757 1271
-rect 723 641 757 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 637 267 671 279
-rect 637 115 671 131
-rect 723 267 757 283
-rect 723 61 757 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 814 61
-rect 0 0 814 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 293 575 327 609
-rect 465 575 499 609
-rect 637 575 671 609
-rect 121 279 155 313
-rect 293 279 327 313
-rect 465 279 499 313
-rect 637 279 671 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-<< metal1 >>
-rect 0 1311 814 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 814 1311
-rect 0 1271 814 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 281 609 339 615
-rect 453 609 511 615
-rect 625 609 683 615
-rect 109 575 121 609
-rect 155 575 293 609
-rect 327 575 465 609
-rect 499 575 637 609
-rect 671 575 683 609
-rect 109 569 167 575
-rect 281 569 339 575
-rect 453 569 511 575
-rect 625 569 683 575
-rect 121 319 155 569
-rect 293 319 327 569
-rect 465 319 499 569
-rect 637 319 671 569
-rect 109 313 167 319
-rect 281 313 339 319
-rect 453 313 511 319
-rect 625 313 683 319
-rect 109 279 121 313
-rect 155 279 293 313
-rect 327 279 465 313
-rect 499 279 637 313
-rect 671 279 683 313
-rect 109 273 167 279
-rect 281 273 339 279
-rect 453 273 511 279
-rect 625 273 683 279
-rect 0 55 814 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 814 55
-rect 0 0 814 21
-<< labels >>
-rlabel metal1 152 440 152 440 1 Y
-port 1 n
-rlabel metal1 64 665 64 665 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__inv_l.mag b/18T_hs/sky130_osu_sc_18T_hs__inv_l.mag
deleted file mode 100644
index f2529fb..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__inv_l.mag
+++ /dev/null
@@ -1,113 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864618
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< pmos >>
-rect 80 817 110 1217
-<< nmoslvt >>
-rect 80 115 110 263
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 163 263
-rect 110 131 121 199
-rect 155 131 163 199
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 817 80 929
-rect 110 1201 163 1217
-rect 110 929 121 1201
-rect 155 929 163 1201
-rect 110 817 163 929
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-<< pdiffc >>
-rect 35 929 69 1201
-rect 121 929 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 494 110 817
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 263 110 428
-rect 80 89 110 115
-<< polycont >>
-rect 90 444 124 478
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 913 69 929
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 929
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 199 69 215
-rect 35 61 69 131
-rect 121 199 155 279
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 121 279 155 313
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 109 575 121 609
-rect 155 575 167 609
-rect 109 569 167 575
-rect 121 319 155 569
-rect 109 313 167 319
-rect 109 279 121 313
-rect 155 279 167 313
-rect 109 273 167 279
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 64 666 64 666 1 A
-port 1 n
-rlabel metal1 151 441 151 441 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__mux2_1.mag b/18T_hs/sky130_osu_sc_18T_hs__mux2_1.mag
deleted file mode 100644
index 37a9bbf..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__mux2_1.mag
+++ /dev/null
@@ -1,226 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864618
-<< checkpaint >>
-rect -801 1315 1753 2575
-rect -1209 -1243 1753 1315
-<< nwell >>
-rect -9 581 553 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 270 617 300 1217
-rect 356 617 386 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 270 115 300 315
-rect 356 115 386 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-rect 217 267 270 315
-rect 217 131 225 267
-rect 259 131 270 267
-rect 217 115 270 131
-rect 300 267 356 315
-rect 300 131 311 267
-rect 345 131 356 267
-rect 300 115 356 131
-rect 386 267 439 315
-rect 386 131 397 267
-rect 431 131 439 267
-rect 386 115 439 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-rect 217 1201 270 1217
-rect 217 657 225 1201
-rect 259 657 270 1201
-rect 217 617 270 657
-rect 300 1201 356 1217
-rect 300 657 311 1201
-rect 345 657 356 1201
-rect 300 617 356 657
-rect 386 1201 439 1217
-rect 386 657 397 1201
-rect 431 657 439 1201
-rect 386 617 439 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 225 131 259 267
-rect 311 131 345 267
-rect 397 131 431 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 225 657 259 1201
-rect 311 657 345 1201
-rect 397 657 431 1201
-<< 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 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1232 300 1262
-rect 80 1217 110 1232
-rect 270 1217 300 1232
-rect 356 1217 386 1243
-rect 80 494 110 617
-rect 270 591 300 617
-rect 152 555 218 565
-rect 152 521 168 555
-rect 202 541 218 555
-rect 356 541 386 617
-rect 202 521 386 541
-rect 152 511 386 521
-rect 27 478 110 494
-rect 27 444 37 478
-rect 71 469 110 478
-rect 71 444 386 469
-rect 27 439 386 444
-rect 27 428 110 439
-rect 80 315 110 428
-rect 152 387 218 397
-rect 152 353 168 387
-rect 202 373 218 387
-rect 202 353 300 373
-rect 152 343 300 353
-rect 270 315 300 343
-rect 356 315 386 439
-rect 80 89 110 115
-rect 270 89 300 115
-rect 356 89 386 115
-<< polycont >>
-rect 168 521 202 555
-rect 37 444 71 478
-rect 168 353 202 387
-<< locali >>
-rect 0 1311 550 1332
-rect 0 1271 459 1311
-rect 493 1271 550 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 37 478 71 649
-rect 37 428 71 444
-rect 121 571 155 657
-rect 225 1201 259 1217
-rect 311 1201 345 1217
-rect 225 623 270 657
-rect 236 609 270 623
-rect 121 555 202 571
-rect 121 521 168 555
-rect 121 505 202 521
-rect 121 403 155 505
-rect 121 387 202 403
-rect 121 353 168 387
-rect 121 337 202 353
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 337
-rect 236 301 270 575
-rect 311 461 345 657
-rect 397 1201 431 1217
-rect 397 535 431 657
-rect 121 115 155 131
-rect 225 267 270 301
-rect 311 267 345 279
-rect 225 115 259 131
-rect 311 115 345 131
-rect 397 267 431 501
-rect 397 115 431 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 37 649 71 683
-rect 236 575 270 609
-rect 311 427 345 461
-rect 397 501 431 535
-rect 311 279 345 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 550 1332
-rect 0 1277 459 1311
-rect 493 1277 550 1311
-rect 0 1271 550 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 117 683
-rect 25 643 83 649
-rect 224 609 282 615
-rect 190 575 236 609
-rect 270 575 282 609
-rect 224 569 282 575
-rect 385 535 443 541
-rect 351 501 397 535
-rect 431 501 443 535
-rect 385 495 443 501
-rect 299 461 357 467
-rect 299 427 311 461
-rect 345 427 357 461
-rect 299 421 357 427
-rect 311 319 345 421
-rect 299 313 357 319
-rect 299 279 311 313
-rect 345 279 357 313
-rect 299 273 357 279
-rect 0 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel metal1 54 666 54 666 1 S0
-port 1 n
-rlabel metal1 328 444 328 444 1 Y
-port 2 n
-rlabel metal1 253 592 253 592 1 A0
-port 3 n
-rlabel metal1 414 518 414 518 1 A1
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 476 1284 476 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__nand2_1.mag b/18T_hs/sky130_osu_sc_18T_hs__nand2_1.mag
deleted file mode 100644
index df67fd4..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__nand2_1.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864619
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 286 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 152 115 182 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 235 315
-rect 182 131 193 267
-rect 227 131 235 267
-rect 182 115 235 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 249 1217
-rect 196 725 207 1201
-rect 241 725 249 1201
-rect 196 617 249 725
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 725 241 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 80 570 110 617
-rect 37 554 110 570
-rect 37 520 47 554
-rect 81 520 110 554
-rect 37 504 110 520
-rect 80 315 110 504
-rect 166 477 196 617
-rect 152 461 210 477
-rect 152 427 166 461
-rect 200 427 210 461
-rect 152 411 210 427
-rect 152 315 182 411
-rect 80 89 110 115
-rect 152 89 182 115
-<< polycont >>
-rect 47 520 81 554
-rect 166 427 200 461
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 554 81 649
-rect 47 504 81 520
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 121 535 155 657
-rect 195 461 229 575
-rect 150 427 166 461
-rect 200 427 229 461
-rect 35 267 69 279
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 47 649 81 683
-rect 121 501 155 535
-rect 195 575 229 609
-rect 35 279 69 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 115 683
-rect 35 643 93 649
-rect 183 609 241 615
-rect 161 575 195 609
-rect 229 575 241 609
-rect 183 569 241 575
-rect 109 535 167 541
-rect 109 501 121 535
-rect 155 501 167 535
-rect 109 495 167 501
-rect 23 313 81 319
-rect 121 313 155 495
-rect 23 279 35 313
-rect 69 279 155 313
-rect 23 273 81 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 470 136 470 1 Y
-port 1 n
-rlabel metal1 64 666 64 666 1 A
-port 2 n
-rlabel metal1 212 592 212 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__nand2_l.mag b/18T_hs/sky130_osu_sc_18T_hs__nand2_l.mag
deleted file mode 100644
index a85b105..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__nand2_l.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864619
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 286 1341
-<< pmos >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 115 152 263
-rect 182 199 235 263
-rect 182 131 193 199
-rect 227 131 235 199
-rect 182 115 235 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 817 80 929
-rect 110 1201 166 1217
-rect 110 929 121 1201
-rect 155 929 166 1201
-rect 110 817 166 929
-rect 196 1201 249 1217
-rect 196 929 207 1201
-rect 241 929 249 1201
-rect 196 817 249 929
-<< ndiffc >>
-rect 35 131 69 199
-rect 193 131 227 199
-<< pdiffc >>
-rect 35 929 69 1201
-rect 121 929 155 1201
-rect 207 929 241 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 80 570 110 817
-rect 37 554 110 570
-rect 37 520 47 554
-rect 81 520 110 554
-rect 37 504 110 520
-rect 80 263 110 504
-rect 166 420 196 817
-rect 152 404 210 420
-rect 152 370 166 404
-rect 200 370 210 404
-rect 152 354 210 370
-rect 152 263 182 354
-rect 80 89 110 115
-rect 152 89 182 115
-<< polycont >>
-rect 47 520 81 554
-rect 166 370 200 404
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1271
-rect 35 913 69 929
-rect 121 1201 155 1217
-rect 47 554 81 649
-rect 47 504 81 520
-rect 121 535 155 929
-rect 207 1201 241 1271
-rect 207 913 241 929
-rect 195 404 229 575
-rect 150 370 166 404
-rect 200 370 229 404
-rect 35 199 69 279
-rect 35 115 69 131
-rect 193 199 227 215
-rect 193 61 227 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 47 649 81 683
-rect 121 501 155 535
-rect 195 575 229 609
-rect 35 279 69 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 115 683
-rect 35 643 93 649
-rect 183 609 241 615
-rect 161 575 195 609
-rect 229 575 241 609
-rect 183 569 241 575
-rect 109 535 167 541
-rect 109 501 121 535
-rect 155 501 167 535
-rect 109 495 167 501
-rect 23 313 81 319
-rect 121 313 155 495
-rect 23 279 35 313
-rect 69 279 155 313
-rect 23 273 81 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 470 136 470 1 Y
-port 1 n
-rlabel metal1 212 592 212 592 1 B
-port 2 n
-rlabel metal1 64 666 64 666 1 A
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__nor2_1.mag b/18T_hs/sky130_osu_sc_18T_hs__nor2_1.mag
deleted file mode 100644
index 9cc21e8..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__nor2_1.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864619
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 286 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 152 617 182 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 249 315
-rect 196 131 207 267
-rect 241 131 249 267
-rect 196 115 249 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 617 152 1217
-rect 182 1201 235 1217
-rect 182 793 193 1201
-rect 227 793 235 1201
-rect 182 617 235 793
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 193 793 227 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 152 1217 182 1243
-rect 80 451 110 617
-rect 152 584 182 617
-rect 152 568 225 584
-rect 152 534 181 568
-rect 215 534 225 568
-rect 152 518 225 534
-rect 56 435 110 451
-rect 56 401 66 435
-rect 100 401 110 435
-rect 56 385 110 401
-rect 80 315 110 385
-rect 166 315 196 518
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 181 534 215 568
-rect 66 401 100 435
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1217
-rect 193 1201 227 1271
-rect 193 777 227 793
-rect 35 535 69 657
-rect 113 435 147 575
-rect 181 568 215 649
-rect 181 518 215 534
-rect 50 401 66 435
-rect 100 401 147 435
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 181 649 215 683
-rect 35 501 69 535
-rect 113 575 147 609
-rect 121 279 155 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 169 683 227 689
-rect 148 649 181 683
-rect 215 649 227 683
-rect 169 643 227 649
-rect 101 609 159 615
-rect 79 575 113 609
-rect 147 575 159 609
-rect 101 569 159 575
-rect 23 535 81 541
-rect 23 501 35 535
-rect 69 501 155 535
-rect 23 495 81 501
-rect 121 319 155 501
-rect 109 313 167 319
-rect 109 279 121 313
-rect 155 279 167 313
-rect 109 273 167 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 137 393 137 393 1 Y
-port 1 n
-rlabel metal1 130 592 130 592 1 B
-port 2 n
-rlabel metal1 198 666 198 666 1 A
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__nor2_l.mag b/18T_hs/sky130_osu_sc_18T_hs__nor2_l.mag
deleted file mode 100644
index d8a7f8d..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__nor2_l.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864619
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 286 1341
-<< pmos >>
-rect 80 817 110 1217
-rect 152 817 182 1217
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 166 263
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 199 249 263
-rect 196 131 207 199
-rect 241 131 249 199
-rect 196 115 249 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 817 152 1217
-rect 182 1201 235 1217
-rect 182 861 193 1201
-rect 227 861 235 1201
-rect 182 817 235 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-rect 207 131 241 199
-<< pdiffc >>
-rect 35 861 69 1201
-rect 193 861 227 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 152 1217 182 1243
-rect 80 451 110 817
-rect 152 584 182 817
-rect 152 568 225 584
-rect 152 534 181 568
-rect 215 534 225 568
-rect 152 518 225 534
-rect 56 435 110 451
-rect 56 401 66 435
-rect 100 401 110 435
-rect 56 385 110 401
-rect 80 263 110 385
-rect 166 263 196 518
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 181 534 215 568
-rect 66 401 100 435
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1217
-rect 35 535 69 861
-rect 193 1201 227 1271
-rect 193 845 227 861
-rect 113 435 147 575
-rect 181 568 215 649
-rect 181 518 215 534
-rect 50 401 66 435
-rect 100 401 147 435
-rect 35 199 69 215
-rect 35 61 69 131
-rect 121 199 155 279
-rect 121 115 155 131
-rect 207 199 241 215
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 181 649 215 683
-rect 35 501 69 535
-rect 113 575 147 609
-rect 121 279 155 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 169 683 227 689
-rect 148 649 181 683
-rect 215 649 227 683
-rect 169 643 227 649
-rect 101 609 159 615
-rect 79 575 113 609
-rect 147 575 159 609
-rect 101 569 159 575
-rect 23 535 81 541
-rect 23 501 35 535
-rect 69 501 155 535
-rect 23 495 81 501
-rect 121 319 155 501
-rect 109 313 167 319
-rect 109 279 121 313
-rect 155 279 167 313
-rect 109 273 167 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 137 393 137 393 1 Y
-port 1 n
-rlabel metal1 198 666 198 666 1 A
-port 2 n
-rlabel metal1 130 592 130 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__oai21_l.mag b/18T_hs/sky130_osu_sc_18T_hs__oai21_l.mag
deleted file mode 100644
index bd48446..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__oai21_l.mag
+++ /dev/null
@@ -1,194 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864619
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 152 617 182 1217
-rect 250 817 280 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 199 166 315
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 266 335 315
-rect 282 131 293 266
-rect 327 131 335 266
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 617 152 1217
-rect 182 1201 250 1217
-rect 182 861 193 1201
-rect 227 861 250 1201
-rect 182 817 250 861
-rect 280 1201 333 1217
-rect 280 861 291 1201
-rect 325 861 333 1201
-rect 280 817 333 861
-rect 182 617 235 817
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 199
-rect 207 131 241 267
-rect 293 131 327 266
-<< pdiffc >>
-rect 35 793 69 1201
-rect 193 861 227 1201
-rect 291 861 325 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 152 1217 182 1243
-rect 250 1217 280 1243
-rect 80 585 110 617
-rect 56 569 110 585
-rect 56 535 66 569
-rect 100 535 110 569
-rect 56 519 110 535
-rect 56 370 86 519
-rect 152 471 182 617
-rect 136 461 202 471
-rect 136 427 152 461
-rect 186 427 202 461
-rect 136 417 202 427
-rect 56 340 110 370
-rect 80 315 110 340
-rect 166 315 196 417
-rect 250 409 280 817
-rect 250 393 306 409
-rect 252 359 262 393
-rect 296 359 306 393
-rect 252 343 306 359
-rect 252 315 282 343
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 66 535 100 569
-rect 152 427 186 461
-rect 262 359 296 393
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 193 1201 227 1271
-rect 193 845 227 861
-rect 291 1201 325 1217
-rect 35 751 69 793
-rect 291 751 325 861
-rect 35 717 325 751
-rect 66 569 100 649
-rect 66 519 100 535
-rect 152 575 162 609
-rect 152 461 186 575
-rect 152 411 186 427
-rect 223 393 257 501
-rect 291 461 325 717
-rect 223 359 262 393
-rect 296 359 312 393
-rect 35 267 241 301
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 207 115 241 131
-rect 293 266 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 66 649 100 683
-rect 162 575 196 609
-rect 223 501 257 535
-rect 291 427 325 461
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 54 683 112 689
-rect 54 649 66 683
-rect 100 649 134 683
-rect 54 643 112 649
-rect 150 609 208 615
-rect 150 575 162 609
-rect 196 575 230 609
-rect 150 569 208 575
-rect 211 535 269 541
-rect 189 501 223 535
-rect 257 501 269 535
-rect 211 495 269 501
-rect 279 461 337 467
-rect 279 427 291 461
-rect 325 427 337 461
-rect 279 421 337 427
-rect 293 319 327 421
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 83 666 83 666 1 A0
-port 1 n
-rlabel metal1 179 592 179 592 1 A1
-port 2 n
-rlabel metal1 308 444 308 444 1 Y
-port 3 n
-rlabel metal1 240 518 240 518 1 B0
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__oai22_l.mag b/18T_hs/sky130_osu_sc_18T_hs__oai22_l.mag
deleted file mode 100644
index b457add..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__oai22_l.mag
+++ /dev/null
@@ -1,239 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864620
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 462 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 152 617 182 1217
-rect 252 617 282 1217
-rect 324 617 354 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 199 166 315
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 199 293 267
-rect 327 199 338 267
-rect 282 115 338 199
-rect 368 199 421 315
-rect 368 131 379 199
-rect 413 131 421 199
-rect 368 115 421 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 617 152 1217
-rect 182 1201 252 1217
-rect 182 725 200 1201
-rect 234 725 252 1201
-rect 182 617 252 725
-rect 282 617 324 1217
-rect 354 1201 407 1217
-rect 354 793 365 1201
-rect 399 793 407 1201
-rect 354 617 407 793
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 199
-rect 207 131 241 267
-rect 293 199 327 267
-rect 379 131 413 199
-<< pdiffc >>
-rect 35 793 69 1201
-rect 200 725 234 1201
-rect 365 793 399 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 152 1217 182 1243
-rect 252 1217 282 1243
-rect 324 1217 354 1243
-rect 80 585 110 617
-rect 56 569 110 585
-rect 56 535 66 569
-rect 100 535 110 569
-rect 56 519 110 535
-rect 56 370 86 519
-rect 152 471 182 617
-rect 130 461 196 471
-rect 130 427 146 461
-rect 180 427 196 461
-rect 130 417 196 427
-rect 56 340 110 370
-rect 80 315 110 340
-rect 166 315 196 417
-rect 252 409 282 617
-rect 324 592 354 617
-rect 324 562 368 592
-rect 338 478 368 562
-rect 338 462 430 478
-rect 338 428 384 462
-rect 418 428 430 462
-rect 338 412 430 428
-rect 238 393 292 409
-rect 238 359 248 393
-rect 282 359 292 393
-rect 238 343 292 359
-rect 252 315 282 343
-rect 338 315 368 412
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 66 535 100 569
-rect 146 427 180 461
-rect 384 428 418 462
-rect 248 359 282 393
-<< locali >>
-rect 0 1311 462 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 462 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 200 1201 234 1217
-rect 365 1201 399 1271
-rect 365 777 399 793
-rect 200 700 234 725
-rect 200 666 350 700
-rect 66 569 100 649
-rect 66 519 100 535
-rect 146 575 162 609
-rect 146 461 180 575
-rect 146 411 180 427
-rect 223 409 257 501
-rect 223 393 282 409
-rect 223 359 248 393
-rect 223 343 282 359
-rect 316 387 350 666
-rect 384 462 418 478
-rect 384 412 418 428
-rect 35 267 241 301
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 293 279 316 283
-rect 293 267 350 279
-rect 327 249 350 267
-rect 293 183 327 199
-rect 379 199 413 215
-rect 241 131 379 149
-rect 207 115 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 66 649 100 683
-rect 162 575 196 609
-rect 223 501 257 535
-rect 384 428 418 462
-rect 316 353 350 387
-rect 316 279 350 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 462 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 462 1311
-rect 0 1271 462 1277
-rect 54 683 112 689
-rect 54 649 66 683
-rect 100 649 134 683
-rect 54 643 112 649
-rect 150 609 208 615
-rect 150 575 162 609
-rect 196 575 230 609
-rect 150 569 208 575
-rect 211 535 269 541
-rect 189 501 223 535
-rect 257 501 269 535
-rect 211 495 269 501
-rect 372 462 430 468
-rect 350 428 384 462
-rect 418 428 430 462
-rect 372 422 430 428
-rect 304 387 362 393
-rect 304 353 316 387
-rect 350 353 362 387
-rect 304 347 362 353
-rect 316 319 350 347
-rect 304 313 362 319
-rect 304 279 316 313
-rect 350 279 362 313
-rect 304 273 362 279
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 240 518 240 518 1 B0
-port 4 n
-rlabel viali 179 592 179 592 1 A1
-port 2 n
-rlabel viali 83 666 83 666 1 A0
-port 1 n
-rlabel viali 333 370 333 370 1 Y
-port 3 n
-rlabel viali 401 445 401 445 1 B1
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__or2_1.mag b/18T_hs/sky130_osu_sc_18T_hs__or2_1.mag
deleted file mode 100644
index 72e7419..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__or2_1.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864620
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 335 315
-rect 282 131 293 267
-rect 327 131 335 267
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 617 166 1217
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1201 335 1217
-rect 282 657 293 1201
-rect 327 657 335 1201
-rect 282 617 335 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-<< pdiffc >>
-rect 35 725 69 1201
-rect 207 793 241 1201
-rect 293 657 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 568 110 617
-rect 27 552 110 568
-rect 27 518 37 552
-rect 71 518 110 552
-rect 27 502 110 518
-rect 166 510 196 617
-rect 252 592 282 617
-rect 252 562 289 592
-rect 80 315 110 502
-rect 163 494 217 510
-rect 163 460 173 494
-rect 207 460 217 494
-rect 163 444 217 460
-rect 166 315 196 444
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 370 313 404
-rect 252 354 313 370
-rect 252 315 282 354
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 518 71 552
-rect 173 460 207 494
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 207 1201 241 1271
-rect 207 777 241 793
-rect 293 1201 327 1217
-rect 69 725 139 743
-rect 35 709 139 725
-rect 37 552 71 575
-rect 37 502 71 518
-rect 105 404 139 709
-rect 173 494 207 649
-rect 293 535 327 657
-rect 173 444 207 460
-rect 105 370 269 404
-rect 303 370 319 404
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 370
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 37 575 71 609
-rect 173 649 207 683
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 161 683 219 689
-rect 140 649 173 683
-rect 207 649 219 683
-rect 161 643 219 649
-rect 25 609 83 615
-rect 25 575 37 609
-rect 71 575 105 609
-rect 25 569 83 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 190 666 190 666 1 A
-port 2 n
-rlabel metal1 54 592 54 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__or2_2.mag b/18T_hs/sky130_osu_sc_18T_hs__or2_2.mag
deleted file mode 100644
index 7b11f3d..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__or2_2.mag
+++ /dev/null
@@ -1,221 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864620
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 462 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 421 315
-rect 368 131 379 267
-rect 413 131 421 267
-rect 368 115 421 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 617 166 1217
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 421 1217
-rect 368 657 379 1201
-rect 413 657 421 1201
-rect 368 617 421 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-<< pdiffc >>
-rect 35 725 69 1201
-rect 207 793 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 80 568 110 617
-rect 27 552 110 568
-rect 27 518 37 552
-rect 71 518 110 552
-rect 27 502 110 518
-rect 166 510 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 252 562 368 592
-rect 80 315 110 502
-rect 163 494 217 510
-rect 163 460 173 494
-rect 207 460 217 494
-rect 163 444 217 460
-rect 166 315 196 444
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 303 370 368 384
-rect 252 354 368 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 37 518 71 552
-rect 173 460 207 494
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 462 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 462 1311
-rect 35 1201 69 1217
-rect 207 1201 241 1271
-rect 207 777 241 793
-rect 293 1201 327 1217
-rect 69 725 139 743
-rect 35 709 139 725
-rect 37 552 71 575
-rect 37 502 71 518
-rect 105 404 139 709
-rect 173 494 207 649
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 173 444 207 460
-rect 105 370 269 404
-rect 303 370 319 404
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 370
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 37 575 71 609
-rect 173 649 207 683
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 462 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 462 1311
-rect 0 1271 462 1277
-rect 161 683 219 689
-rect 140 649 173 683
-rect 207 649 219 683
-rect 161 643 219 649
-rect 25 609 83 615
-rect 25 575 37 609
-rect 71 575 105 609
-rect 25 569 83 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 190 666 190 666 1 A
-port 2 n
-rlabel metal1 54 592 54 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__or2_4.mag b/18T_hs/sky130_osu_sc_18T_hs__or2_4.mag
deleted file mode 100644
index 539cea1..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__or2_4.mag
+++ /dev/null
@@ -1,284 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864620
-<< checkpaint >>
-rect -1209 -1243 1753 2575
-<< nwell >>
-rect -9 581 638 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 593 315
-rect 540 131 551 267
-rect 585 131 593 267
-rect 540 115 593 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 617 166 1217
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 593 1217
-rect 540 657 551 1201
-rect 585 657 593 1201
-rect 540 617 593 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-<< pdiffc >>
-rect 35 725 69 1201
-rect 207 793 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 80 568 110 617
-rect 27 552 110 568
-rect 27 518 37 552
-rect 71 518 110 552
-rect 27 502 110 518
-rect 166 510 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 252 562 540 592
-rect 80 315 110 502
-rect 163 494 217 510
-rect 163 460 173 494
-rect 207 460 217 494
-rect 163 444 217 460
-rect 166 315 196 444
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 303 370 540 384
-rect 252 354 540 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-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 518 71 552
-rect 173 460 207 494
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 638 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 638 1311
-rect 35 1201 69 1217
-rect 207 1201 241 1271
-rect 207 777 241 793
-rect 293 1201 327 1217
-rect 69 725 139 743
-rect 35 709 139 725
-rect 37 552 71 575
-rect 37 502 71 518
-rect 105 404 139 709
-rect 173 494 207 649
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 535 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 173 444 207 460
-rect 105 370 269 404
-rect 303 370 319 404
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 370
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 37 575 71 609
-rect 173 649 207 683
-rect 293 501 327 535
-rect 465 501 499 535
-rect 293 279 327 313
-rect 465 279 499 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 638 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 638 1311
-rect 0 1271 638 1277
-rect 161 683 219 689
-rect 140 649 173 683
-rect 207 649 219 683
-rect 161 643 219 649
-rect 25 609 83 615
-rect 25 575 37 609
-rect 71 575 105 609
-rect 25 569 83 575
-rect 281 535 339 541
-rect 453 535 511 541
-rect 281 501 293 535
-rect 327 501 465 535
-rect 499 501 511 535
-rect 281 495 339 501
-rect 453 495 511 501
-rect 293 319 327 495
-rect 465 319 499 495
-rect 281 313 339 319
-rect 453 313 511 319
-rect 281 279 293 313
-rect 327 279 465 313
-rect 499 279 511 313
-rect 281 273 339 279
-rect 453 273 511 279
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 190 666 190 666 1 A
-port 2 n
-rlabel metal1 54 592 54 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__or2_8.mag b/18T_hs/sky130_osu_sc_18T_hs__or2_8.mag
deleted file mode 100644
index 66efa1f..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__or2_8.mag
+++ /dev/null
@@ -1,426 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864620
-<< checkpaint >>
-rect -1209 -1243 2161 2575
-<< nwell >>
-rect -9 581 990 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-rect 768 617 798 1217
-rect 854 617 884 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-rect 768 115 798 315
-rect 854 115 884 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 768 315
-rect 712 131 723 267
-rect 757 131 768 267
-rect 712 115 768 131
-rect 798 267 854 315
-rect 798 131 809 267
-rect 843 131 854 267
-rect 798 115 854 131
-rect 884 267 937 315
-rect 884 131 895 267
-rect 929 131 937 267
-rect 884 115 937 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 617 166 1217
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 768 1217
-rect 712 657 723 1201
-rect 757 657 768 1201
-rect 712 617 768 657
-rect 798 1201 854 1217
-rect 798 657 809 1201
-rect 843 657 854 1201
-rect 798 617 854 657
-rect 884 1201 937 1217
-rect 884 657 895 1201
-rect 929 657 937 1201
-rect 884 617 937 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-rect 809 131 843 267
-rect 895 131 929 267
-<< pdiffc >>
-rect 35 725 69 1201
-rect 207 793 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-rect 809 657 843 1201
-rect 895 657 929 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 768 1217 798 1243
-rect 854 1217 884 1243
-rect 80 568 110 617
-rect 27 552 110 568
-rect 27 518 37 552
-rect 71 518 110 552
-rect 27 502 110 518
-rect 166 510 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 596 592 626 617
-rect 682 592 712 617
-rect 768 592 798 617
-rect 854 592 884 617
-rect 252 562 884 592
-rect 80 315 110 502
-rect 163 494 217 510
-rect 163 460 173 494
-rect 207 460 217 494
-rect 163 444 217 460
-rect 166 315 196 444
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 596 384 626 562
-rect 303 370 884 384
-rect 252 354 884 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-rect 596 315 626 354
-rect 682 315 712 354
-rect 768 315 798 354
-rect 854 315 884 354
-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 518 71 552
-rect 173 460 207 494
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 990 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 990 1311
-rect 35 1201 69 1217
-rect 207 1201 241 1271
-rect 207 777 241 793
-rect 293 1201 327 1217
-rect 69 725 139 743
-rect 35 709 139 725
-rect 37 552 71 575
-rect 37 502 71 518
-rect 105 404 139 709
-rect 173 494 207 649
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 535 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 637 1201 671 1217
-rect 637 535 671 657
-rect 723 1201 757 1271
-rect 723 641 757 657
-rect 809 1201 843 1217
-rect 809 535 843 657
-rect 895 1201 929 1271
-rect 895 641 929 657
-rect 173 444 207 460
-rect 105 370 269 404
-rect 303 370 319 404
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 370
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 637 267 671 279
-rect 637 115 671 131
-rect 723 267 757 283
-rect 723 61 757 131
-rect 809 267 843 279
-rect 809 115 843 131
-rect 895 267 929 283
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 37 575 71 609
-rect 173 649 207 683
-rect 293 501 327 535
-rect 465 501 499 535
-rect 637 501 671 535
-rect 809 501 843 535
-rect 293 279 327 313
-rect 465 279 499 313
-rect 637 279 671 313
-rect 809 279 843 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1311 990 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 990 1311
-rect 0 1271 990 1277
-rect 161 683 219 689
-rect 140 649 173 683
-rect 207 649 219 683
-rect 161 643 219 649
-rect 25 609 83 615
-rect 25 575 37 609
-rect 71 575 105 609
-rect 25 569 83 575
-rect 281 535 339 541
-rect 453 535 511 541
-rect 625 535 683 541
-rect 797 535 855 541
-rect 281 501 293 535
-rect 327 501 465 535
-rect 499 501 637 535
-rect 671 501 809 535
-rect 843 501 855 535
-rect 281 495 339 501
-rect 453 495 511 501
-rect 625 495 683 501
-rect 797 495 855 501
-rect 293 319 327 495
-rect 465 319 499 495
-rect 637 319 671 495
-rect 809 319 843 495
-rect 281 313 339 319
-rect 453 313 511 319
-rect 625 313 683 319
-rect 797 313 855 319
-rect 281 279 293 313
-rect 327 279 465 313
-rect 499 279 637 313
-rect 671 279 683 313
-rect 712 279 809 313
-rect 843 279 855 313
-rect 281 273 339 279
-rect 453 273 511 279
-rect 625 273 683 279
-rect 797 273 855 279
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 190 666 190 666 1 A
-port 2 n
-rlabel metal1 54 592 54 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__or2_l.mag b/18T_hs/sky130_osu_sc_18T_hs__or2_l.mag
deleted file mode 100644
index 41c0178..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__or2_l.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864621
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< pmos >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 252 817 282 1217
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 166 263
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 199 252 263
-rect 196 131 207 199
-rect 241 131 252 199
-rect 196 115 252 131
-rect 282 199 335 263
-rect 282 131 293 199
-rect 327 131 335 199
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 817 80 929
-rect 110 817 166 1217
-rect 196 1201 252 1217
-rect 196 929 207 1201
-rect 241 929 252 1201
-rect 196 817 252 929
-rect 282 1201 335 1217
-rect 282 929 293 1201
-rect 327 929 335 1201
-rect 282 817 335 929
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-rect 207 131 241 199
-rect 293 131 327 199
-<< pdiffc >>
-rect 35 929 69 1201
-rect 207 929 241 1201
-rect 293 929 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 568 110 817
-rect 27 552 110 568
-rect 27 518 37 552
-rect 71 518 110 552
-rect 27 502 110 518
-rect 166 510 196 817
-rect 252 592 282 817
-rect 252 562 289 592
-rect 80 263 110 502
-rect 163 494 217 510
-rect 163 460 173 494
-rect 207 460 217 494
-rect 163 444 217 460
-rect 166 263 196 444
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 370 313 404
-rect 252 354 313 370
-rect 252 263 282 354
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 518 71 552
-rect 173 460 207 494
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 35 743 69 929
-rect 207 1201 241 1271
-rect 207 913 241 929
-rect 293 1201 327 1217
-rect 35 709 139 743
-rect 37 552 71 575
-rect 37 502 71 518
-rect 105 404 139 709
-rect 173 494 207 649
-rect 293 535 327 929
-rect 173 444 207 460
-rect 105 370 269 404
-rect 303 370 319 404
-rect 35 199 69 215
-rect 35 61 69 131
-rect 121 199 155 370
-rect 121 115 155 131
-rect 207 199 241 215
-rect 207 61 241 131
-rect 293 199 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 37 575 71 609
-rect 173 649 207 683
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 161 683 219 689
-rect 140 649 173 683
-rect 207 649 219 683
-rect 161 643 219 649
-rect 25 609 83 615
-rect 25 575 37 609
-rect 71 575 105 609
-rect 25 569 83 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 54 592 54 592 1 B
-port 2 n
-rlabel metal1 190 666 190 666 1 A
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__tbufi_1.mag b/18T_hs/sky130_osu_sc_18T_hs__tbufi_1.mag
deleted file mode 100644
index 50ea52e..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__tbufi_1.mag
+++ /dev/null
@@ -1,185 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864621
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 375 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 238 617 268 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 238 115 268 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 115 238 315
-rect 268 267 321 315
-rect 268 131 279 267
-rect 313 131 321 267
-rect 268 115 321 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 617 238 1217
-rect 268 1201 321 1217
-rect 268 657 279 1201
-rect 313 657 321 1201
-rect 268 617 321 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 279 131 313 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 725 155 1201
-rect 279 657 313 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 80 602 110 617
-rect 39 572 110 602
-rect 39 360 69 572
-rect 166 529 196 617
-rect 133 513 196 529
-rect 133 479 143 513
-rect 177 479 196 513
-rect 133 463 196 479
-rect 238 451 268 617
-rect 238 435 292 451
-rect 111 387 165 403
-rect 111 360 121 387
-rect 39 353 121 360
-rect 155 360 165 387
-rect 238 401 248 435
-rect 282 401 292 435
-rect 238 385 292 401
-rect 155 353 196 360
-rect 39 330 196 353
-rect 80 315 110 330
-rect 166 315 196 330
-rect 238 315 268 385
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 143 479 177 513
-rect 121 353 155 387
-rect 248 401 282 435
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 709 155 725
-rect 279 1201 313 1217
-rect 35 513 69 657
-rect 143 513 177 529
-rect 35 479 143 513
-rect 35 267 69 479
-rect 143 463 177 479
-rect 211 435 245 649
-rect 279 535 313 657
-rect 211 401 248 435
-rect 282 401 298 435
-rect 103 353 121 387
-rect 155 353 171 387
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 279 267 313 279
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 211 649 245 683
-rect 279 501 313 535
-rect 121 353 155 387
-rect 279 279 313 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 199 683 257 689
-rect 177 649 211 683
-rect 245 649 257 683
-rect 199 643 257 649
-rect 109 609 167 615
-rect 109 575 189 609
-rect 109 569 167 575
-rect 121 393 155 569
-rect 267 535 325 541
-rect 267 501 279 535
-rect 313 501 325 535
-rect 267 495 325 501
-rect 109 387 167 393
-rect 109 353 121 387
-rect 155 353 167 387
-rect 109 347 167 353
-rect 279 319 313 495
-rect 267 313 325 319
-rect 267 279 279 313
-rect 313 279 325 313
-rect 267 273 325 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 364 305 364 1 Y
-port 1 n
-rlabel metal1 228 666 228 666 1 A
-port 2 n
-rlabel metal1 138 592 138 592 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__tbufi_l.mag b/18T_hs/sky130_osu_sc_18T_hs__tbufi_l.mag
deleted file mode 100644
index aabfe8a..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__tbufi_l.mag
+++ /dev/null
@@ -1,185 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864621
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 375 1341
-<< pmos >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 238 817 268 1217
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 166 263
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 115 238 263
-rect 268 199 321 263
-rect 268 131 279 199
-rect 313 131 321 199
-rect 268 115 321 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 817 166 861
-rect 196 817 238 1217
-rect 268 1201 321 1217
-rect 268 861 279 1201
-rect 313 861 321 1201
-rect 268 817 321 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-rect 279 131 313 199
-<< pdiffc >>
-rect 35 861 69 1201
-rect 121 861 155 1201
-rect 279 861 313 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 80 602 110 817
-rect 39 572 110 602
-rect 39 360 69 572
-rect 166 529 196 817
-rect 133 513 196 529
-rect 133 479 143 513
-rect 177 479 196 513
-rect 133 463 196 479
-rect 238 451 268 817
-rect 238 435 292 451
-rect 111 387 165 403
-rect 111 360 121 387
-rect 39 353 121 360
-rect 155 360 165 387
-rect 238 401 248 435
-rect 282 401 292 435
-rect 238 385 292 401
-rect 155 353 196 360
-rect 39 330 196 353
-rect 80 263 110 330
-rect 166 263 196 330
-rect 238 263 268 385
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 143 479 177 513
-rect 121 353 155 387
-rect 248 401 282 435
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 35 513 69 861
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 279 1201 313 1217
-rect 143 513 177 529
-rect 35 479 143 513
-rect 35 199 69 479
-rect 143 463 177 479
-rect 211 435 245 649
-rect 279 535 313 861
-rect 211 401 248 435
-rect 282 401 298 435
-rect 103 353 121 387
-rect 155 353 171 387
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 279 199 313 279
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 211 649 245 683
-rect 279 501 313 535
-rect 121 353 155 387
-rect 279 279 313 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 199 683 257 689
-rect 177 649 211 683
-rect 245 649 257 683
-rect 199 643 257 649
-rect 109 609 167 615
-rect 109 575 189 609
-rect 109 569 167 575
-rect 121 393 155 569
-rect 267 535 325 541
-rect 267 501 279 535
-rect 313 501 325 535
-rect 267 495 325 501
-rect 109 387 167 393
-rect 109 353 121 387
-rect 155 353 167 387
-rect 109 347 167 353
-rect 279 319 313 495
-rect 267 313 325 319
-rect 267 279 279 313
-rect 313 279 325 313
-rect 267 273 325 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 364 305 364 1 Y
-port 1 n
-rlabel metal1 228 666 228 666 1 A
-port 2 n
-rlabel metal1 138 592 138 592 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__tiehi.mag b/18T_hs/sky130_osu_sc_18T_hs__tiehi.mag
deleted file mode 100644
index 6038968..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__tiehi.mag
+++ /dev/null
@@ -1,99 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864621
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< pmos >>
-rect 80 617 110 1217
-<< nmoslvt >>
-rect 80 115 110 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 657 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 433 110 617
-rect 80 417 134 433
-rect 80 383 90 417
-rect 124 383 134 417
-rect 80 367 134 383
-rect 80 315 110 367
-rect 80 89 110 115
-<< polycont >>
-rect 90 383 124 417
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 641 69 657
-rect 121 1201 155 1217
-rect 121 609 155 657
-rect 74 383 90 417
-rect 124 383 155 417
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 383
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 121 575 155 609
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 94 609 167 615
-rect 94 575 121 609
-rect 155 575 167 609
-rect 94 569 167 575
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 138 592 138 592 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__tielo.mag b/18T_hs/sky130_osu_sc_18T_hs__tielo.mag
deleted file mode 100644
index aeb905f..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__tielo.mag
+++ /dev/null
@@ -1,99 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864621
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< pmos >>
-rect 80 617 110 1217
-<< nmoslvt >>
-rect 80 115 110 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 657 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 565 110 617
-rect 80 549 134 565
-rect 80 515 90 549
-rect 124 515 134 549
-rect 80 499 134 515
-rect 80 315 110 499
-rect 80 89 110 115
-<< polycont >>
-rect 90 515 124 549
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 641 69 657
-rect 121 1201 155 1217
-rect 121 549 155 657
-rect 74 515 90 549
-rect 124 515 155 549
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 353
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 121 353 155 387
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 94 387 167 393
-rect 94 353 121 387
-rect 155 353 167 387
-rect 94 347 167 353
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 138 370 138 370 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__tnbufi_1.mag b/18T_hs/sky130_osu_sc_18T_hs__tnbufi_1.mag
deleted file mode 100644
index 8c5575a..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__tnbufi_1.mag
+++ /dev/null
@@ -1,180 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864621
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 375 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 238 617 268 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 238 115 268 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 115 238 315
-rect 268 267 321 315
-rect 268 131 279 267
-rect 313 131 321 267
-rect 268 115 321 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 617 238 1217
-rect 268 1201 321 1217
-rect 268 657 279 1201
-rect 313 657 321 1201
-rect 268 617 321 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 279 131 313 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 725 155 1201
-rect 279 657 313 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 80 602 110 617
-rect 166 602 196 617
-rect 39 572 196 602
-rect 39 360 69 572
-rect 111 570 165 572
-rect 111 536 121 570
-rect 155 536 165 570
-rect 111 520 165 536
-rect 111 452 196 468
-rect 111 418 121 452
-rect 155 418 196 452
-rect 111 402 196 418
-rect 39 330 110 360
-rect 80 315 110 330
-rect 166 315 196 402
-rect 238 451 268 617
-rect 238 435 292 451
-rect 238 401 248 435
-rect 282 401 292 435
-rect 238 385 292 401
-rect 238 315 268 385
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 121 536 155 570
-rect 121 418 155 452
-rect 248 401 282 435
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 709 155 725
-rect 279 1201 313 1217
-rect 35 452 69 657
-rect 121 570 155 575
-rect 121 520 155 536
-rect 121 452 155 468
-rect 35 418 121 452
-rect 35 267 69 418
-rect 121 402 155 418
-rect 211 435 245 649
-rect 279 535 313 657
-rect 211 401 248 435
-rect 282 401 298 435
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 279 267 313 279
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 211 649 245 683
-rect 121 575 155 609
-rect 279 501 313 535
-rect 279 279 313 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 199 683 257 689
-rect 177 649 211 683
-rect 245 649 257 683
-rect 199 643 257 649
-rect 109 609 167 615
-rect 109 575 121 609
-rect 155 575 189 609
-rect 109 569 167 575
-rect 267 535 325 541
-rect 267 501 279 535
-rect 313 501 325 535
-rect 267 495 325 501
-rect 279 319 313 495
-rect 267 313 325 319
-rect 267 279 279 313
-rect 313 279 325 313
-rect 267 273 325 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 364 305 364 1 Y
-port 1 n
-rlabel metal1 228 666 228 666 1 A
-port 2 n
-rlabel metal1 138 592 138 592 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__tnbufi_l.mag b/18T_hs/sky130_osu_sc_18T_hs__tnbufi_l.mag
deleted file mode 100644
index 08076a3..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__tnbufi_l.mag
+++ /dev/null
@@ -1,180 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864622
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 375 1341
-<< pmos >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 238 817 268 1217
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 166 263
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 115 238 263
-rect 268 199 321 263
-rect 268 131 279 199
-rect 313 131 321 199
-rect 268 115 321 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 817 166 861
-rect 196 817 238 1217
-rect 268 1201 321 1217
-rect 268 861 279 1201
-rect 313 861 321 1201
-rect 268 817 321 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-rect 279 131 313 199
-<< pdiffc >>
-rect 35 861 69 1201
-rect 121 861 155 1201
-rect 279 861 313 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 80 602 110 817
-rect 166 602 196 817
-rect 39 572 196 602
-rect 39 360 69 572
-rect 111 570 165 572
-rect 111 536 121 570
-rect 155 536 165 570
-rect 111 520 165 536
-rect 111 452 196 468
-rect 111 418 121 452
-rect 155 418 196 452
-rect 111 402 196 418
-rect 39 330 110 360
-rect 80 263 110 330
-rect 166 263 196 402
-rect 238 451 268 817
-rect 238 435 292 451
-rect 238 401 248 435
-rect 282 401 292 435
-rect 238 385 292 401
-rect 238 263 268 385
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 121 536 155 570
-rect 121 418 155 452
-rect 248 401 282 435
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 35 452 69 861
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 279 1201 313 1217
-rect 121 570 155 575
-rect 121 520 155 536
-rect 121 452 155 468
-rect 35 418 121 452
-rect 35 199 69 418
-rect 121 402 155 418
-rect 211 435 245 649
-rect 279 535 313 861
-rect 211 401 248 435
-rect 282 401 298 435
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 279 199 313 279
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 211 649 245 683
-rect 121 575 155 609
-rect 279 501 313 535
-rect 279 279 313 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 199 683 257 689
-rect 177 649 211 683
-rect 245 649 257 683
-rect 199 643 257 649
-rect 109 609 167 615
-rect 109 575 121 609
-rect 155 575 189 609
-rect 109 569 167 575
-rect 267 535 325 541
-rect 267 501 279 535
-rect 313 501 325 535
-rect 267 495 325 501
-rect 279 319 313 495
-rect 267 313 325 319
-rect 267 279 279 313
-rect 313 279 325 313
-rect 267 273 325 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 364 305 364 1 Y
-port 1 n
-rlabel metal1 228 666 228 666 1 A
-port 2 n
-rlabel metal1 138 592 138 592 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__xnor2_l.mag b/18T_hs/sky130_osu_sc_18T_hs__xnor2_l.mag
deleted file mode 100644
index 4862a64..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__xnor2_l.mag
+++ /dev/null
@@ -1,291 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864622
-<< checkpaint >>
-rect -1209 -1243 1753 2575
-<< nwell >>
-rect -9 581 638 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 238 617 268 1217
-rect 358 617 388 1217
-rect 430 617 460 1217
-rect 516 617 546 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 238 115 268 315
-rect 358 115 388 315
-rect 430 115 460 315
-rect 516 115 546 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 199 166 315
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 115 238 315
-rect 268 267 358 315
-rect 268 131 279 267
-rect 347 131 358 267
-rect 268 115 358 131
-rect 388 115 430 315
-rect 460 199 516 315
-rect 460 131 471 199
-rect 505 131 516 199
-rect 460 115 516 131
-rect 546 267 599 315
-rect 546 131 557 267
-rect 591 131 599 267
-rect 546 115 599 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 617 238 1217
-rect 268 1201 358 1217
-rect 268 657 279 1201
-rect 347 657 358 1201
-rect 268 617 358 657
-rect 388 617 430 1217
-rect 460 1201 516 1217
-rect 460 657 471 1201
-rect 505 657 516 1201
-rect 460 617 516 657
-rect 546 1201 599 1217
-rect 546 658 557 1201
-rect 591 658 599 1201
-rect 546 617 599 658
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 199
-rect 279 131 347 267
-rect 471 131 505 199
-rect 557 131 591 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 657 155 1201
-rect 279 657 347 1201
-rect 471 657 505 1201
-rect 557 658 591 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 358 1217 388 1243
-rect 430 1217 460 1243
-rect 516 1217 546 1243
-rect 80 602 110 617
-rect 70 572 110 602
-rect 70 360 100 572
-rect 166 511 196 617
-rect 142 495 196 511
-rect 142 461 152 495
-rect 186 461 196 495
-rect 142 445 196 461
-rect 238 586 268 617
-rect 238 570 292 586
-rect 238 536 248 570
-rect 282 536 292 570
-rect 238 520 292 536
-rect 142 387 196 403
-rect 142 360 152 387
-rect 70 353 152 360
-rect 186 353 196 387
-rect 70 330 196 353
-rect 80 315 110 330
-rect 166 315 196 330
-rect 238 315 268 520
-rect 358 511 388 617
-rect 430 602 460 617
-rect 516 602 546 617
-rect 430 572 546 602
-rect 358 495 472 511
-rect 358 481 428 495
-rect 418 461 428 481
-rect 462 461 472 495
-rect 418 445 472 461
-rect 516 403 546 572
-rect 326 387 380 403
-rect 326 353 336 387
-rect 370 360 380 387
-rect 479 387 546 403
-rect 479 360 489 387
-rect 370 353 388 360
-rect 326 337 388 353
-rect 358 315 388 337
-rect 430 353 489 360
-rect 523 353 546 387
-rect 430 330 546 353
-rect 430 315 460 330
-rect 516 315 546 330
-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 461 186 495
-rect 248 536 282 570
-rect 152 353 186 387
-rect 428 461 462 495
-rect 336 353 370 387
-rect 489 353 523 387
-<< locali >>
-rect 0 1311 638 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 638 1311
-rect 35 1201 69 1217
-rect 35 495 69 657
-rect 121 1201 155 1271
-rect 279 1201 347 1217
-rect 121 641 155 657
-rect 268 683 279 689
-rect 302 649 347 657
-rect 279 641 347 649
-rect 471 1201 505 1271
-rect 471 641 505 657
-rect 557 1201 591 1217
-rect 557 570 591 658
-rect 232 536 248 570
-rect 282 536 591 570
-rect 35 461 152 495
-rect 186 461 370 495
-rect 35 267 69 461
-rect 152 387 186 403
-rect 336 387 370 461
-rect 152 313 186 353
-rect 268 283 302 353
-rect 336 337 370 353
-rect 412 461 428 495
-rect 462 461 478 495
-rect 412 313 446 461
-rect 489 387 523 403
-rect 489 337 523 353
-rect 268 267 347 283
-rect 268 249 279 267
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 557 267 591 536
-rect 279 115 347 131
-rect 471 199 505 215
-rect 471 61 505 131
-rect 557 115 591 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 268 657 279 683
-rect 279 657 302 683
-rect 268 649 302 657
-rect 152 279 186 313
-rect 268 353 302 387
-rect 489 353 523 387
-rect 412 279 446 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 638 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 638 1311
-rect 0 1271 638 1277
-rect 256 683 314 689
-rect 256 649 268 683
-rect 302 649 314 683
-rect 256 643 314 649
-rect 268 393 302 643
-rect 256 387 314 393
-rect 477 387 535 393
-rect 256 353 268 387
-rect 302 353 314 387
-rect 455 353 489 387
-rect 523 353 535 387
-rect 256 347 314 353
-rect 477 347 535 353
-rect 140 313 198 319
-rect 400 313 458 319
-rect 140 279 152 313
-rect 186 279 412 313
-rect 446 279 458 313
-rect 140 273 198 279
-rect 400 273 458 279
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 170 296 170 296 1 A
-port 1 n
-rlabel metal1 506 370 506 370 1 B
-port 2 n
-rlabel metal1 284 427 284 427 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_hs/sky130_osu_sc_18T_hs__xor2_l.mag b/18T_hs/sky130_osu_sc_18T_hs__xor2_l.mag
deleted file mode 100644
index 6233dae..0000000
--- a/18T_hs/sky130_osu_sc_18T_hs__xor2_l.mag
+++ /dev/null
@@ -1,290 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864622
-<< checkpaint >>
-rect -1209 -1243 1753 2575
-<< nwell >>
-rect -9 581 638 1341
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 238 617 268 1217
-rect 358 617 388 1217
-rect 430 617 460 1217
-rect 516 617 546 1217
-<< nmoslvt >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 238 115 268 315
-rect 358 115 388 315
-rect 430 115 460 315
-rect 516 115 546 315
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 115 238 315
-rect 268 267 358 315
-rect 268 131 279 267
-rect 347 131 358 267
-rect 268 115 358 131
-rect 388 115 430 315
-rect 460 267 516 315
-rect 460 131 471 267
-rect 505 131 516 267
-rect 460 115 516 131
-rect 546 267 599 315
-rect 546 131 557 267
-rect 591 131 599 267
-rect 546 115 599 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 617 238 1217
-rect 268 1201 358 1217
-rect 268 657 279 1201
-rect 347 657 358 1201
-rect 268 617 358 657
-rect 388 617 430 1217
-rect 460 1201 516 1217
-rect 460 793 471 1201
-rect 505 793 516 1201
-rect 460 617 516 793
-rect 546 1201 599 1217
-rect 546 658 557 1201
-rect 591 658 599 1201
-rect 546 617 599 658
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 279 131 347 267
-rect 471 131 505 267
-rect 557 131 591 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 279 657 347 1201
-rect 471 793 505 1201
-rect 557 658 591 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 358 1217 388 1243
-rect 430 1217 460 1243
-rect 516 1217 546 1243
-rect 80 602 110 617
-rect 166 602 196 617
-rect 70 572 196 602
-rect 70 355 100 572
-rect 142 570 196 572
-rect 142 536 152 570
-rect 186 536 196 570
-rect 142 520 196 536
-rect 142 462 196 478
-rect 142 428 152 462
-rect 186 428 196 462
-rect 142 412 196 428
-rect 70 330 110 355
-rect 80 315 110 330
-rect 166 315 196 412
-rect 238 403 268 617
-rect 358 586 388 617
-rect 334 570 388 586
-rect 430 602 460 617
-rect 516 602 546 617
-rect 430 572 546 602
-rect 334 536 344 570
-rect 378 536 388 570
-rect 334 520 388 536
-rect 479 570 546 572
-rect 479 536 489 570
-rect 523 536 546 570
-rect 479 520 546 536
-rect 420 461 474 477
-rect 420 432 430 461
-rect 358 427 430 432
-rect 464 427 474 461
-rect 238 387 292 403
-rect 238 353 248 387
-rect 282 353 292 387
-rect 238 337 292 353
-rect 358 402 474 427
-rect 238 315 268 337
-rect 358 315 388 402
-rect 516 360 546 520
-rect 430 330 546 360
-rect 430 315 460 330
-rect 516 315 546 330
-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 536 186 570
-rect 152 428 186 462
-rect 344 536 378 570
-rect 489 536 523 570
-rect 430 427 464 461
-rect 248 353 282 387
-<< locali >>
-rect 0 1311 638 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 638 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 279 1201 347 1217
-rect 35 462 69 657
-rect 152 649 200 683
-rect 268 657 279 675
-rect 471 1201 505 1271
-rect 471 777 505 793
-rect 557 1201 591 1217
-rect 152 570 186 649
-rect 268 641 347 657
-rect 136 536 152 570
-rect 186 536 202 570
-rect 268 535 302 641
-rect 344 570 378 586
-rect 344 462 378 536
-rect 35 428 152 462
-rect 186 428 378 462
-rect 412 461 446 649
-rect 489 570 523 575
-rect 489 520 523 536
-rect 35 267 69 428
-rect 412 427 430 461
-rect 464 427 480 461
-rect 557 387 591 658
-rect 232 353 248 387
-rect 282 353 591 387
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 279 279 296 283
-rect 330 279 347 283
-rect 279 267 347 279
-rect 279 115 347 131
-rect 471 267 505 283
-rect 471 61 505 131
-rect 557 267 591 353
-rect 557 115 591 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 200 649 234 683
-rect 412 649 446 683
-rect 268 501 302 535
-rect 489 575 523 609
-rect 296 279 330 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 638 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 638 1311
-rect 0 1271 638 1277
-rect 188 683 246 689
-rect 400 683 458 689
-rect 188 649 200 683
-rect 234 649 412 683
-rect 446 649 458 683
-rect 188 643 246 649
-rect 400 643 458 649
-rect 477 609 535 615
-rect 455 575 489 609
-rect 523 575 535 609
-rect 477 569 535 575
-rect 256 535 314 541
-rect 256 501 268 535
-rect 302 501 314 535
-rect 256 495 314 501
-rect 268 319 302 495
-rect 268 313 342 319
-rect 268 279 296 313
-rect 330 279 342 313
-rect 284 273 342 279
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 218 666 218 666 1 A
-port 1 n
-rlabel metal1 285 486 285 486 1 Y
-port 2 n
-rlabel metal1 506 592 506 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/.magicrc b/18T_ls/.magicrc
deleted file mode 100755
index 79cac60..0000000
--- a/18T_ls/.magicrc
+++ /dev/null
@@ -1,105 +0,0 @@
-puts stdout "Sourcing design .magicrc for technology EFS8A ..."
-
-# Put grid on 0.005 pitch. This is important, as some commands don't
-# rescale the grid automatically (such as lef read?).
-
-set scalefac [tech lambda]
-if {[lindex $scalefac 1] < 2} {
- scalegrid 1 2
-}
-
-# drc off
-drc euclidean on
-
-#set PDKPATH "~/projects/efabless/tech/SkyWater/EFS8A"
-
-# loading technology
-#tech load $PDKPATH/libs.tech/magic/EFS8A.tech
-tech load ../../char/techfiles/sky130A.tech
-
-# load device generator
-#source $PDKPATH/libs.tech/magic/EFS8A.tcl
-
-# load bind keys (optional)
-# source $PDKPATH/libs.tech/magic/EFS8A-BindKeys
-
-# set units to lambda grid
-snap internal
-
-# add path to reference cells
-#set MAGPATH "${PDKPATH}/libs.ref/mag"
-#addpath ${MAGPATH}/primdev
-#addpath ${MAGPATH}/s8fmlt
-#addpath ${MAGPATH}/s8iom0
-#addpath ${MAGPATH}/scs8hd
-#addpath ${MAGPATH}/scs8hdll
-#addpath ${MAGPATH}/scs8hvl
-#addpath ${MAGPATH}/scs8hs
-#addpath ${MAGPATH}/scs8ms
-#addpath ${MAGPATH}/scs8ls
-#addpath ${MAGPATH}/scs8lp
-
-# add path to GDS cells
-
-# add path to IP from catalog. This procedure defined in the PDK script.
-catch {magic::query_mylib_ip}
-# add path to local IP from user design space. Defined in the PDK script.
-catch {magic::query_my_projects}
-
-macro Shift_G "grid 74"
-macro XK_Left "scroll l .1 w"
-macro Shift_XK_Left "scroll l 1 w"
-macro Control_XK_Left "box grow w 1"
-macro Control_Shift_XK_Left "box shrink e 1"
-macro XK_Right "scroll r .1 w"
-macro Shift_XK_Right "scroll r 1 w"
-macro Control_XK_Right "box grow e 1"
-macro Control_Shift_XK_Right "box shrink w 1"
-macro XK_Up "scroll u .1 w"
-macro Shift_XK_Up "scroll u 1 w"
-macro Control_XK_Up "box grow n 1"
-macro Control_Shift_XK_Up "box shrink s 1"
-macro XK_Down "scroll d .1 w"
-macro Shift_XK_Down "scroll d 1 w"
-macro Control_XK_Down "box grow s 1"
-macro Control_Shift_XK_Down "box shrink n 1"
-
-macro XK_Pointer_Button4 "scroll u .05 w"
-macro XK_Pointer_Button5 "scroll d .05 w"
-macro . "history redo -1"
-
-macro XK_L "select less area {ndif pdif nwell poly}"
-macro XK_K "select less area nwell"
-macro XK_J "select less area {m1 lic}"
-macro XK_H "select less area li1"
-macro Control_Shift_XK_X "rotate"
-macro Shift_XK_Pointer_Button4 "stretch N 74"
-macro Shift_XK_Pointer_Button5 "stretch S 74"
-macro Control_XK_Pointer_Button4 "stretch N 34"
-macro Control_XK_Pointer_Button5 "stretch S 34"
-macro Control_Shift_XK_Q "stretch W 88"
-macro Control_Shift_XK_R "stretch E 88"
-macro Control_Shift_XK_W "stretch N 28"
-macro Control_Shift_XK_E "stretch N 4"
-macro XK_Y "stretch N 6"
-#macro Control_Shift_XK_W "stretch S 6"
-#macro Control_Shift_XK_E "stretch S 8"
-
-macro Control_Shift_XK_Pointer_Button4 "stretch N 17"
-macro Control_Shift_XK_Pointer_Button5 "stretch S 17"
-macro Control_Shift_XK_G "select area {m1 lic}"
-macro Control_Shift_XK_F "select area {poly polycont}"
-macro Control_Shift_XK_D "select area {ndc li1}"
-macro Control_Shift_XK_S "select area ntrans"
-
-macro Shift_D "select clear; move S 10; paint m1c"
-macro Shift_F "select clear; move N 10; paint m1c"
-
-
-macro Shift_B "box height 1.0um; move S 1.655um; select area; erase; select clear; move N 1um; select area; move S 1um; select clear; box height 0.26um; move S 4.35um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.26um; select clear; box height 20um; select area; move S 0.26um"
-
-
-macro Shift_N "box height 1.74um; move S 2.395um; select area; erase; select clear; move N 1.74um; select area; move S 1.74um; select clear; box height 0.48um; move S 3.61um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.48um; select clear; box height 20um; select area; move S 0.48um"
-
-
-macro Shift_M "box height 1.02um; move S 2.015um; select area; erase; select clear; move N 1.02um; box height 1.20um; select area; move S 1.02um; select clear; box height 0.12um; move S 0.56um; select area; erase; select clear; box height 5.00um; select area; move S 0.12um; select clear; move N 0.12um; box height 0.21um; move S 2.98um; select area;erase; select clear; box height 1.105um; move S 1.105um; select area; move N 0.21um; select clear; box height 0.17um; move N 0.825um; select area; erase; move S 0.825um; box height 0.825um; select area; move N 0.17um"
diff --git a/18T_ls/sky130_osu_sc_18T_ls__addf_1.mag b/18T_ls/sky130_osu_sc_18T_ls__addf_1.mag
deleted file mode 100644
index db3d720..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__addf_1.mag
+++ /dev/null
@@ -1,650 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864588
-<< checkpaint >>
-rect -1209 -1243 2569 2575
-<< nwell >>
-rect -9 581 1435 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 410 115 440 315
-rect 496 115 526 315
-rect 582 115 612 315
-rect 668 115 698 315
-rect 754 115 784 315
-rect 840 115 870 315
-rect 922 115 952 315
-rect 1004 115 1034 315
-rect 1102 115 1132 315
-rect 1292 115 1322 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 410 617 440 1217
-rect 496 617 526 1217
-rect 582 617 612 1217
-rect 668 617 698 1217
-rect 754 617 784 1217
-rect 840 617 870 1217
-rect 922 617 952 1217
-rect 1004 617 1034 1217
-rect 1102 617 1132 1217
-rect 1292 617 1322 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 199 166 315
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 115 410 315
-rect 440 267 496 315
-rect 440 131 451 267
-rect 485 131 496 267
-rect 440 115 496 131
-rect 526 267 582 315
-rect 526 131 537 267
-rect 571 131 582 267
-rect 526 115 582 131
-rect 612 199 668 315
-rect 612 131 623 199
-rect 657 131 668 199
-rect 612 115 668 131
-rect 698 267 754 315
-rect 698 131 709 267
-rect 743 131 754 267
-rect 698 115 754 131
-rect 784 199 840 315
-rect 784 131 795 199
-rect 829 131 840 199
-rect 784 115 840 131
-rect 870 115 922 315
-rect 952 115 1004 315
-rect 1034 267 1102 315
-rect 1034 131 1045 267
-rect 1079 131 1102 267
-rect 1034 115 1102 131
-rect 1132 199 1185 315
-rect 1132 131 1143 199
-rect 1177 131 1185 199
-rect 1132 115 1185 131
-rect 1239 199 1292 315
-rect 1239 131 1247 199
-rect 1281 131 1292 199
-rect 1239 115 1292 131
-rect 1322 267 1375 315
-rect 1322 131 1333 267
-rect 1367 131 1375 267
-rect 1322 115 1375 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 725 293 1201
-rect 327 725 338 1201
-rect 282 617 338 725
-rect 368 617 410 1217
-rect 440 1201 496 1217
-rect 440 725 451 1201
-rect 485 725 496 1201
-rect 440 617 496 725
-rect 526 1201 582 1217
-rect 526 725 537 1201
-rect 571 725 582 1201
-rect 526 617 582 725
-rect 612 1201 668 1217
-rect 612 793 623 1201
-rect 657 793 668 1201
-rect 612 617 668 793
-rect 698 1201 754 1217
-rect 698 725 709 1201
-rect 743 725 754 1201
-rect 698 617 754 725
-rect 784 1201 840 1217
-rect 784 725 795 1201
-rect 829 725 840 1201
-rect 784 617 840 725
-rect 870 617 922 1217
-rect 952 617 1004 1217
-rect 1034 1201 1102 1217
-rect 1034 793 1045 1201
-rect 1079 793 1102 1201
-rect 1034 617 1102 793
-rect 1132 1201 1185 1217
-rect 1132 725 1143 1201
-rect 1177 725 1185 1201
-rect 1132 617 1185 725
-rect 1239 1201 1292 1217
-rect 1239 657 1247 1201
-rect 1281 657 1292 1201
-rect 1239 617 1292 657
-rect 1322 1201 1375 1217
-rect 1322 657 1333 1201
-rect 1367 657 1375 1201
-rect 1322 617 1375 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 199
-rect 207 131 241 267
-rect 293 131 327 267
-rect 451 131 485 267
-rect 537 131 571 267
-rect 623 131 657 199
-rect 709 131 743 267
-rect 795 131 829 199
-rect 1045 131 1079 267
-rect 1143 131 1177 199
-rect 1247 131 1281 199
-rect 1333 131 1367 267
-<< pdiffc >>
-rect 35 725 69 1201
-rect 121 793 155 1201
-rect 207 725 241 1201
-rect 293 725 327 1201
-rect 451 725 485 1201
-rect 537 725 571 1201
-rect 623 793 657 1201
-rect 709 725 743 1201
-rect 795 725 829 1201
-rect 1045 793 1079 1201
-rect 1143 725 1177 1201
-rect 1247 657 1281 1201
-rect 1333 657 1367 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-rect 979 1271 1003 1305
-rect 1037 1271 1061 1305
-rect 1115 1271 1139 1305
-rect 1173 1271 1197 1305
-rect 1251 1271 1275 1305
-rect 1309 1271 1333 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-rect 1003 1271 1037 1305
-rect 1139 1271 1173 1305
-rect 1275 1271 1309 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1245
-rect 338 1217 368 1245
-rect 410 1217 440 1243
-rect 496 1217 526 1243
-rect 582 1217 612 1245
-rect 668 1217 698 1245
-rect 754 1217 784 1245
-rect 840 1217 870 1245
-rect 922 1217 952 1245
-rect 1004 1217 1034 1245
-rect 1102 1217 1132 1245
-rect 1292 1217 1322 1245
-rect 80 403 110 617
-rect 166 585 196 617
-rect 152 569 206 585
-rect 152 535 162 569
-rect 196 535 206 569
-rect 152 519 206 535
-rect 70 387 124 403
-rect 70 353 80 387
-rect 114 353 124 387
-rect 70 337 124 353
-rect 80 315 110 337
-rect 166 315 196 519
-rect 252 477 282 617
-rect 338 519 368 617
-rect 410 592 440 617
-rect 496 592 526 617
-rect 410 562 526 592
-rect 338 503 430 519
-rect 238 461 292 477
-rect 238 427 248 461
-rect 282 427 292 461
-rect 238 411 292 427
-rect 338 469 386 503
-rect 420 469 430 503
-rect 338 453 430 469
-rect 252 315 282 411
-rect 338 315 368 453
-rect 472 403 502 562
-rect 582 403 612 617
-rect 668 551 698 617
-rect 656 535 710 551
-rect 656 501 666 535
-rect 700 501 710 535
-rect 656 485 710 501
-rect 472 387 526 403
-rect 472 367 482 387
-rect 410 353 482 367
-rect 516 353 526 387
-rect 410 337 526 353
-rect 568 387 622 403
-rect 568 353 578 387
-rect 612 353 622 387
-rect 568 337 622 353
-rect 410 315 440 337
-rect 496 315 526 337
-rect 582 315 612 337
-rect 668 315 698 485
-rect 754 403 784 617
-rect 840 551 870 617
-rect 826 535 880 551
-rect 826 501 836 535
-rect 870 501 880 535
-rect 826 485 880 501
-rect 922 513 952 617
-rect 1004 585 1034 617
-rect 1004 555 1048 585
-rect 1102 584 1132 617
-rect 922 497 976 513
-rect 742 387 796 403
-rect 742 353 752 387
-rect 786 353 796 387
-rect 742 337 796 353
-rect 754 315 784 337
-rect 840 315 870 485
-rect 922 463 932 497
-rect 966 463 976 497
-rect 922 447 976 463
-rect 922 315 952 447
-rect 1018 403 1048 555
-rect 1090 568 1144 584
-rect 1292 581 1322 617
-rect 1090 534 1100 568
-rect 1134 534 1144 568
-rect 1090 518 1144 534
-rect 1255 565 1322 581
-rect 1255 531 1265 565
-rect 1299 531 1322 565
-rect 1004 387 1058 403
-rect 1004 353 1014 387
-rect 1048 353 1058 387
-rect 1004 337 1058 353
-rect 1004 315 1034 337
-rect 1102 315 1132 518
-rect 1255 515 1322 531
-rect 1292 315 1322 515
-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 535 196 569
-rect 80 353 114 387
-rect 248 427 282 461
-rect 386 469 420 503
-rect 666 501 700 535
-rect 482 353 516 387
-rect 578 353 612 387
-rect 836 501 870 535
-rect 752 353 786 387
-rect 932 463 966 497
-rect 1100 534 1134 568
-rect 1265 531 1299 565
-rect 1014 353 1048 387
-<< locali >>
-rect 0 1311 1408 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 1003 1311
-rect 1037 1271 1139 1311
-rect 1173 1271 1275 1311
-rect 1309 1271 1408 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 709 69 725
-rect 207 709 241 725
-rect 35 675 241 709
-rect 293 1201 327 1217
-rect 293 642 327 725
-rect 451 1201 485 1271
-rect 451 709 485 725
-rect 537 1201 571 1217
-rect 623 1201 657 1271
-rect 623 777 657 793
-rect 709 1201 743 1217
-rect 537 708 571 725
-rect 709 708 743 725
-rect 537 674 743 708
-rect 795 1201 829 1217
-rect 1045 1201 1079 1271
-rect 1045 777 1079 793
-rect 1143 1201 1177 1217
-rect 795 684 829 725
-rect 1143 684 1177 725
-rect 795 650 1100 684
-rect 293 605 350 642
-rect 795 641 829 650
-rect 80 535 162 569
-rect 196 535 212 569
-rect 248 461 282 477
-rect 248 411 282 427
-rect 64 353 80 387
-rect 114 353 130 387
-rect 316 370 350 605
-rect 752 606 829 641
-rect 578 535 612 541
-rect 386 503 444 535
-rect 420 501 444 503
-rect 650 501 666 535
-rect 700 501 716 535
-rect 386 453 420 469
-rect 578 387 612 501
-rect 666 461 700 501
-rect 752 461 786 606
-rect 1066 584 1100 650
-rect 1247 1201 1281 1271
-rect 1177 650 1202 667
-rect 1143 633 1202 650
-rect 1247 641 1281 657
-rect 1333 1201 1367 1217
-rect 1066 568 1134 584
-rect 1066 537 1100 568
-rect 820 501 836 535
-rect 870 501 886 535
-rect 1089 534 1100 537
-rect 1100 518 1134 534
-rect 932 497 966 513
-rect 932 461 966 463
-rect 1168 461 1202 633
-rect 1333 609 1367 657
-rect 752 427 879 461
-rect 1143 427 1202 461
-rect 1265 565 1299 581
-rect 293 336 350 370
-rect 466 353 482 387
-rect 516 353 532 387
-rect 736 353 752 387
-rect 786 353 811 387
-rect 578 337 612 353
-rect 293 313 327 336
-rect 35 267 241 286
-rect 69 252 207 267
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 207 114 241 131
-rect 777 313 811 353
-rect 293 267 327 279
-rect 293 114 327 131
-rect 451 267 485 283
-rect 451 61 485 131
-rect 537 267 743 286
-rect 571 252 709 267
-rect 537 114 571 131
-rect 623 199 657 215
-rect 623 61 657 131
-rect 845 215 879 427
-rect 998 353 1014 387
-rect 1048 353 1064 387
-rect 709 114 743 131
-rect 795 199 879 215
-rect 829 181 879 199
-rect 1045 267 1079 283
-rect 795 114 829 131
-rect 1045 61 1079 131
-rect 1143 199 1177 427
-rect 1265 313 1299 531
-rect 1245 279 1299 313
-rect 1333 267 1367 575
-rect 1143 115 1177 131
-rect 1247 199 1281 215
-rect 1247 61 1281 131
-rect 1333 115 1367 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 1003 1305 1037 1311
-rect 1003 1277 1037 1305
-rect 1139 1305 1173 1311
-rect 1139 1277 1173 1305
-rect 1275 1305 1309 1311
-rect 1275 1277 1309 1305
-rect 80 501 114 535
-rect 248 427 282 461
-rect 80 353 114 387
-rect 444 501 478 535
-rect 578 501 612 535
-rect 666 427 700 461
-rect 1143 650 1177 684
-rect 836 501 870 535
-rect 932 427 966 461
-rect 482 353 516 387
-rect 293 279 327 313
-rect 777 279 811 313
-rect 1014 353 1048 387
-rect 1211 279 1245 313
-rect 1333 575 1367 609
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1311 1408 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 1003 1311
-rect 1037 1277 1139 1311
-rect 1173 1277 1275 1311
-rect 1309 1277 1408 1311
-rect 0 1271 1408 1277
-rect 1131 684 1189 690
-rect 1109 650 1143 684
-rect 1177 650 1189 684
-rect 1131 644 1189 650
-rect 1321 609 1379 615
-rect 1299 575 1333 609
-rect 1367 575 1379 609
-rect 1321 569 1379 575
-rect 68 535 126 541
-rect 432 535 490 541
-rect 566 535 624 541
-rect 824 535 882 541
-rect 68 501 80 535
-rect 114 501 444 535
-rect 478 501 578 535
-rect 612 502 836 535
-rect 612 501 734 502
-rect 812 501 836 502
-rect 870 501 882 535
-rect 68 495 126 501
-rect 432 495 490 501
-rect 566 495 624 501
-rect 824 495 882 501
-rect 236 461 294 467
-rect 654 461 712 467
-rect 920 461 978 467
-rect 80 427 248 461
-rect 282 427 666 461
-rect 700 427 932 461
-rect 966 427 978 461
-rect 236 421 294 427
-rect 654 421 712 427
-rect 920 421 978 427
-rect 68 387 126 393
-rect 470 387 528 393
-rect 1002 387 1060 393
-rect 68 353 80 387
-rect 114 353 482 387
-rect 516 353 1014 387
-rect 1048 353 1060 387
-rect 68 347 126 353
-rect 470 347 528 353
-rect 1002 347 1060 353
-rect 281 313 339 319
-rect 765 313 823 319
-rect 1199 313 1257 319
-rect 281 279 293 313
-rect 327 279 777 313
-rect 811 279 1211 313
-rect 1245 279 1257 313
-rect 281 273 339 279
-rect 765 273 823 279
-rect 1199 273 1257 279
-rect 0 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel metal1 97 370 97 370 1 A
-port 1 n
-rlabel metal1 265 444 265 444 1 CI
-port 2 n
-rlabel metal1 129 518 129 518 1 B
-port 3 n
-rlabel metal1 1228 296 1228 296 1 CON
-port 4 n
-rlabel metal1 1160 667 1160 667 1 S
-port 5 n
-rlabel metal1 1350 592 1350 592 1 CO
-port 6 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__addf_l.mag b/18T_ls/sky130_osu_sc_18T_ls__addf_l.mag
deleted file mode 100644
index 1cfbf83..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__addf_l.mag
+++ /dev/null
@@ -1,652 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864589
-<< checkpaint >>
-rect -1209 -1243 2569 2575
-<< nwell >>
-rect -9 581 1435 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 410 115 440 315
-rect 496 115 526 315
-rect 582 115 612 315
-rect 668 115 698 315
-rect 754 115 784 315
-rect 840 115 870 315
-rect 922 115 952 315
-rect 1004 115 1034 315
-rect 1102 115 1132 263
-rect 1292 115 1322 263
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 410 617 440 1217
-rect 496 617 526 1217
-rect 582 617 612 1217
-rect 668 617 698 1217
-rect 754 617 784 1217
-rect 840 617 870 1217
-rect 922 617 952 1217
-rect 1004 617 1034 1217
-rect 1102 817 1132 1217
-rect 1292 817 1322 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 199 166 315
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 115 410 315
-rect 440 267 496 315
-rect 440 131 451 267
-rect 485 131 496 267
-rect 440 115 496 131
-rect 526 267 582 315
-rect 526 131 537 267
-rect 571 131 582 267
-rect 526 115 582 131
-rect 612 199 668 315
-rect 612 131 623 199
-rect 657 131 668 199
-rect 612 115 668 131
-rect 698 267 754 315
-rect 698 131 709 267
-rect 743 131 754 267
-rect 698 115 754 131
-rect 784 199 840 315
-rect 784 131 795 199
-rect 829 131 840 199
-rect 784 115 840 131
-rect 870 115 922 315
-rect 952 115 1004 315
-rect 1034 267 1087 315
-rect 1034 131 1045 267
-rect 1079 263 1087 267
-rect 1079 131 1102 263
-rect 1034 115 1102 131
-rect 1132 199 1185 263
-rect 1132 131 1143 199
-rect 1177 131 1185 199
-rect 1132 115 1185 131
-rect 1239 199 1292 263
-rect 1239 131 1247 199
-rect 1281 131 1292 199
-rect 1239 115 1292 131
-rect 1322 199 1375 263
-rect 1322 131 1333 199
-rect 1367 131 1375 199
-rect 1322 115 1375 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 725 293 1201
-rect 327 725 338 1201
-rect 282 617 338 725
-rect 368 617 410 1217
-rect 440 1201 496 1217
-rect 440 725 451 1201
-rect 485 725 496 1201
-rect 440 617 496 725
-rect 526 1201 582 1217
-rect 526 725 537 1201
-rect 571 725 582 1201
-rect 526 617 582 725
-rect 612 1201 668 1217
-rect 612 793 623 1201
-rect 657 793 668 1201
-rect 612 617 668 793
-rect 698 1201 754 1217
-rect 698 725 709 1201
-rect 743 725 754 1201
-rect 698 617 754 725
-rect 784 1201 840 1217
-rect 784 725 795 1201
-rect 829 725 840 1201
-rect 784 617 840 725
-rect 870 617 922 1217
-rect 952 617 1004 1217
-rect 1034 1201 1102 1217
-rect 1034 793 1045 1201
-rect 1079 817 1102 1201
-rect 1132 1201 1185 1217
-rect 1132 855 1143 1201
-rect 1177 855 1185 1201
-rect 1132 817 1185 855
-rect 1239 1201 1292 1217
-rect 1239 855 1247 1201
-rect 1281 855 1292 1201
-rect 1239 817 1292 855
-rect 1322 1201 1375 1217
-rect 1322 855 1333 1201
-rect 1367 855 1375 1201
-rect 1322 817 1375 855
-rect 1079 793 1087 817
-rect 1034 617 1087 793
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 199
-rect 207 131 241 267
-rect 293 131 327 267
-rect 451 131 485 267
-rect 537 131 571 267
-rect 623 131 657 199
-rect 709 131 743 267
-rect 795 131 829 199
-rect 1045 131 1079 267
-rect 1143 131 1177 199
-rect 1247 131 1281 199
-rect 1333 131 1367 199
-<< pdiffc >>
-rect 35 725 69 1201
-rect 121 793 155 1201
-rect 207 725 241 1201
-rect 293 725 327 1201
-rect 451 725 485 1201
-rect 537 725 571 1201
-rect 623 793 657 1201
-rect 709 725 743 1201
-rect 795 725 829 1201
-rect 1045 793 1079 1201
-rect 1143 855 1177 1201
-rect 1247 855 1281 1201
-rect 1333 855 1367 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-rect 979 1271 1003 1305
-rect 1037 1271 1061 1305
-rect 1115 1271 1139 1305
-rect 1173 1271 1197 1305
-rect 1251 1271 1275 1305
-rect 1309 1271 1333 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-rect 1003 1271 1037 1305
-rect 1139 1271 1173 1305
-rect 1275 1271 1309 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1245
-rect 338 1217 368 1245
-rect 410 1217 440 1243
-rect 496 1217 526 1243
-rect 582 1217 612 1245
-rect 668 1217 698 1245
-rect 754 1217 784 1245
-rect 840 1217 870 1245
-rect 922 1217 952 1245
-rect 1004 1217 1034 1245
-rect 1102 1217 1132 1245
-rect 1292 1217 1322 1245
-rect 80 403 110 617
-rect 166 585 196 617
-rect 152 569 206 585
-rect 152 535 162 569
-rect 196 535 206 569
-rect 152 519 206 535
-rect 70 387 124 403
-rect 70 353 80 387
-rect 114 353 124 387
-rect 70 337 124 353
-rect 80 315 110 337
-rect 166 315 196 519
-rect 252 477 282 617
-rect 338 519 368 617
-rect 410 592 440 617
-rect 496 592 526 617
-rect 410 562 526 592
-rect 338 503 430 519
-rect 238 461 292 477
-rect 238 427 248 461
-rect 282 427 292 461
-rect 238 411 292 427
-rect 338 469 386 503
-rect 420 469 430 503
-rect 338 453 430 469
-rect 252 315 282 411
-rect 338 315 368 453
-rect 472 403 502 562
-rect 582 403 612 617
-rect 668 551 698 617
-rect 656 535 710 551
-rect 656 501 666 535
-rect 700 501 710 535
-rect 656 485 710 501
-rect 472 387 526 403
-rect 472 367 482 387
-rect 410 353 482 367
-rect 516 353 526 387
-rect 410 337 526 353
-rect 568 387 622 403
-rect 568 353 578 387
-rect 612 353 622 387
-rect 568 337 622 353
-rect 410 315 440 337
-rect 496 315 526 337
-rect 582 315 612 337
-rect 668 315 698 485
-rect 754 403 784 617
-rect 840 551 870 617
-rect 826 535 880 551
-rect 826 501 836 535
-rect 870 501 880 535
-rect 826 485 880 501
-rect 922 513 952 617
-rect 1004 585 1034 617
-rect 1004 555 1048 585
-rect 1102 584 1132 817
-rect 922 497 976 513
-rect 742 387 796 403
-rect 742 353 752 387
-rect 786 353 796 387
-rect 742 337 796 353
-rect 754 315 784 337
-rect 840 315 870 485
-rect 922 463 932 497
-rect 966 463 976 497
-rect 922 447 976 463
-rect 922 315 952 447
-rect 1018 403 1048 555
-rect 1090 568 1144 584
-rect 1292 581 1322 817
-rect 1090 534 1100 568
-rect 1134 534 1144 568
-rect 1090 518 1144 534
-rect 1255 565 1322 581
-rect 1255 531 1265 565
-rect 1299 531 1322 565
-rect 1004 387 1058 403
-rect 1004 353 1014 387
-rect 1048 353 1058 387
-rect 1004 337 1058 353
-rect 1004 315 1034 337
-rect 1102 263 1132 518
-rect 1255 515 1322 531
-rect 1292 263 1322 515
-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 535 196 569
-rect 80 353 114 387
-rect 248 427 282 461
-rect 386 469 420 503
-rect 666 501 700 535
-rect 482 353 516 387
-rect 578 353 612 387
-rect 836 501 870 535
-rect 752 353 786 387
-rect 932 463 966 497
-rect 1100 534 1134 568
-rect 1265 531 1299 565
-rect 1014 353 1048 387
-<< locali >>
-rect 0 1311 1408 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 1003 1311
-rect 1037 1271 1139 1311
-rect 1173 1271 1275 1311
-rect 1309 1271 1408 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 709 69 725
-rect 207 709 241 725
-rect 35 675 241 709
-rect 293 1201 327 1217
-rect 293 642 327 725
-rect 451 1201 485 1271
-rect 451 709 485 725
-rect 537 1201 571 1217
-rect 623 1201 657 1271
-rect 623 777 657 793
-rect 709 1201 743 1217
-rect 537 708 571 725
-rect 709 708 743 725
-rect 537 674 743 708
-rect 795 1201 829 1217
-rect 1045 1201 1079 1271
-rect 1045 777 1079 793
-rect 1143 1201 1177 1217
-rect 795 684 829 725
-rect 1143 690 1177 855
-rect 1247 1201 1281 1271
-rect 1247 839 1281 855
-rect 1333 1201 1367 1217
-rect 795 650 1100 684
-rect 293 605 350 642
-rect 795 641 829 650
-rect 80 535 162 569
-rect 196 535 212 569
-rect 248 461 282 477
-rect 248 411 282 427
-rect 64 353 80 387
-rect 114 353 130 387
-rect 316 370 350 605
-rect 752 606 829 641
-rect 578 535 612 541
-rect 386 503 444 535
-rect 420 501 444 503
-rect 650 501 666 535
-rect 700 501 716 535
-rect 386 453 420 469
-rect 578 387 612 501
-rect 666 461 700 501
-rect 752 461 786 606
-rect 1066 584 1100 650
-rect 1177 656 1202 667
-rect 1143 633 1202 656
-rect 1066 568 1134 584
-rect 1066 537 1100 568
-rect 820 501 836 535
-rect 870 501 886 535
-rect 1089 534 1100 537
-rect 1100 518 1134 534
-rect 932 497 966 513
-rect 932 461 966 463
-rect 1168 461 1202 633
-rect 1333 609 1367 855
-rect 752 427 879 461
-rect 1143 427 1202 461
-rect 1265 565 1299 581
-rect 293 336 350 370
-rect 466 353 482 387
-rect 516 353 532 387
-rect 736 353 752 387
-rect 786 353 811 387
-rect 578 337 612 353
-rect 293 313 327 336
-rect 35 267 241 286
-rect 69 252 207 267
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 207 114 241 131
-rect 777 313 811 353
-rect 293 267 327 279
-rect 293 114 327 131
-rect 451 267 485 283
-rect 451 61 485 131
-rect 537 267 743 286
-rect 571 252 709 267
-rect 537 114 571 131
-rect 623 199 657 215
-rect 623 61 657 131
-rect 845 215 879 427
-rect 998 353 1014 387
-rect 1048 353 1064 387
-rect 709 114 743 131
-rect 795 199 879 215
-rect 829 181 879 199
-rect 1045 267 1079 283
-rect 795 114 829 131
-rect 1045 61 1079 131
-rect 1143 199 1177 427
-rect 1265 313 1299 531
-rect 1245 279 1299 313
-rect 1143 115 1177 131
-rect 1247 199 1281 215
-rect 1247 61 1281 131
-rect 1333 199 1367 575
-rect 1333 115 1367 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 1003 1305 1037 1311
-rect 1003 1277 1037 1305
-rect 1139 1305 1173 1311
-rect 1139 1277 1173 1305
-rect 1275 1305 1309 1311
-rect 1275 1277 1309 1305
-rect 80 501 114 535
-rect 248 427 282 461
-rect 80 353 114 387
-rect 444 501 478 535
-rect 578 501 612 535
-rect 666 427 700 461
-rect 1143 656 1177 690
-rect 836 501 870 535
-rect 932 427 966 461
-rect 482 353 516 387
-rect 293 279 327 313
-rect 777 279 811 313
-rect 1014 353 1048 387
-rect 1211 279 1245 313
-rect 1333 575 1367 609
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1311 1408 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 1003 1311
-rect 1037 1277 1139 1311
-rect 1173 1277 1275 1311
-rect 1309 1277 1408 1311
-rect 0 1271 1408 1277
-rect 1131 690 1189 696
-rect 1109 656 1143 690
-rect 1177 656 1189 690
-rect 1131 650 1189 656
-rect 1321 609 1379 615
-rect 1299 575 1333 609
-rect 1367 575 1379 609
-rect 1321 569 1379 575
-rect 68 535 126 541
-rect 432 535 490 541
-rect 566 535 624 541
-rect 824 535 882 541
-rect 68 501 80 535
-rect 114 501 444 535
-rect 478 501 578 535
-rect 612 502 836 535
-rect 612 501 734 502
-rect 812 501 836 502
-rect 870 501 882 535
-rect 68 495 126 501
-rect 432 495 490 501
-rect 566 495 624 501
-rect 824 495 882 501
-rect 236 461 294 467
-rect 654 461 712 467
-rect 920 461 978 467
-rect 80 427 248 461
-rect 282 427 666 461
-rect 700 427 932 461
-rect 966 427 978 461
-rect 236 421 294 427
-rect 654 421 712 427
-rect 920 421 978 427
-rect 68 387 126 393
-rect 470 387 528 393
-rect 1002 387 1060 393
-rect 68 353 80 387
-rect 114 353 482 387
-rect 516 353 1014 387
-rect 1048 353 1060 387
-rect 68 347 126 353
-rect 470 347 528 353
-rect 1002 347 1060 353
-rect 281 313 339 319
-rect 765 313 823 319
-rect 1199 313 1257 319
-rect 281 279 293 313
-rect 327 279 777 313
-rect 811 279 1211 313
-rect 1245 279 1257 313
-rect 281 273 339 279
-rect 765 273 823 279
-rect 1199 273 1257 279
-rect 0 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel metal1 97 370 97 370 1 A
-port 1 n
-rlabel metal1 265 444 265 444 1 CI
-port 2 n
-rlabel metal1 129 518 129 518 1 B
-port 3 n
-rlabel metal1 1350 592 1350 592 1 CO
-port 5 n
-rlabel metal1 1160 673 1160 673 1 S
-port 6 n
-rlabel metal1 1228 296 1228 296 1 CON
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__addh_1.mag b/18T_ls/sky130_osu_sc_18T_ls__addh_1.mag
deleted file mode 100644
index 27d7d4d..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__addh_1.mag
+++ /dev/null
@@ -1,393 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864589
-<< checkpaint >>
-rect -1209 -1243 2025 2575
-<< nwell >>
-rect -9 581 837 1341
-<< nmos >>
-rect 80 115 110 315
-rect 178 115 208 315
-rect 250 115 280 315
-rect 442 115 472 315
-rect 540 115 570 315
-rect 626 115 656 315
-rect 712 115 742 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 178 617 208 1217
-rect 264 617 294 1217
-rect 362 617 392 1217
-rect 552 617 582 1217
-rect 638 617 668 1217
-rect 710 617 740 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 178 315
-rect 110 131 133 267
-rect 167 131 178 267
-rect 110 115 178 131
-rect 208 115 250 315
-rect 280 267 333 315
-rect 280 131 291 267
-rect 325 131 333 267
-rect 280 115 333 131
-rect 389 267 442 315
-rect 389 131 397 267
-rect 431 131 442 267
-rect 389 115 442 131
-rect 472 267 540 315
-rect 472 131 495 267
-rect 529 131 540 267
-rect 472 115 540 131
-rect 570 267 626 315
-rect 570 131 581 267
-rect 615 131 626 267
-rect 570 115 626 131
-rect 656 267 712 315
-rect 656 199 667 267
-rect 701 199 712 267
-rect 656 115 712 199
-rect 742 267 795 315
-rect 742 131 753 267
-rect 787 131 795 267
-rect 742 115 795 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 178 1217
-rect 110 657 133 1201
-rect 167 657 178 1201
-rect 110 617 178 657
-rect 208 1201 264 1217
-rect 208 725 219 1201
-rect 253 725 264 1201
-rect 208 617 264 725
-rect 294 1201 362 1217
-rect 294 725 305 1201
-rect 339 725 362 1201
-rect 294 617 362 725
-rect 392 1201 445 1217
-rect 392 657 403 1201
-rect 437 657 445 1201
-rect 392 617 445 657
-rect 499 1201 552 1217
-rect 499 657 507 1201
-rect 541 657 552 1201
-rect 499 617 552 657
-rect 582 1201 638 1217
-rect 582 657 593 1201
-rect 627 657 638 1201
-rect 582 617 638 657
-rect 668 617 710 1217
-rect 740 1201 796 1217
-rect 740 657 751 1201
-rect 785 657 796 1201
-rect 740 617 796 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 133 131 167 267
-rect 291 131 325 267
-rect 397 131 431 267
-rect 495 131 529 267
-rect 581 131 615 267
-rect 667 199 701 267
-rect 753 131 787 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 133 657 167 1201
-rect 219 725 253 1201
-rect 305 725 339 1201
-rect 403 657 437 1201
-rect 507 657 541 1201
-rect 593 657 627 1201
-rect 751 657 785 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 178 1217 208 1243
-rect 264 1217 294 1243
-rect 362 1217 392 1243
-rect 552 1217 582 1243
-rect 638 1217 668 1243
-rect 710 1217 740 1243
-rect 80 403 110 617
-rect 178 477 208 617
-rect 264 551 294 617
-rect 154 461 208 477
-rect 154 427 164 461
-rect 198 427 208 461
-rect 154 411 208 427
-rect 43 387 110 403
-rect 43 353 53 387
-rect 87 353 110 387
-rect 43 337 110 353
-rect 80 315 110 337
-rect 178 315 208 411
-rect 250 535 304 551
-rect 250 501 260 535
-rect 294 501 304 535
-rect 250 485 304 501
-rect 362 549 392 617
-rect 552 549 582 617
-rect 362 519 582 549
-rect 250 315 280 485
-rect 362 424 392 519
-rect 638 477 668 617
-rect 710 551 740 617
-rect 710 535 764 551
-rect 710 501 720 535
-rect 754 501 764 535
-rect 710 485 764 501
-rect 338 408 392 424
-rect 614 461 668 477
-rect 614 427 624 461
-rect 658 427 668 461
-rect 614 411 668 427
-rect 338 374 348 408
-rect 382 375 392 408
-rect 382 374 570 375
-rect 338 345 570 374
-rect 442 315 472 345
-rect 540 315 570 345
-rect 626 315 656 411
-rect 712 315 742 485
-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 427 198 461
-rect 53 353 87 387
-rect 260 501 294 535
-rect 720 501 754 535
-rect 624 427 658 461
-rect 348 374 382 408
-<< locali >>
-rect 0 1311 836 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 836 1311
-rect 35 1201 69 1217
-rect 35 623 69 649
-rect 133 1201 167 1271
-rect 133 641 167 657
-rect 219 1201 253 1217
-rect 219 619 253 725
-rect 305 1201 339 1271
-rect 305 709 339 725
-rect 403 1201 437 1217
-rect 219 585 362 619
-rect 260 535 294 551
-rect 260 485 294 501
-rect 148 427 164 461
-rect 198 427 214 461
-rect 328 424 362 585
-rect 403 609 437 657
-rect 507 1201 541 1217
-rect 403 575 418 609
-rect 328 408 382 424
-rect 328 392 348 408
-rect 37 353 53 387
-rect 87 353 110 387
-rect 291 374 348 392
-rect 291 358 382 374
-rect 35 267 69 278
-rect 35 115 69 131
-rect 133 267 167 283
-rect 133 61 167 131
-rect 291 267 325 358
-rect 418 312 452 575
-rect 507 607 541 657
-rect 593 1201 627 1271
-rect 593 641 627 657
-rect 751 1201 785 1217
-rect 751 607 785 657
-rect 507 573 785 607
-rect 507 387 541 573
-rect 704 501 720 535
-rect 754 501 770 535
-rect 608 427 624 461
-rect 658 427 674 461
-rect 541 353 667 387
-rect 291 115 325 131
-rect 397 277 452 312
-rect 397 267 431 277
-rect 397 115 431 131
-rect 495 267 529 283
-rect 495 61 529 131
-rect 581 267 615 283
-rect 667 267 701 353
-rect 667 183 701 199
-rect 753 267 787 283
-rect 615 131 753 144
-rect 581 110 787 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 35 657 69 683
-rect 35 649 69 657
-rect 260 501 294 535
-rect 164 427 198 461
-rect 418 575 452 609
-rect 110 353 144 387
-rect 35 278 69 312
-rect 720 501 754 535
-rect 624 427 658 461
-rect 507 353 541 387
-rect 667 353 701 387
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1311 836 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 836 1311
-rect 0 1271 836 1277
-rect 23 683 81 689
-rect 23 649 35 683
-rect 69 649 81 683
-rect 23 643 81 649
-rect 35 318 69 643
-rect 406 609 464 615
-rect 406 575 418 609
-rect 452 575 486 609
-rect 406 569 464 575
-rect 248 535 306 541
-rect 708 535 766 541
-rect 248 501 260 535
-rect 294 501 720 535
-rect 754 501 766 535
-rect 248 500 766 501
-rect 248 495 306 500
-rect 708 495 766 500
-rect 152 462 210 467
-rect 612 462 670 467
-rect 152 461 670 462
-rect 152 427 164 461
-rect 198 427 624 461
-rect 658 427 670 461
-rect 152 421 210 427
-rect 612 421 670 427
-rect 98 387 156 393
-rect 495 387 553 393
-rect 655 387 713 393
-rect 98 353 110 387
-rect 144 353 507 387
-rect 541 353 553 387
-rect 633 353 667 387
-rect 701 353 713 387
-rect 98 347 156 353
-rect 495 347 553 353
-rect 655 347 713 353
-rect 23 312 81 318
-rect 23 278 35 312
-rect 69 278 81 312
-rect 23 272 81 278
-rect 0 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 477 50 477 1 S
-port 1 n
-rlabel metal1 737 518 737 518 1 A
-port 2 n
-rlabel metal1 642 444 642 444 1 B
-port 3 n
-rlabel metal1 435 592 435 592 1 CO
-port 4 n
-rlabel metal1 684 370 684 370 1 CON
-port 5 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__addh_l.mag b/18T_ls/sky130_osu_sc_18T_ls__addh_l.mag
deleted file mode 100644
index a545426..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__addh_l.mag
+++ /dev/null
@@ -1,396 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864589
-<< checkpaint >>
-rect -1209 -1243 2025 2575
-<< nwell >>
-rect -9 581 837 1341
-<< nmos >>
-rect 80 115 110 243
-rect 178 115 208 315
-rect 250 115 280 315
-rect 442 115 472 243
-rect 540 115 570 315
-rect 626 115 656 315
-rect 712 115 742 315
-<< pmoshvt >>
-rect 80 887 110 1217
-rect 178 617 208 1217
-rect 264 617 294 1217
-rect 362 887 392 1217
-rect 552 617 582 1217
-rect 638 617 668 1217
-rect 710 617 740 1217
-<< ndiff >>
-rect 125 267 178 315
-rect 125 243 133 267
-rect 27 199 80 243
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 131 133 243
-rect 167 131 178 267
-rect 110 115 178 131
-rect 208 115 250 315
-rect 280 267 333 315
-rect 280 131 291 267
-rect 325 131 333 267
-rect 487 267 540 315
-rect 487 243 495 267
-rect 280 115 333 131
-rect 389 199 442 243
-rect 389 131 397 199
-rect 431 131 442 199
-rect 389 115 442 131
-rect 472 131 495 243
-rect 529 131 540 267
-rect 472 115 540 131
-rect 570 267 626 315
-rect 570 131 581 267
-rect 615 131 626 267
-rect 570 115 626 131
-rect 656 267 712 315
-rect 656 199 667 267
-rect 701 199 712 267
-rect 656 115 712 199
-rect 742 267 795 315
-rect 742 131 753 267
-rect 787 131 795 267
-rect 742 115 795 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 887 80 929
-rect 110 1201 178 1217
-rect 110 887 133 1201
-rect 125 657 133 887
-rect 167 657 178 1201
-rect 125 617 178 657
-rect 208 1201 264 1217
-rect 208 725 219 1201
-rect 253 725 264 1201
-rect 208 617 264 725
-rect 294 1201 362 1217
-rect 294 725 305 1201
-rect 339 887 362 1201
-rect 392 1201 445 1217
-rect 392 929 403 1201
-rect 437 929 445 1201
-rect 392 887 445 929
-rect 499 1201 552 1217
-rect 339 725 347 887
-rect 294 617 347 725
-rect 499 657 507 1201
-rect 541 657 552 1201
-rect 499 617 552 657
-rect 582 1201 638 1217
-rect 582 657 593 1201
-rect 627 657 638 1201
-rect 582 617 638 657
-rect 668 617 710 1217
-rect 740 1201 796 1217
-rect 740 657 751 1201
-rect 785 657 796 1201
-rect 740 617 796 657
-<< ndiffc >>
-rect 35 131 69 199
-rect 133 131 167 267
-rect 291 131 325 267
-rect 397 131 431 199
-rect 495 131 529 267
-rect 581 131 615 267
-rect 667 199 701 267
-rect 753 131 787 267
-<< pdiffc >>
-rect 35 929 69 1201
-rect 133 657 167 1201
-rect 219 725 253 1201
-rect 305 725 339 1201
-rect 403 929 437 1201
-rect 507 657 541 1201
-rect 593 657 627 1201
-rect 751 657 785 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 178 1217 208 1243
-rect 264 1217 294 1243
-rect 362 1217 392 1243
-rect 552 1217 582 1243
-rect 638 1217 668 1243
-rect 710 1217 740 1243
-rect 80 403 110 887
-rect 178 477 208 617
-rect 264 551 294 617
-rect 154 461 208 477
-rect 154 427 164 461
-rect 198 427 208 461
-rect 154 411 208 427
-rect 43 387 110 403
-rect 43 353 53 387
-rect 87 353 110 387
-rect 43 337 110 353
-rect 80 243 110 337
-rect 178 315 208 411
-rect 250 535 304 551
-rect 250 501 260 535
-rect 294 501 304 535
-rect 250 485 304 501
-rect 362 549 392 887
-rect 552 549 582 617
-rect 362 519 582 549
-rect 250 315 280 485
-rect 362 424 392 519
-rect 638 477 668 617
-rect 710 551 740 617
-rect 710 535 764 551
-rect 710 501 720 535
-rect 754 501 764 535
-rect 710 485 764 501
-rect 338 408 392 424
-rect 614 461 668 477
-rect 614 427 624 461
-rect 658 427 668 461
-rect 614 411 668 427
-rect 338 374 348 408
-rect 382 375 392 408
-rect 382 374 570 375
-rect 338 345 570 374
-rect 442 243 472 345
-rect 540 315 570 345
-rect 626 315 656 411
-rect 712 315 742 485
-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 427 198 461
-rect 53 353 87 387
-rect 260 501 294 535
-rect 720 501 754 535
-rect 624 427 658 461
-rect 348 374 382 408
-<< locali >>
-rect 0 1311 836 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 836 1311
-rect 35 1201 69 1217
-rect 35 683 69 929
-rect 133 1201 167 1271
-rect 133 641 167 657
-rect 219 1201 253 1217
-rect 219 619 253 725
-rect 305 1201 339 1271
-rect 305 709 339 725
-rect 403 1201 437 1217
-rect 219 585 362 619
-rect 260 535 294 551
-rect 260 485 294 501
-rect 148 427 164 461
-rect 198 427 214 461
-rect 328 424 362 585
-rect 403 609 437 929
-rect 507 1201 541 1217
-rect 403 575 418 609
-rect 328 408 382 424
-rect 328 392 348 408
-rect 37 353 53 387
-rect 87 353 110 387
-rect 291 374 348 392
-rect 291 358 382 374
-rect 35 199 69 278
-rect 35 115 69 131
-rect 133 267 167 283
-rect 133 61 167 131
-rect 291 267 325 358
-rect 418 312 452 575
-rect 507 607 541 657
-rect 593 1201 627 1271
-rect 593 641 627 657
-rect 751 1201 785 1217
-rect 751 607 785 657
-rect 507 573 785 607
-rect 507 387 541 573
-rect 704 501 720 535
-rect 754 501 770 535
-rect 608 427 624 461
-rect 658 427 674 461
-rect 541 353 667 387
-rect 291 115 325 131
-rect 397 277 452 312
-rect 397 199 431 277
-rect 397 115 431 131
-rect 495 267 529 283
-rect 495 61 529 131
-rect 581 267 615 283
-rect 667 267 701 353
-rect 667 183 701 199
-rect 753 267 787 283
-rect 615 131 753 144
-rect 581 110 787 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 35 649 69 683
-rect 260 501 294 535
-rect 164 427 198 461
-rect 418 575 452 609
-rect 110 353 144 387
-rect 35 278 69 312
-rect 720 501 754 535
-rect 624 427 658 461
-rect 507 353 541 387
-rect 667 353 701 387
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1311 836 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 836 1311
-rect 0 1271 836 1277
-rect 23 683 81 689
-rect 23 649 35 683
-rect 69 649 81 683
-rect 23 643 81 649
-rect 35 318 69 643
-rect 406 609 464 615
-rect 406 575 418 609
-rect 452 575 486 609
-rect 406 569 464 575
-rect 248 535 306 541
-rect 708 535 766 541
-rect 248 501 260 535
-rect 294 501 720 535
-rect 754 501 766 535
-rect 248 500 766 501
-rect 248 495 306 500
-rect 708 495 766 500
-rect 152 462 210 467
-rect 612 462 670 467
-rect 152 461 670 462
-rect 152 427 164 461
-rect 198 427 624 461
-rect 658 427 670 461
-rect 152 421 210 427
-rect 612 421 670 427
-rect 98 387 156 393
-rect 495 387 553 393
-rect 655 387 713 393
-rect 98 353 110 387
-rect 144 353 507 387
-rect 541 353 553 387
-rect 633 353 667 387
-rect 701 353 713 387
-rect 98 347 156 353
-rect 495 347 553 353
-rect 655 347 713 353
-rect 23 312 81 318
-rect 23 278 35 312
-rect 69 278 81 312
-rect 23 272 81 278
-rect 0 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 477 50 477 1 S
-port 1 n
-rlabel metal1 737 518 737 518 1 A
-port 2 n
-rlabel metal1 642 444 642 444 1 B
-port 3 n
-rlabel metal1 435 592 435 592 1 CO
-port 4 n
-rlabel metal1 684 370 684 370 1 CON
-port 5 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__and2_1.mag b/18T_ls/sky130_osu_sc_18T_ls__and2_1.mag
deleted file mode 100644
index 352987b..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__and2_1.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864589
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< nmos >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 193 267
-rect 227 131 252 267
-rect 182 115 252 131
-rect 282 267 335 315
-rect 282 131 293 267
-rect 327 131 335 267
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 335 1217
-rect 282 657 293 1201
-rect 327 657 335 1201
-rect 282 617 335 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 293 131 327 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 725 155 1201
-rect 207 725 241 1201
-rect 293 657 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 586 110 617
-rect 27 570 110 586
-rect 27 536 37 570
-rect 71 536 110 570
-rect 27 520 110 536
-rect 80 315 110 520
-rect 166 518 196 617
-rect 252 592 282 617
-rect 252 562 289 592
-rect 152 502 217 518
-rect 152 468 173 502
-rect 207 468 217 502
-rect 152 452 217 468
-rect 152 315 182 452
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 370 313 404
-rect 252 354 313 370
-rect 252 315 282 354
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 536 71 570
-rect 173 468 207 502
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 105 725 121 743
-rect 105 709 155 725
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 293 1201 327 1217
-rect 37 570 71 649
-rect 37 520 71 536
-rect 105 404 139 709
-rect 173 502 207 575
-rect 293 535 327 657
-rect 173 452 207 468
-rect 35 370 269 404
-rect 303 370 319 404
-rect 35 267 69 370
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 37 649 71 683
-rect 173 575 207 609
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 105 683
-rect 25 643 83 649
-rect 161 609 219 615
-rect 140 575 173 609
-rect 207 575 219 609
-rect 161 569 219 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 55 666 55 666 1 A
-port 2 n
-rlabel metal1 191 592 191 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__and2_2.mag b/18T_ls/sky130_osu_sc_18T_ls__and2_2.mag
deleted file mode 100644
index 1714755..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__and2_2.mag
+++ /dev/null
@@ -1,221 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864589
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 462 1341
-<< nmos >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 338 115 368 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 193 267
-rect 227 131 252 267
-rect 182 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 421 315
-rect 368 131 379 267
-rect 413 131 421 267
-rect 368 115 421 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 421 1217
-rect 368 657 379 1201
-rect 413 657 421 1201
-rect 368 617 421 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 293 131 327 267
-rect 379 131 413 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 725 155 1201
-rect 207 725 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 80 586 110 617
-rect 27 570 110 586
-rect 27 536 37 570
-rect 71 536 110 570
-rect 27 520 110 536
-rect 80 315 110 520
-rect 166 518 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 252 562 368 592
-rect 152 502 217 518
-rect 152 468 173 502
-rect 207 468 217 502
-rect 152 452 217 468
-rect 152 315 182 452
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 303 370 368 384
-rect 252 354 368 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 37 536 71 570
-rect 173 468 207 502
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 462 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 462 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 105 725 121 743
-rect 105 709 155 725
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 293 1201 327 1217
-rect 37 570 71 649
-rect 37 520 71 536
-rect 105 404 139 709
-rect 173 502 207 575
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 173 452 207 468
-rect 35 370 269 404
-rect 303 370 319 404
-rect 35 267 69 370
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 37 649 71 683
-rect 173 575 207 609
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 462 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 462 1311
-rect 0 1271 462 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 105 683
-rect 25 643 83 649
-rect 161 609 219 615
-rect 140 575 173 609
-rect 207 575 219 609
-rect 161 569 219 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 191 592 191 592 1 B
-port 1 n
-rlabel metal1 55 666 55 666 1 A
-port 2 n
-rlabel metal1 311 444 311 444 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__and2_4.mag b/18T_ls/sky130_osu_sc_18T_ls__and2_4.mag
deleted file mode 100644
index 2ecaf34..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__and2_4.mag
+++ /dev/null
@@ -1,284 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864590
-<< checkpaint >>
-rect -1209 -1243 1753 2575
-<< nwell >>
-rect -9 581 638 1341
-<< nmos >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 193 267
-rect 227 131 252 267
-rect 182 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 593 315
-rect 540 131 551 267
-rect 585 131 593 267
-rect 540 115 593 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 593 1217
-rect 540 657 551 1201
-rect 585 657 593 1201
-rect 540 617 593 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 725 155 1201
-rect 207 725 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 80 586 110 617
-rect 27 570 110 586
-rect 27 536 37 570
-rect 71 536 110 570
-rect 27 520 110 536
-rect 80 315 110 520
-rect 166 518 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 252 562 540 592
-rect 152 502 217 518
-rect 152 468 173 502
-rect 207 468 217 502
-rect 152 452 217 468
-rect 152 315 182 452
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 303 370 540 384
-rect 252 354 540 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-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 536 71 570
-rect 173 468 207 502
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 638 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 638 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 105 725 121 743
-rect 105 709 155 725
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 293 1201 327 1217
-rect 37 570 71 649
-rect 37 520 71 536
-rect 105 404 139 709
-rect 173 502 207 575
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 535 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 173 452 207 468
-rect 35 370 269 404
-rect 303 370 319 404
-rect 35 267 69 370
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 37 649 71 683
-rect 173 575 207 609
-rect 293 501 327 535
-rect 465 501 499 535
-rect 293 279 327 313
-rect 465 279 499 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 638 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 638 1311
-rect 0 1271 638 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 105 683
-rect 25 643 83 649
-rect 161 609 219 615
-rect 140 575 173 609
-rect 207 575 219 609
-rect 161 569 219 575
-rect 281 535 339 541
-rect 453 535 511 541
-rect 281 501 293 535
-rect 327 501 465 535
-rect 499 501 511 535
-rect 281 495 339 501
-rect 453 495 511 501
-rect 293 319 327 495
-rect 465 319 499 495
-rect 281 313 339 319
-rect 453 313 511 319
-rect 281 279 293 313
-rect 327 279 465 313
-rect 499 279 511 313
-rect 281 273 339 279
-rect 453 273 511 279
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 55 666 55 666 1 A
-port 2 n
-rlabel metal1 191 592 191 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__and2_6.mag b/18T_ls/sky130_osu_sc_18T_ls__and2_6.mag
deleted file mode 100644
index f02d284..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__and2_6.mag
+++ /dev/null
@@ -1,313 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1600380937
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 581 814 1341
-<< nmos >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 193 267
-rect 227 131 252 267
-rect 182 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 765 315
-rect 712 131 723 267
-rect 757 131 765 267
-rect 712 115 765 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 765 1217
-rect 712 657 723 1201
-rect 757 657 765 1201
-rect 712 617 765 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 725 155 1201
-rect 207 725 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 80 586 110 617
-rect 20 570 110 586
-rect 20 536 30 570
-rect 64 536 110 570
-rect 20 520 110 536
-rect 80 315 110 520
-rect 166 519 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 596 592 626 617
-rect 682 592 712 617
-rect 252 562 712 592
-rect 152 502 210 519
-rect 152 468 166 502
-rect 200 468 210 502
-rect 152 452 210 468
-rect 152 315 182 452
-rect 252 420 282 562
-rect 252 404 306 420
-rect 252 370 262 404
-rect 296 384 306 404
-rect 596 384 626 562
-rect 296 370 712 384
-rect 252 354 712 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-rect 596 315 626 354
-rect 682 315 712 354
-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 536 64 570
-rect 166 468 200 502
-rect 262 370 296 404
-<< locali >>
-rect 0 1305 814 1332
-rect 0 1271 51 1305
-rect 85 1271 187 1305
-rect 221 1271 323 1305
-rect 357 1271 459 1305
-rect 493 1271 595 1305
-rect 629 1271 814 1305
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 98 725 121 743
-rect 98 709 155 725
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 293 1201 327 1217
-rect 30 570 64 649
-rect 30 520 64 536
-rect 98 404 132 709
-rect 166 502 200 575
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 535 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 637 1201 671 1217
-rect 637 535 671 657
-rect 723 1201 757 1271
-rect 723 641 757 657
-rect 166 452 200 468
-rect 35 370 262 404
-rect 296 370 312 404
-rect 35 267 69 370
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 637 267 671 279
-rect 637 115 671 131
-rect 723 267 757 283
-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 649 64 683
-rect 166 575 200 609
-rect 293 501 327 535
-rect 465 501 499 535
-rect 637 501 671 535
-rect 293 279 327 313
-rect 465 279 499 313
-rect 637 279 671 313
-<< metal1 >>
-rect 0 1271 814 1332
-rect 18 683 76 689
-rect 18 649 30 683
-rect 64 649 98 683
-rect 18 643 76 649
-rect 154 609 212 615
-rect 132 575 166 609
-rect 200 575 212 609
-rect 154 569 212 575
-rect 281 535 339 541
-rect 453 535 511 541
-rect 625 535 683 541
-rect 281 501 293 535
-rect 327 501 465 535
-rect 499 501 637 535
-rect 671 501 683 535
-rect 281 495 339 501
-rect 453 495 511 501
-rect 625 495 683 501
-rect 293 319 327 495
-rect 465 319 499 495
-rect 637 319 671 495
-rect 281 313 339 319
-rect 453 313 511 319
-rect 625 313 683 319
-rect 281 279 293 313
-rect 327 279 465 313
-rect 499 279 637 313
-rect 671 279 683 313
-rect 281 273 339 279
-rect 453 273 511 279
-rect 625 273 683 279
-rect 0 0 814 61
-<< labels >>
-rlabel metal1 68 44 68 44 1 gnd
-rlabel metal1 68 1288 68 1288 1 vdd
-rlabel metal1 184 592 184 592 1 B
-port 1 n
-rlabel metal1 48 666 48 666 1 A
-port 2 n
-rlabel metal1 311 444 311 444 1 Y
-port 3 n
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__and2_8.mag b/18T_ls/sky130_osu_sc_18T_ls__and2_8.mag
deleted file mode 100644
index baaaa4a..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__and2_8.mag
+++ /dev/null
@@ -1,426 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864590
-<< checkpaint >>
-rect -1209 -1243 2161 2575
-<< nwell >>
-rect -9 581 990 1341
-<< nmos >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-rect 768 115 798 315
-rect 854 115 884 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-rect 768 617 798 1217
-rect 854 617 884 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 193 267
-rect 227 131 252 267
-rect 182 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 768 315
-rect 712 131 723 267
-rect 757 131 768 267
-rect 712 115 768 131
-rect 798 267 854 315
-rect 798 131 809 267
-rect 843 131 854 267
-rect 798 115 854 131
-rect 884 267 937 315
-rect 884 131 895 267
-rect 929 131 937 267
-rect 884 115 937 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 768 1217
-rect 712 657 723 1201
-rect 757 657 768 1201
-rect 712 617 768 657
-rect 798 1201 854 1217
-rect 798 657 809 1201
-rect 843 657 854 1201
-rect 798 617 854 657
-rect 884 1201 937 1217
-rect 884 657 895 1201
-rect 929 657 937 1201
-rect 884 617 937 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-rect 809 131 843 267
-rect 895 131 929 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 725 155 1201
-rect 207 725 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-rect 809 657 843 1201
-rect 895 657 929 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 768 1217 798 1243
-rect 854 1217 884 1243
-rect 80 586 110 617
-rect 27 570 110 586
-rect 27 536 37 570
-rect 71 536 110 570
-rect 27 520 110 536
-rect 80 315 110 520
-rect 166 518 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 596 592 626 617
-rect 682 592 712 617
-rect 768 592 798 617
-rect 854 592 884 617
-rect 252 562 884 592
-rect 152 502 217 518
-rect 152 468 173 502
-rect 207 468 217 502
-rect 152 452 217 468
-rect 152 315 182 452
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 596 384 626 562
-rect 303 370 884 384
-rect 252 354 884 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-rect 596 315 626 354
-rect 682 315 712 354
-rect 768 315 798 354
-rect 854 315 884 354
-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 536 71 570
-rect 173 468 207 502
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 990 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 990 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 105 725 121 743
-rect 105 709 155 725
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 293 1201 327 1217
-rect 37 570 71 649
-rect 37 520 71 536
-rect 105 404 139 709
-rect 173 502 207 575
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 535 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 637 1201 671 1217
-rect 637 535 671 657
-rect 723 1201 757 1271
-rect 723 641 757 657
-rect 809 1201 843 1217
-rect 809 535 843 657
-rect 895 1201 929 1271
-rect 895 641 929 657
-rect 173 452 207 468
-rect 35 370 269 404
-rect 303 370 319 404
-rect 35 267 69 370
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 637 267 671 279
-rect 637 115 671 131
-rect 723 267 757 283
-rect 723 61 757 131
-rect 809 267 843 279
-rect 809 115 843 131
-rect 895 267 929 283
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 37 649 71 683
-rect 173 575 207 609
-rect 293 501 327 535
-rect 465 501 499 535
-rect 637 501 671 535
-rect 809 501 843 535
-rect 293 279 327 313
-rect 465 279 499 313
-rect 637 279 671 313
-rect 809 279 843 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1311 990 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 990 1311
-rect 0 1271 990 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 105 683
-rect 25 643 83 649
-rect 161 609 219 615
-rect 140 575 173 609
-rect 207 575 219 609
-rect 161 569 219 575
-rect 281 535 339 541
-rect 453 535 511 541
-rect 625 535 683 541
-rect 797 535 855 541
-rect 281 501 293 535
-rect 327 501 465 535
-rect 499 501 637 535
-rect 671 501 809 535
-rect 843 501 855 535
-rect 281 495 339 501
-rect 453 495 511 501
-rect 625 495 683 501
-rect 797 495 855 501
-rect 293 319 327 495
-rect 465 319 499 495
-rect 637 319 671 495
-rect 809 319 843 495
-rect 281 313 339 319
-rect 453 313 511 319
-rect 625 313 683 319
-rect 797 313 855 319
-rect 281 279 293 313
-rect 327 279 465 313
-rect 499 279 637 313
-rect 671 279 683 313
-rect 712 279 809 313
-rect 843 279 855 313
-rect 281 273 339 279
-rect 453 273 511 279
-rect 625 273 683 279
-rect 797 273 855 279
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 191 592 191 592 1 B
-port 1 n
-rlabel metal1 55 666 55 666 1 A
-port 2 n
-rlabel metal1 311 444 311 444 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__and2_l.mag b/18T_ls/sky130_osu_sc_18T_ls__and2_l.mag
deleted file mode 100644
index e2b62d6..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__and2_l.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864590
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< nmos >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-<< pmoshvt >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 252 817 282 1217
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 115 152 263
-rect 182 199 252 263
-rect 182 131 193 199
-rect 227 131 252 199
-rect 182 115 252 131
-rect 282 199 335 263
-rect 282 131 293 199
-rect 327 131 335 199
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 817 166 861
-rect 196 1201 252 1217
-rect 196 861 207 1201
-rect 241 861 252 1201
-rect 196 817 252 861
-rect 282 1201 335 1217
-rect 282 861 293 1201
-rect 327 861 335 1201
-rect 282 817 335 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 193 131 227 199
-rect 293 131 327 199
-<< pdiffc >>
-rect 35 861 69 1201
-rect 121 861 155 1201
-rect 207 861 241 1201
-rect 293 861 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 586 110 817
-rect 27 570 110 586
-rect 27 536 37 570
-rect 71 536 110 570
-rect 27 520 110 536
-rect 80 263 110 520
-rect 166 518 196 817
-rect 252 592 282 817
-rect 252 562 289 592
-rect 152 502 217 518
-rect 152 468 173 502
-rect 207 468 217 502
-rect 152 452 217 468
-rect 152 263 182 452
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 370 313 404
-rect 252 354 313 370
-rect 252 263 282 354
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 536 71 570
-rect 173 468 207 502
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1271
-rect 121 1201 155 1217
-rect 35 845 69 861
-rect 105 861 121 879
-rect 105 845 155 861
-rect 207 1201 241 1271
-rect 207 845 241 861
-rect 293 1201 327 1217
-rect 37 570 71 649
-rect 37 520 71 536
-rect 105 404 139 845
-rect 173 502 207 575
-rect 293 535 327 861
-rect 173 452 207 468
-rect 35 370 269 404
-rect 303 370 319 404
-rect 35 199 69 370
-rect 35 115 69 131
-rect 193 199 227 215
-rect 193 61 227 131
-rect 293 199 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 37 649 71 683
-rect 173 575 207 609
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 105 683
-rect 25 643 83 649
-rect 161 609 219 615
-rect 140 575 173 609
-rect 207 575 219 609
-rect 161 569 219 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 55 666 55 666 1 A
-port 2 n
-rlabel metal1 191 592 191 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__ant.mag b/18T_ls/sky130_osu_sc_18T_ls__ant.mag
deleted file mode 100644
index a008898..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__ant.mag
+++ /dev/null
@@ -1,101 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864591
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< nmos >>
-rect 80 115 110 315
-<< pmoshvt >>
-rect 80 617 110 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 657 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 551 110 617
-rect 35 535 110 551
-rect 35 501 47 535
-rect 81 501 110 535
-rect 35 485 110 501
-rect 80 315 110 485
-rect 80 89 110 115
-<< polycont >>
-rect 47 501 81 535
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1217
-rect 35 535 69 657
-rect 121 1201 155 1271
-rect 121 641 155 657
-rect 31 501 47 535
-rect 81 501 97 535
-rect 35 417 69 501
-rect 35 383 155 417
-rect 35 267 69 383
-rect 35 115 69 131
-rect 121 267 155 383
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 47 501 81 535
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 35 535 108 541
-rect 35 501 47 535
-rect 81 501 108 535
-rect 35 495 108 501
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 64 518 64 518 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__antfill.mag b/18T_ls/sky130_osu_sc_18T_ls__antfill.mag
deleted file mode 100644
index 17bb3d2..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__antfill.mag
+++ /dev/null
@@ -1,58 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864590
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 535 69 1217
-rect 121 641 155 1271
-rect 31 501 47 535
-rect 81 501 97 535
-rect 35 417 69 501
-rect 35 383 155 417
-rect 35 115 69 383
-rect 121 115 155 383
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 47 501 81 535
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 35 535 108 541
-rect 35 501 47 535
-rect 81 501 108 535
-rect 35 495 108 501
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 64 518 64 518 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__aoi21_l.mag b/18T_ls/sky130_osu_sc_18T_ls__aoi21_l.mag
deleted file mode 100644
index c4c7b21..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__aoi21_l.mag
+++ /dev/null
@@ -1,197 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864591
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< nmos >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 250 115 280 263
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 235 315
-rect 182 131 193 267
-rect 227 263 235 267
-rect 227 131 250 263
-rect 182 115 250 131
-rect 280 199 333 263
-rect 280 131 291 199
-rect 325 131 333 199
-rect 280 115 333 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 617 166 861
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1201 335 1217
-rect 282 725 293 1201
-rect 327 725 335 1201
-rect 282 617 335 725
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 291 131 325 199
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 861 155 1201
-rect 207 793 241 1201
-rect 293 725 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 580 110 617
-rect 44 570 110 580
-rect 44 536 60 570
-rect 94 536 110 570
-rect 44 526 110 536
-rect 44 370 74 526
-rect 166 484 196 617
-rect 252 579 282 617
-rect 252 549 309 579
-rect 134 468 196 484
-rect 134 434 146 468
-rect 180 434 196 468
-rect 134 418 196 434
-rect 44 338 110 370
-rect 80 315 110 338
-rect 152 315 182 418
-rect 279 405 309 549
-rect 279 389 333 405
-rect 279 371 289 389
-rect 250 355 289 371
-rect 323 355 333 389
-rect 250 339 333 355
-rect 250 263 280 339
-rect 80 89 110 115
-rect 152 89 182 115
-rect 250 89 280 115
-<< polycont >>
-rect 60 536 94 570
-rect 146 434 180 468
-rect 289 355 323 389
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 207 1201 241 1217
-rect 69 793 207 811
-rect 35 777 241 793
-rect 293 1201 327 1217
-rect 60 570 94 649
-rect 60 520 94 536
-rect 128 484 162 575
-rect 128 468 180 484
-rect 128 434 146 468
-rect 128 418 180 434
-rect 216 389 250 501
-rect 293 461 327 725
-rect 216 355 289 389
-rect 323 355 339 389
-rect 35 267 69 283
-rect 35 61 69 131
-rect 193 267 227 279
-rect 193 115 227 131
-rect 291 199 325 215
-rect 291 61 325 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 60 649 94 683
-rect 128 575 162 609
-rect 216 501 250 535
-rect 293 427 327 461
-rect 193 279 227 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 48 683 106 689
-rect 48 649 60 683
-rect 94 649 128 683
-rect 48 643 106 649
-rect 116 609 174 615
-rect 116 575 128 609
-rect 162 575 196 609
-rect 116 569 174 575
-rect 204 535 262 541
-rect 182 501 216 535
-rect 250 501 262 535
-rect 204 495 262 501
-rect 281 461 339 467
-rect 281 427 293 461
-rect 327 427 339 461
-rect 281 421 339 427
-rect 181 313 239 319
-rect 293 313 327 421
-rect 181 279 193 313
-rect 227 279 327 313
-rect 181 273 239 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 77 666 77 666 1 A0
-port 1 n
-rlabel metal1 233 518 233 518 1 B0
-port 2 n
-rlabel metal1 310 414 310 414 1 Y
-port 3 n
-rlabel metal1 145 592 145 592 1 A1
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__aoi22_l.mag b/18T_ls/sky130_osu_sc_18T_ls__aoi22_l.mag
deleted file mode 100644
index 887c10d..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__aoi22_l.mag
+++ /dev/null
@@ -1,238 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864591
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 462 1341
-<< nmos >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 324 115 354 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 200 267
-rect 234 131 252 267
-rect 182 115 252 131
-rect 282 115 324 315
-rect 354 267 407 315
-rect 354 131 365 267
-rect 399 131 407 267
-rect 354 115 407 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 617 166 861
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1133 338 1217
-rect 282 793 293 1133
-rect 327 793 338 1133
-rect 282 617 338 793
-rect 368 1201 421 1217
-rect 368 793 379 1201
-rect 413 793 421 1201
-rect 368 617 421 793
-<< ndiffc >>
-rect 35 131 69 267
-rect 200 131 234 267
-rect 365 131 399 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 861 155 1201
-rect 207 793 241 1201
-rect 293 793 327 1133
-rect 379 793 413 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1243
-rect 80 580 110 617
-rect 44 570 110 580
-rect 44 536 60 570
-rect 94 536 110 570
-rect 44 526 110 536
-rect 44 370 74 526
-rect 166 514 196 617
-rect 152 484 196 514
-rect 116 468 182 484
-rect 116 434 128 468
-rect 162 434 182 468
-rect 116 418 182 434
-rect 44 338 110 370
-rect 80 315 110 338
-rect 152 315 182 418
-rect 252 413 282 617
-rect 338 478 368 617
-rect 338 462 416 478
-rect 338 434 370 462
-rect 224 397 282 413
-rect 224 363 234 397
-rect 268 363 282 397
-rect 224 347 282 363
-rect 252 315 282 347
-rect 324 428 370 434
-rect 404 428 416 462
-rect 324 412 416 428
-rect 324 404 368 412
-rect 324 315 354 404
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-rect 324 89 354 115
-<< polycont >>
-rect 60 536 94 570
-rect 128 434 162 468
-rect 234 363 268 397
-rect 370 428 404 462
-<< locali >>
-rect 0 1311 462 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 462 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 207 1201 413 1217
-rect 69 793 207 811
-rect 241 1183 379 1201
-rect 35 777 241 793
-rect 293 1133 327 1149
-rect 60 570 94 649
-rect 293 666 327 793
-rect 379 777 413 793
-rect 293 632 336 666
-rect 60 520 94 536
-rect 128 468 162 575
-rect 128 418 162 434
-rect 216 413 250 501
-rect 216 397 268 413
-rect 216 363 234 397
-rect 234 347 268 363
-rect 302 387 336 632
-rect 370 462 404 478
-rect 370 412 404 428
-rect 35 267 69 283
-rect 35 61 69 131
-rect 200 267 234 279
-rect 200 115 234 131
-rect 365 267 399 283
-rect 365 61 399 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 60 649 94 683
-rect 128 575 162 609
-rect 216 501 250 535
-rect 370 428 404 462
-rect 302 353 336 387
-rect 200 279 234 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 462 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 462 1311
-rect 0 1271 462 1277
-rect 48 683 106 689
-rect 48 649 60 683
-rect 94 649 128 683
-rect 48 643 106 649
-rect 116 609 174 615
-rect 116 575 128 609
-rect 162 575 196 609
-rect 116 569 174 575
-rect 204 535 262 541
-rect 182 501 216 535
-rect 250 501 262 535
-rect 204 495 262 501
-rect 358 462 416 468
-rect 336 428 370 462
-rect 404 428 416 462
-rect 358 422 416 428
-rect 290 387 348 393
-rect 290 353 302 387
-rect 336 353 348 387
-rect 290 347 348 353
-rect 188 313 246 319
-rect 304 313 338 347
-rect 188 279 200 313
-rect 234 279 338 313
-rect 188 273 246 279
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 77 666 77 666 1 A0
-port 1 n
-rlabel metal1 233 518 233 518 1 B0
-port 2 n
-rlabel viali 145 592 145 592 1 A1
-port 4 n
-rlabel viali 387 445 387 445 1 B1
-rlabel metal1 321 340 321 340 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__buf_1.mag b/18T_ls/sky130_osu_sc_18T_ls__buf_1.mag
deleted file mode 100644
index f536d74..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__buf_1.mag
+++ /dev/null
@@ -1,156 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864591
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 288 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 249 315
-rect 196 131 207 267
-rect 241 131 249 267
-rect 196 115 249 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 249 1217
-rect 196 657 207 1201
-rect 241 657 249 1201
-rect 196 617 249 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 207 657 241 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 80 529 110 617
-rect 166 602 196 617
-rect 166 572 251 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 315 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 370 251 404
-rect 166 354 251 370
-rect 166 315 196 354
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 110 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 404 69 657
-rect 110 513 144 649
-rect 207 609 241 657
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 267 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 207 267 241 279
-rect 207 115 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 110 649 144 683
-rect 207 575 241 609
-rect 207 279 241 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 195 575 207 609
-rect 241 575 253 609
-rect 195 569 253 575
-rect 207 319 241 569
-rect 195 313 253 319
-rect 195 279 207 313
-rect 241 279 253 313
-rect 195 273 253 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 213 455 213 455 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__buf_2.mag b/18T_ls/sky130_osu_sc_18T_ls__buf_2.mag
deleted file mode 100644
index 5953f64..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__buf_2.mag
+++ /dev/null
@@ -1,177 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864591
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 376 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 335 315
-rect 282 131 293 267
-rect 327 131 335 267
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 335 1217
-rect 282 657 293 1201
-rect 327 657 335 1201
-rect 282 617 335 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1244
-rect 80 529 110 617
-rect 166 602 196 617
-rect 252 602 282 617
-rect 166 572 282 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 315 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 384 251 404
-rect 210 370 282 384
-rect 166 354 282 370
-rect 166 315 196 354
-rect 252 315 282 354
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 110 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 404 69 657
-rect 110 513 144 649
-rect 207 609 241 657
-rect 293 1201 327 1271
-rect 293 641 327 657
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 267 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 207 267 241 279
-rect 207 115 241 131
-rect 293 267 327 283
-rect 293 61 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 110 649 144 683
-rect 207 575 241 609
-rect 207 279 241 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 195 575 207 609
-rect 241 575 253 609
-rect 195 569 253 575
-rect 207 319 241 569
-rect 195 313 253 319
-rect 195 279 207 313
-rect 241 279 253 313
-rect 195 273 253 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 211 454 211 454 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__buf_4.mag b/18T_ls/sky130_osu_sc_18T_ls__buf_4.mag
deleted file mode 100644
index 21efee1..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__buf_4.mag
+++ /dev/null
@@ -1,242 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864592
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 552 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 507 315
-rect 454 131 465 267
-rect 499 131 507 267
-rect 454 115 507 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 507 1217
-rect 454 657 465 1201
-rect 499 657 507 1201
-rect 454 617 507 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1244
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 80 529 110 617
-rect 166 602 196 617
-rect 252 602 282 617
-rect 338 602 368 617
-rect 424 602 454 617
-rect 166 572 454 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 315 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 384 251 404
-rect 210 370 454 384
-rect 166 354 454 370
-rect 166 315 196 354
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-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 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1311 550 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 550 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 404 69 657
-rect 110 513 144 649
-rect 207 609 241 657
-rect 293 1201 327 1271
-rect 293 641 327 657
-rect 379 1201 413 1217
-rect 379 609 413 657
-rect 465 1201 499 1271
-rect 465 641 499 657
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 267 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 267 155 283
-rect 35 61 69 62
-rect 121 61 155 131
-rect 207 267 241 279
-rect 207 115 241 131
-rect 293 267 327 283
-rect 207 61 241 62
-rect 293 61 327 131
-rect 379 267 413 279
-rect 379 115 413 131
-rect 465 267 499 283
-rect 465 61 499 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 110 649 144 683
-rect 207 575 241 609
-rect 379 575 413 609
-rect 207 279 241 313
-rect 379 279 413 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 550 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 550 1311
-rect 0 1271 550 1277
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 367 609 425 615
-rect 195 575 207 609
-rect 241 575 379 609
-rect 413 575 425 609
-rect 195 569 253 575
-rect 367 569 425 575
-rect 207 319 241 569
-rect 379 319 413 569
-rect 195 313 253 319
-rect 367 313 425 319
-rect 195 279 207 313
-rect 241 279 379 313
-rect 413 279 425 313
-rect 195 273 253 279
-rect 367 273 425 279
-rect 0 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 211 454 211 454 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__buf_6.mag b/18T_ls/sky130_osu_sc_18T_ls__buf_6.mag
deleted file mode 100644
index 259b3ea..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__buf_6.mag
+++ /dev/null
@@ -1,284 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598479240
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 581 728 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 679 315
-rect 626 131 637 267
-rect 671 131 679 267
-rect 626 115 679 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 679 1217
-rect 626 657 637 1201
-rect 671 657 679 1201
-rect 626 617 679 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1244
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 80 529 110 617
-rect 166 602 196 617
-rect 252 602 282 617
-rect 338 602 368 617
-rect 424 602 454 617
-rect 510 602 540 617
-rect 596 602 626 617
-rect 166 572 626 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 315 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 384 251 404
-rect 510 384 540 572
-rect 210 370 626 384
-rect 166 354 626 370
-rect 166 315 196 354
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-rect 596 315 626 354
-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 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1305 726 1332
-rect 0 1271 51 1305
-rect 85 1271 187 1305
-rect 221 1271 323 1305
-rect 357 1271 459 1305
-rect 493 1271 595 1305
-rect 629 1271 726 1305
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 404 69 657
-rect 110 513 144 649
-rect 207 609 241 657
-rect 293 1201 327 1271
-rect 293 641 327 657
-rect 379 1201 413 1217
-rect 379 609 413 657
-rect 465 1201 499 1271
-rect 465 641 499 657
-rect 551 1201 585 1217
-rect 551 609 585 657
-rect 637 1201 671 1271
-rect 637 641 671 657
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 267 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 207 267 241 279
-rect 207 115 241 131
-rect 293 267 327 283
-rect 293 61 327 131
-rect 379 267 413 279
-rect 379 115 413 131
-rect 465 267 499 283
-rect 465 61 499 131
-rect 551 267 585 279
-rect 551 115 585 131
-rect 637 267 671 283
-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 649 144 683
-rect 207 575 241 609
-rect 379 575 413 609
-rect 551 575 585 609
-rect 207 279 241 313
-rect 379 279 413 313
-rect 551 279 585 313
-<< metal1 >>
-rect 0 1271 726 1332
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 367 609 425 615
-rect 539 609 597 615
-rect 195 575 207 609
-rect 241 575 379 609
-rect 413 575 551 609
-rect 585 575 597 609
-rect 195 569 253 575
-rect 367 569 425 575
-rect 539 569 597 575
-rect 207 319 241 569
-rect 379 319 413 569
-rect 551 319 585 569
-rect 195 313 253 319
-rect 367 313 425 319
-rect 539 313 597 319
-rect 195 279 207 313
-rect 241 279 379 313
-rect 413 279 551 313
-rect 585 279 597 313
-rect 195 273 253 279
-rect 367 273 425 279
-rect 539 273 597 279
-rect 0 0 726 61
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 211 454 211 454 1 Y
-port 2 n
-rlabel metal1 68 44 68 44 1 gnd
-rlabel metal1 68 1288 68 1288 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__buf_8.mag b/18T_ls/sky130_osu_sc_18T_ls__buf_8.mag
deleted file mode 100644
index 795d1ad..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__buf_8.mag
+++ /dev/null
@@ -1,381 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864592
-<< checkpaint >>
-rect -1209 -1243 2025 2575
-<< nwell >>
-rect -9 581 904 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-rect 768 115 798 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-rect 768 617 798 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 768 315
-rect 712 131 723 267
-rect 757 131 768 267
-rect 712 115 768 131
-rect 798 267 851 315
-rect 798 131 809 267
-rect 843 131 851 267
-rect 798 115 851 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 768 1217
-rect 712 657 723 1201
-rect 757 657 768 1201
-rect 712 617 768 657
-rect 798 1201 851 1217
-rect 798 657 809 1201
-rect 843 657 851 1201
-rect 798 617 851 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-rect 809 131 843 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-rect 809 657 843 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1244
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 768 1217 798 1243
-rect 80 529 110 617
-rect 166 602 196 617
-rect 252 602 282 617
-rect 338 602 368 617
-rect 424 602 454 617
-rect 510 602 540 617
-rect 596 602 626 617
-rect 682 602 712 617
-rect 768 602 798 617
-rect 166 572 798 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 315 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 384 251 404
-rect 510 384 540 572
-rect 210 370 798 384
-rect 166 354 798 370
-rect 166 315 196 354
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-rect 596 315 626 354
-rect 682 315 712 354
-rect 768 315 798 354
-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 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1311 902 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 902 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 404 69 657
-rect 110 513 144 649
-rect 207 609 241 657
-rect 293 1201 327 1271
-rect 293 641 327 657
-rect 379 1201 413 1217
-rect 379 609 413 657
-rect 465 1201 499 1271
-rect 465 641 499 657
-rect 551 1201 585 1217
-rect 551 609 585 657
-rect 637 1201 671 1271
-rect 637 641 671 657
-rect 723 1201 757 1217
-rect 723 609 757 657
-rect 809 1201 843 1271
-rect 809 641 843 657
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 267 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 207 267 241 279
-rect 207 115 241 131
-rect 293 267 327 283
-rect 293 61 327 131
-rect 379 267 413 279
-rect 379 115 413 131
-rect 465 267 499 283
-rect 465 61 499 131
-rect 551 267 585 279
-rect 551 115 585 131
-rect 637 267 671 283
-rect 637 61 671 131
-rect 723 267 757 279
-rect 723 115 757 131
-rect 809 267 843 283
-rect 809 61 843 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 902 61
-rect 0 0 902 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 110 649 144 683
-rect 207 575 241 609
-rect 379 575 413 609
-rect 551 575 585 609
-rect 723 575 757 609
-rect 207 279 241 313
-rect 379 279 413 313
-rect 551 279 585 313
-rect 723 279 757 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1311 902 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 902 1311
-rect 0 1271 902 1277
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 367 609 425 615
-rect 539 609 597 615
-rect 711 609 769 615
-rect 195 575 207 609
-rect 241 575 379 609
-rect 413 575 551 609
-rect 585 575 723 609
-rect 757 575 769 609
-rect 195 569 253 575
-rect 367 569 425 575
-rect 539 569 597 575
-rect 711 569 769 575
-rect 207 319 241 569
-rect 379 319 413 569
-rect 551 319 585 569
-rect 723 319 757 569
-rect 195 313 253 319
-rect 367 313 425 319
-rect 539 313 597 319
-rect 711 313 769 319
-rect 195 279 207 313
-rect 241 279 379 313
-rect 413 279 551 313
-rect 585 279 723 313
-rect 757 279 769 313
-rect 195 273 253 279
-rect 367 273 425 279
-rect 539 273 597 279
-rect 711 273 769 279
-rect 0 55 902 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 902 55
-rect 0 0 902 21
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 211 454 211 454 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__buf_l.mag b/18T_ls/sky130_osu_sc_18T_ls__buf_l.mag
deleted file mode 100644
index f8d74ee..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__buf_l.mag
+++ /dev/null
@@ -1,156 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864592
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 288 1341
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-<< pmoshvt >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 166 263
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 199 249 263
-rect 196 131 207 199
-rect 241 131 249 199
-rect 196 115 249 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 817 166 861
-rect 196 1201 249 1217
-rect 196 861 207 1201
-rect 241 861 249 1201
-rect 196 817 249 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-rect 207 131 241 199
-<< pdiffc >>
-rect 35 861 69 1201
-rect 121 861 155 1201
-rect 207 861 241 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 80 529 110 817
-rect 166 602 196 817
-rect 166 572 251 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 263 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 370 251 404
-rect 166 354 251 370
-rect 166 263 196 354
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 110 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1217
-rect 35 404 69 861
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 207 1201 241 1217
-rect 110 513 144 649
-rect 207 609 241 861
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 199 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 207 199 241 279
-rect 207 115 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 110 649 144 683
-rect 207 575 241 609
-rect 207 279 241 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 195 575 207 609
-rect 241 575 253 609
-rect 195 569 253 575
-rect 207 319 241 569
-rect 195 313 253 319
-rect 195 279 207 313
-rect 241 279 253 313
-rect 195 273 253 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 214 452 214 452 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__decap_1.mag b/18T_ls/sky130_osu_sc_18T_ls__decap_1.mag
deleted file mode 100644
index 43d00a1..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__decap_1.mag
+++ /dev/null
@@ -1,83 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864592
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< nmos >>
-rect 80 115 110 451
-<< pmoshvt >>
-rect 80 817 110 1217
-<< ndiff >>
-rect 27 403 80 451
-rect 27 131 35 403
-rect 69 131 80 403
-rect 27 115 80 131
-rect 110 403 163 451
-rect 110 131 121 403
-rect 155 131 163 403
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 1201 163 1217
-rect 110 861 121 1201
-rect 155 861 163 1201
-rect 110 817 163 861
-<< ndiffc >>
-rect 35 131 69 403
-rect 121 131 155 403
-<< pdiffc >>
-rect 35 861 69 1201
-rect 121 861 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 451 110 817
-rect 80 80 110 115
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 845 69 861
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 35 403 69 419
-rect 35 61 69 131
-rect 121 403 155 419
-rect 121 61 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__decap_l.mag b/18T_ls/sky130_osu_sc_18T_ls__decap_l.mag
deleted file mode 100644
index 7b3de16..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__decap_l.mag
+++ /dev/null
@@ -1,83 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864593
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< nmos >>
-rect 80 115 110 315
-<< pmoshvt >>
-rect 80 1017 110 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 1065 35 1201
-rect 69 1065 80 1201
-rect 27 1017 80 1065
-rect 110 1201 163 1217
-rect 110 1065 121 1201
-rect 155 1065 163 1201
-rect 110 1017 163 1065
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-<< pdiffc >>
-rect 35 1065 69 1201
-rect 121 1065 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 315 110 1017
-rect 80 80 110 115
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 1049 69 1065
-rect 121 1201 155 1271
-rect 121 1049 155 1065
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__dff_1.mag b/18T_ls/sky130_osu_sc_18T_ls__dff_1.mag
deleted file mode 100644
index 82e7d1a..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__dff_1.mag
+++ /dev/null
@@ -1,634 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864593
-<< checkpaint >>
-rect -1209 -1243 2569 2575
-<< nwell >>
-rect -9 581 1456 1341
-<< nmos >>
-rect 85 115 115 315
-rect 171 115 201 315
-rect 243 115 273 315
-rect 363 115 393 315
-rect 435 115 465 315
-rect 521 115 551 315
-rect 593 115 623 315
-rect 713 115 743 315
-rect 785 115 815 315
-rect 871 115 901 315
-rect 1061 115 1091 315
-rect 1251 115 1281 315
-rect 1337 115 1367 315
-<< pmoshvt >>
-rect 85 617 115 1217
-rect 171 617 201 1217
-rect 243 617 273 1217
-rect 363 617 393 1217
-rect 435 617 465 1217
-rect 521 617 551 1217
-rect 593 617 623 1217
-rect 713 617 743 1217
-rect 785 617 815 1217
-rect 871 617 901 1217
-rect 1061 617 1091 1217
-rect 1251 617 1281 1217
-rect 1337 617 1367 1217
-<< ndiff >>
-rect 32 267 85 315
-rect 32 131 40 267
-rect 74 131 85 267
-rect 32 115 85 131
-rect 115 267 171 315
-rect 115 131 126 267
-rect 160 131 171 267
-rect 115 115 171 131
-rect 201 115 243 315
-rect 273 267 363 315
-rect 273 131 284 267
-rect 352 131 363 267
-rect 273 115 363 131
-rect 393 115 435 315
-rect 465 199 521 315
-rect 465 131 476 199
-rect 510 131 521 199
-rect 465 115 521 131
-rect 551 115 593 315
-rect 623 267 713 315
-rect 623 131 634 267
-rect 702 131 713 267
-rect 623 115 713 131
-rect 743 115 785 315
-rect 815 267 871 315
-rect 815 131 826 267
-rect 860 131 871 267
-rect 815 115 871 131
-rect 901 267 954 315
-rect 901 131 912 267
-rect 946 131 954 267
-rect 901 115 954 131
-rect 1008 267 1061 315
-rect 1008 131 1016 267
-rect 1050 131 1061 267
-rect 1008 115 1061 131
-rect 1091 267 1144 315
-rect 1091 131 1102 267
-rect 1136 131 1144 267
-rect 1091 115 1144 131
-rect 1198 267 1251 315
-rect 1198 131 1206 267
-rect 1240 131 1251 267
-rect 1198 115 1251 131
-rect 1281 267 1337 315
-rect 1281 131 1292 267
-rect 1326 131 1337 267
-rect 1281 115 1337 131
-rect 1367 267 1420 315
-rect 1367 131 1378 267
-rect 1412 131 1420 267
-rect 1367 115 1420 131
-<< pdiff >>
-rect 32 1201 85 1217
-rect 32 657 40 1201
-rect 74 657 85 1201
-rect 32 617 85 657
-rect 115 1201 171 1217
-rect 115 725 126 1201
-rect 160 725 171 1201
-rect 115 617 171 725
-rect 201 617 243 1217
-rect 273 1201 363 1217
-rect 273 657 284 1201
-rect 352 657 363 1201
-rect 273 617 363 657
-rect 393 617 435 1217
-rect 465 1201 521 1217
-rect 465 725 476 1201
-rect 510 725 521 1201
-rect 465 617 521 725
-rect 551 617 593 1217
-rect 623 1201 713 1217
-rect 623 657 634 1201
-rect 702 657 713 1201
-rect 623 617 713 657
-rect 743 617 785 1217
-rect 815 1201 871 1217
-rect 815 657 826 1201
-rect 860 657 871 1201
-rect 815 617 871 657
-rect 901 1201 954 1217
-rect 901 657 912 1201
-rect 946 657 954 1201
-rect 901 617 954 657
-rect 1008 1201 1061 1217
-rect 1008 725 1016 1201
-rect 1050 725 1061 1201
-rect 1008 617 1061 725
-rect 1091 1201 1144 1217
-rect 1091 657 1102 1201
-rect 1136 657 1144 1201
-rect 1091 617 1144 657
-rect 1198 1201 1251 1217
-rect 1198 657 1206 1201
-rect 1240 657 1251 1201
-rect 1198 617 1251 657
-rect 1281 1201 1337 1217
-rect 1281 657 1292 1201
-rect 1326 657 1337 1201
-rect 1281 617 1337 657
-rect 1367 1201 1420 1217
-rect 1367 657 1378 1201
-rect 1412 657 1420 1201
-rect 1367 617 1420 657
-<< ndiffc >>
-rect 40 131 74 267
-rect 126 131 160 267
-rect 284 131 352 267
-rect 476 131 510 199
-rect 634 131 702 267
-rect 826 131 860 267
-rect 912 131 946 267
-rect 1016 131 1050 267
-rect 1102 131 1136 267
-rect 1206 131 1240 267
-rect 1292 131 1326 267
-rect 1378 131 1412 267
-<< pdiffc >>
-rect 40 657 74 1201
-rect 126 725 160 1201
-rect 284 657 352 1201
-rect 476 725 510 1201
-rect 634 657 702 1201
-rect 826 657 860 1201
-rect 912 657 946 1201
-rect 1016 725 1050 1201
-rect 1102 657 1136 1201
-rect 1206 657 1240 1201
-rect 1292 657 1326 1201
-rect 1378 657 1412 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-rect 979 1271 1003 1305
-rect 1037 1271 1061 1305
-rect 1115 1271 1139 1305
-rect 1173 1271 1197 1305
-rect 1251 1271 1275 1305
-rect 1309 1271 1333 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-rect 1003 1271 1037 1305
-rect 1139 1271 1173 1305
-rect 1275 1271 1309 1305
-<< poly >>
-rect 85 1217 115 1243
-rect 171 1217 201 1243
-rect 243 1217 273 1243
-rect 363 1217 393 1243
-rect 435 1217 465 1243
-rect 521 1217 551 1243
-rect 593 1217 623 1243
-rect 713 1217 743 1243
-rect 785 1217 815 1243
-rect 871 1217 901 1243
-rect 1061 1217 1091 1243
-rect 1251 1217 1281 1243
-rect 1337 1217 1367 1243
-rect 85 586 115 617
-rect 75 570 129 586
-rect 75 536 85 570
-rect 119 536 129 570
-rect 75 520 129 536
-rect 75 374 105 520
-rect 171 477 201 617
-rect 243 586 273 617
-rect 243 570 297 586
-rect 243 536 253 570
-rect 287 536 297 570
-rect 243 520 297 536
-rect 171 461 225 477
-rect 363 475 393 617
-rect 435 580 465 617
-rect 521 580 551 617
-rect 435 570 551 580
-rect 435 536 467 570
-rect 501 536 551 570
-rect 435 526 551 536
-rect 593 475 623 617
-rect 713 586 743 617
-rect 689 570 743 586
-rect 689 536 699 570
-rect 733 536 743 570
-rect 689 520 743 536
-rect 171 427 181 461
-rect 215 427 225 461
-rect 171 411 225 427
-rect 267 445 719 475
-rect 75 344 115 374
-rect 85 315 115 344
-rect 171 315 201 411
-rect 267 367 297 445
-rect 689 403 719 445
-rect 785 471 815 617
-rect 871 586 901 617
-rect 871 570 942 586
-rect 871 556 898 570
-rect 882 536 898 556
-rect 932 536 942 570
-rect 882 520 942 536
-rect 785 455 839 471
-rect 785 421 795 455
-rect 829 421 839 455
-rect 785 405 839 421
-rect 243 337 297 367
-rect 339 387 393 403
-rect 339 353 349 387
-rect 383 353 393 387
-rect 339 337 393 353
-rect 243 315 273 337
-rect 363 315 393 337
-rect 435 387 551 397
-rect 435 353 467 387
-rect 501 353 551 387
-rect 435 343 551 353
-rect 435 315 465 343
-rect 521 315 551 343
-rect 593 387 647 403
-rect 593 353 603 387
-rect 637 353 647 387
-rect 593 337 647 353
-rect 689 387 743 403
-rect 689 353 699 387
-rect 733 353 743 387
-rect 689 337 743 353
-rect 593 315 623 337
-rect 713 315 743 337
-rect 785 315 815 405
-rect 882 367 912 520
-rect 1061 403 1091 617
-rect 1251 601 1281 617
-rect 1241 571 1281 601
-rect 1241 471 1271 571
-rect 1337 512 1367 617
-rect 1216 455 1271 471
-rect 1216 421 1226 455
-rect 1260 421 1271 455
-rect 1313 496 1367 512
-rect 1313 462 1323 496
-rect 1357 462 1367 496
-rect 1313 446 1367 462
-rect 1216 405 1271 421
-rect 871 337 912 367
-rect 1008 387 1091 403
-rect 1008 353 1018 387
-rect 1052 353 1091 387
-rect 1008 337 1091 353
-rect 871 315 901 337
-rect 1061 315 1091 337
-rect 1241 360 1271 405
-rect 1241 330 1281 360
-rect 1251 315 1281 330
-rect 1337 315 1367 446
-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 536 119 570
-rect 253 536 287 570
-rect 467 536 501 570
-rect 699 536 733 570
-rect 181 427 215 461
-rect 898 536 932 570
-rect 795 421 829 455
-rect 349 353 383 387
-rect 467 353 501 387
-rect 603 353 637 387
-rect 699 353 733 387
-rect 1226 421 1260 455
-rect 1323 462 1357 496
-rect 1018 353 1052 387
-<< locali >>
-rect 0 1311 1452 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 1003 1311
-rect 1037 1271 1139 1311
-rect 1173 1271 1275 1311
-rect 1309 1271 1452 1311
-rect 40 1201 74 1217
-rect 17 657 40 669
-rect 126 1201 160 1271
-rect 126 709 160 725
-rect 284 1201 352 1217
-rect 17 628 74 657
-rect 476 1201 510 1271
-rect 476 709 510 725
-rect 634 1201 702 1217
-rect 352 657 355 675
-rect 284 654 355 657
-rect 634 654 702 657
-rect 17 387 51 628
-rect 108 620 355 654
-rect 535 620 702 654
-rect 826 1201 860 1271
-rect 826 641 860 657
-rect 912 1201 946 1217
-rect 1016 1201 1050 1271
-rect 1016 709 1050 725
-rect 1102 1201 1136 1217
-rect 912 654 946 657
-rect 912 620 1000 654
-rect 108 586 142 620
-rect 85 570 142 586
-rect 119 536 142 570
-rect 85 520 142 536
-rect 17 353 40 387
-rect 17 332 74 353
-rect 108 370 142 520
-rect 253 570 287 586
-rect 253 535 287 536
-rect 467 570 501 586
-rect 287 501 383 535
-rect 181 461 215 477
-rect 181 411 215 427
-rect 349 387 383 501
-rect 467 387 501 536
-rect 108 336 315 370
-rect 349 337 383 353
-rect 467 337 501 353
-rect 535 387 569 620
-rect 699 570 733 586
-rect 699 535 733 536
-rect 40 267 74 332
-rect 281 283 315 336
-rect 535 303 569 353
-rect 603 501 699 535
-rect 898 570 932 586
-rect 898 535 932 536
-rect 603 387 637 501
-rect 966 455 1000 620
-rect 779 421 795 455
-rect 829 421 845 455
-rect 912 421 1000 455
-rect 1102 455 1136 657
-rect 1206 1201 1240 1217
-rect 1206 609 1240 657
-rect 1292 1201 1326 1271
-rect 1292 641 1326 657
-rect 1378 1201 1412 1217
-rect 1412 649 1435 666
-rect 1378 632 1435 649
-rect 1206 570 1240 575
-rect 1206 536 1357 570
-rect 1323 496 1357 536
-rect 1102 421 1226 455
-rect 1260 421 1276 455
-rect 912 387 946 421
-rect 683 353 699 387
-rect 733 353 946 387
-rect 1002 353 1018 387
-rect 1052 353 1068 387
-rect 603 337 637 353
-rect 40 115 74 131
-rect 126 267 160 283
-rect 281 267 352 283
-rect 535 269 702 303
-rect 281 249 284 267
-rect 126 61 160 131
-rect 634 267 702 269
-rect 284 115 352 131
-rect 476 199 510 215
-rect 476 61 510 131
-rect 634 115 702 131
-rect 826 267 860 283
-rect 826 61 860 131
-rect 912 267 946 353
-rect 912 115 946 131
-rect 1016 267 1050 283
-rect 1016 61 1050 131
-rect 1102 267 1136 421
-rect 1323 387 1357 462
-rect 1102 115 1136 131
-rect 1206 353 1357 387
-rect 1206 267 1240 353
-rect 1401 322 1435 632
-rect 1378 286 1435 322
-rect 1206 115 1240 131
-rect 1292 267 1326 283
-rect 1292 61 1326 131
-rect 1378 267 1412 286
-rect 1378 115 1412 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 1003 1305 1037 1311
-rect 1003 1277 1037 1305
-rect 1139 1305 1173 1311
-rect 1139 1277 1173 1305
-rect 1275 1305 1309 1311
-rect 1275 1277 1309 1305
-rect 40 353 74 387
-rect 253 501 287 535
-rect 181 427 215 461
-rect 449 353 467 387
-rect 467 353 483 387
-rect 535 353 569 387
-rect 699 501 733 535
-rect 898 501 932 535
-rect 795 421 829 455
-rect 1378 657 1412 683
-rect 1378 649 1412 657
-rect 1206 575 1240 609
-rect 1226 421 1260 455
-rect 1018 353 1052 387
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1311 1452 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 1003 1311
-rect 1037 1277 1139 1311
-rect 1173 1277 1275 1311
-rect 1309 1277 1452 1311
-rect 0 1271 1452 1277
-rect 1366 683 1424 689
-rect 1343 649 1378 683
-rect 1412 649 1424 683
-rect 1366 643 1424 649
-rect 1194 609 1252 615
-rect 1172 575 1206 609
-rect 1240 575 1252 609
-rect 1194 569 1252 575
-rect 241 535 299 541
-rect 687 535 745 541
-rect 886 535 944 541
-rect 241 501 253 535
-rect 287 501 699 535
-rect 733 501 898 535
-rect 932 501 944 535
-rect 241 495 299 501
-rect 687 495 745 501
-rect 886 495 944 501
-rect 169 461 227 467
-rect 169 427 181 461
-rect 215 427 249 461
-rect 783 455 841 461
-rect 1214 455 1272 461
-rect 169 421 227 427
-rect 783 421 795 455
-rect 829 421 1226 455
-rect 1260 421 1272 455
-rect 783 415 841 421
-rect 1214 415 1272 421
-rect 28 387 86 393
-rect 437 387 495 393
-rect 28 353 40 387
-rect 74 353 449 387
-rect 483 353 495 387
-rect 28 347 86 353
-rect 437 347 495 353
-rect 523 387 581 393
-rect 1006 387 1064 393
-rect 523 353 535 387
-rect 569 353 1018 387
-rect 1052 353 1064 387
-rect 523 347 581 353
-rect 1006 347 1064 353
-rect 0 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel metal1 198 444 198 444 1 D
-port 1 n
-rlabel metal1 915 518 915 518 1 CK
-port 3 n
-rlabel metal1 1395 666 1395 666 1 Q
-port 4 n
-rlabel metal1 1224 592 1224 592 1 QN
-port 2 n
-rlabel viali 68 49 68 49 1 gnd
-rlabel viali 68 1285 68 1285 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__dff_l.mag b/18T_ls/sky130_osu_sc_18T_ls__dff_l.mag
deleted file mode 100644
index 1bb1cc9..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__dff_l.mag
+++ /dev/null
@@ -1,635 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864593
-<< checkpaint >>
-rect -1209 -1243 2569 2575
-<< nwell >>
-rect -9 581 1456 1341
-<< nmos >>
-rect 85 115 115 315
-rect 171 115 201 315
-rect 243 115 273 315
-rect 363 115 393 315
-rect 435 115 465 315
-rect 521 115 551 315
-rect 593 115 623 315
-rect 713 115 743 315
-rect 785 115 815 315
-rect 871 115 901 315
-rect 1061 115 1091 315
-rect 1251 115 1281 263
-rect 1337 115 1367 263
-<< pmoshvt >>
-rect 85 617 115 1217
-rect 171 617 201 1217
-rect 243 617 273 1217
-rect 363 617 393 1217
-rect 435 617 465 1217
-rect 521 617 551 1217
-rect 593 617 623 1217
-rect 713 617 743 1217
-rect 785 617 815 1217
-rect 871 617 901 1217
-rect 1061 617 1091 1217
-rect 1251 817 1281 1217
-rect 1337 817 1367 1217
-<< ndiff >>
-rect 32 267 85 315
-rect 32 131 40 267
-rect 74 131 85 267
-rect 32 115 85 131
-rect 115 267 171 315
-rect 115 131 126 267
-rect 160 131 171 267
-rect 115 115 171 131
-rect 201 115 243 315
-rect 273 267 363 315
-rect 273 131 284 267
-rect 352 131 363 267
-rect 273 115 363 131
-rect 393 115 435 315
-rect 465 199 521 315
-rect 465 131 476 199
-rect 510 131 521 199
-rect 465 115 521 131
-rect 551 115 593 315
-rect 623 267 713 315
-rect 623 131 634 267
-rect 702 131 713 267
-rect 623 115 713 131
-rect 743 115 785 315
-rect 815 267 871 315
-rect 815 131 826 267
-rect 860 131 871 267
-rect 815 115 871 131
-rect 901 267 954 315
-rect 901 131 912 267
-rect 946 131 954 267
-rect 901 115 954 131
-rect 1008 267 1061 315
-rect 1008 131 1016 267
-rect 1050 131 1061 267
-rect 1008 115 1061 131
-rect 1091 267 1144 315
-rect 1091 131 1102 267
-rect 1136 131 1144 267
-rect 1091 115 1144 131
-rect 1198 199 1251 263
-rect 1198 131 1206 199
-rect 1240 131 1251 199
-rect 1198 115 1251 131
-rect 1281 199 1337 263
-rect 1281 131 1292 199
-rect 1326 131 1337 199
-rect 1281 115 1337 131
-rect 1367 199 1420 263
-rect 1367 131 1378 199
-rect 1412 131 1420 199
-rect 1367 115 1420 131
-<< pdiff >>
-rect 32 1201 85 1217
-rect 32 657 40 1201
-rect 74 657 85 1201
-rect 32 617 85 657
-rect 115 1201 171 1217
-rect 115 725 126 1201
-rect 160 725 171 1201
-rect 115 617 171 725
-rect 201 617 243 1217
-rect 273 1201 363 1217
-rect 273 657 284 1201
-rect 352 657 363 1201
-rect 273 617 363 657
-rect 393 617 435 1217
-rect 465 1201 521 1217
-rect 465 725 476 1201
-rect 510 725 521 1201
-rect 465 617 521 725
-rect 551 617 593 1217
-rect 623 1201 713 1217
-rect 623 725 634 1201
-rect 702 725 713 1201
-rect 623 617 713 725
-rect 743 617 785 1217
-rect 815 1201 871 1217
-rect 815 657 826 1201
-rect 860 657 871 1201
-rect 815 617 871 657
-rect 901 1201 954 1217
-rect 901 657 912 1201
-rect 946 657 954 1201
-rect 901 617 954 657
-rect 1008 1201 1061 1217
-rect 1008 725 1016 1201
-rect 1050 725 1061 1201
-rect 1008 617 1061 725
-rect 1091 1201 1144 1217
-rect 1091 657 1102 1201
-rect 1136 657 1144 1201
-rect 1198 1201 1251 1217
-rect 1198 929 1206 1201
-rect 1240 929 1251 1201
-rect 1198 817 1251 929
-rect 1281 1201 1337 1217
-rect 1281 929 1292 1201
-rect 1326 929 1337 1201
-rect 1281 817 1337 929
-rect 1367 1201 1420 1217
-rect 1367 929 1378 1201
-rect 1412 929 1420 1201
-rect 1367 817 1420 929
-rect 1091 617 1144 657
-<< ndiffc >>
-rect 40 131 74 267
-rect 126 131 160 267
-rect 284 131 352 267
-rect 476 131 510 199
-rect 634 131 702 267
-rect 826 131 860 267
-rect 912 131 946 267
-rect 1016 131 1050 267
-rect 1102 131 1136 267
-rect 1206 131 1240 199
-rect 1292 131 1326 199
-rect 1378 131 1412 199
-<< pdiffc >>
-rect 40 657 74 1201
-rect 126 725 160 1201
-rect 284 657 352 1201
-rect 476 725 510 1201
-rect 634 725 702 1201
-rect 826 657 860 1201
-rect 912 657 946 1201
-rect 1016 725 1050 1201
-rect 1102 657 1136 1201
-rect 1206 929 1240 1201
-rect 1292 929 1326 1201
-rect 1378 929 1412 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-rect 979 1271 1003 1305
-rect 1037 1271 1061 1305
-rect 1115 1271 1139 1305
-rect 1173 1271 1197 1305
-rect 1251 1271 1275 1305
-rect 1309 1271 1333 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-rect 1003 1271 1037 1305
-rect 1139 1271 1173 1305
-rect 1275 1271 1309 1305
-<< poly >>
-rect 85 1217 115 1243
-rect 171 1217 201 1243
-rect 243 1217 273 1243
-rect 363 1217 393 1243
-rect 435 1217 465 1243
-rect 521 1217 551 1243
-rect 593 1217 623 1243
-rect 713 1217 743 1243
-rect 785 1217 815 1243
-rect 871 1217 901 1243
-rect 1061 1217 1091 1243
-rect 1251 1217 1281 1243
-rect 1337 1217 1367 1243
-rect 85 586 115 617
-rect 75 570 129 586
-rect 75 536 85 570
-rect 119 536 129 570
-rect 75 520 129 536
-rect 75 374 105 520
-rect 171 477 201 617
-rect 243 586 273 617
-rect 243 570 297 586
-rect 243 536 253 570
-rect 287 536 297 570
-rect 243 520 297 536
-rect 171 461 225 477
-rect 363 475 393 617
-rect 435 580 465 617
-rect 521 580 551 617
-rect 435 570 551 580
-rect 435 536 467 570
-rect 501 536 551 570
-rect 435 526 551 536
-rect 593 475 623 617
-rect 713 586 743 617
-rect 689 570 743 586
-rect 689 536 699 570
-rect 733 536 743 570
-rect 689 520 743 536
-rect 171 427 181 461
-rect 215 427 225 461
-rect 171 411 225 427
-rect 267 445 719 475
-rect 75 344 115 374
-rect 85 315 115 344
-rect 171 315 201 411
-rect 267 367 297 445
-rect 689 403 719 445
-rect 785 471 815 617
-rect 871 586 901 617
-rect 871 570 942 586
-rect 871 556 898 570
-rect 882 536 898 556
-rect 932 536 942 570
-rect 882 520 942 536
-rect 785 455 839 471
-rect 785 421 795 455
-rect 829 421 839 455
-rect 785 405 839 421
-rect 243 337 297 367
-rect 339 387 393 403
-rect 339 353 349 387
-rect 383 353 393 387
-rect 339 337 393 353
-rect 243 315 273 337
-rect 363 315 393 337
-rect 435 387 551 397
-rect 435 353 467 387
-rect 501 353 551 387
-rect 435 343 551 353
-rect 435 315 465 343
-rect 521 315 551 343
-rect 593 387 647 403
-rect 593 353 603 387
-rect 637 353 647 387
-rect 593 337 647 353
-rect 689 387 743 403
-rect 689 353 699 387
-rect 733 353 743 387
-rect 689 337 743 353
-rect 593 315 623 337
-rect 713 315 743 337
-rect 785 315 815 405
-rect 882 367 912 520
-rect 1061 403 1091 617
-rect 1251 601 1281 817
-rect 1241 571 1281 601
-rect 1241 471 1271 571
-rect 1337 512 1367 817
-rect 1216 455 1271 471
-rect 1216 421 1226 455
-rect 1260 421 1271 455
-rect 1313 496 1367 512
-rect 1313 462 1323 496
-rect 1357 462 1367 496
-rect 1313 446 1367 462
-rect 1216 405 1271 421
-rect 871 337 912 367
-rect 1008 387 1091 403
-rect 1008 353 1018 387
-rect 1052 353 1091 387
-rect 1008 337 1091 353
-rect 871 315 901 337
-rect 1061 315 1091 337
-rect 1241 360 1271 405
-rect 1241 330 1281 360
-rect 1251 263 1281 330
-rect 1337 263 1367 446
-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 536 119 570
-rect 253 536 287 570
-rect 467 536 501 570
-rect 699 536 733 570
-rect 181 427 215 461
-rect 898 536 932 570
-rect 795 421 829 455
-rect 349 353 383 387
-rect 467 353 501 387
-rect 603 353 637 387
-rect 699 353 733 387
-rect 1226 421 1260 455
-rect 1323 462 1357 496
-rect 1018 353 1052 387
-<< locali >>
-rect 0 1311 1452 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 1003 1311
-rect 1037 1271 1139 1311
-rect 1173 1271 1275 1311
-rect 1309 1271 1452 1311
-rect 40 1201 74 1217
-rect 17 657 40 669
-rect 126 1201 160 1271
-rect 126 709 160 725
-rect 284 1201 352 1217
-rect 17 635 74 657
-rect 476 1201 510 1271
-rect 476 709 510 725
-rect 634 1201 702 1217
-rect 352 657 355 675
-rect 284 654 355 657
-rect 634 654 702 725
-rect 17 387 51 635
-rect 108 620 355 654
-rect 535 620 702 654
-rect 826 1201 860 1271
-rect 826 641 860 657
-rect 912 1201 946 1217
-rect 1016 1201 1050 1271
-rect 1016 709 1050 725
-rect 1102 1201 1136 1217
-rect 912 654 946 657
-rect 912 620 1000 654
-rect 108 586 142 620
-rect 85 570 142 586
-rect 119 536 142 570
-rect 85 520 142 536
-rect 17 353 40 387
-rect 17 332 74 353
-rect 108 370 142 520
-rect 253 570 287 586
-rect 253 535 287 536
-rect 467 570 501 586
-rect 287 501 383 535
-rect 181 461 215 477
-rect 181 411 215 427
-rect 349 387 383 501
-rect 467 387 501 536
-rect 108 336 315 370
-rect 349 337 383 353
-rect 467 337 501 353
-rect 535 387 569 620
-rect 699 570 733 586
-rect 699 535 733 536
-rect 40 267 74 332
-rect 281 283 315 336
-rect 535 303 569 353
-rect 603 501 699 535
-rect 898 570 932 586
-rect 898 535 932 536
-rect 603 387 637 501
-rect 966 455 1000 620
-rect 779 421 795 455
-rect 829 421 845 455
-rect 912 421 1000 455
-rect 1102 455 1136 657
-rect 1206 1201 1240 1217
-rect 1206 609 1240 929
-rect 1292 1201 1326 1271
-rect 1292 913 1326 929
-rect 1378 1201 1412 1217
-rect 1378 683 1412 929
-rect 1411 666 1412 683
-rect 1411 649 1435 666
-rect 1378 632 1435 649
-rect 1206 570 1240 575
-rect 1206 536 1357 570
-rect 1323 496 1357 536
-rect 1102 421 1226 455
-rect 1260 421 1276 455
-rect 912 387 946 421
-rect 683 353 699 387
-rect 733 353 946 387
-rect 1002 353 1018 387
-rect 1052 353 1068 387
-rect 603 337 637 353
-rect 40 115 74 131
-rect 126 267 160 283
-rect 281 267 352 283
-rect 535 269 702 303
-rect 281 249 284 267
-rect 126 61 160 131
-rect 634 267 702 269
-rect 284 115 352 131
-rect 476 199 510 215
-rect 476 61 510 131
-rect 634 115 702 131
-rect 826 267 860 283
-rect 826 61 860 131
-rect 912 267 946 353
-rect 912 115 946 131
-rect 1016 267 1050 283
-rect 1016 61 1050 131
-rect 1102 267 1136 421
-rect 1323 387 1357 462
-rect 1102 115 1136 131
-rect 1206 353 1357 387
-rect 1206 199 1240 353
-rect 1401 320 1435 632
-rect 1378 286 1435 320
-rect 1206 115 1240 131
-rect 1292 199 1326 215
-rect 1292 61 1326 131
-rect 1378 199 1412 286
-rect 1378 115 1412 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 1003 1305 1037 1311
-rect 1003 1277 1037 1305
-rect 1139 1305 1173 1311
-rect 1139 1277 1173 1305
-rect 1275 1305 1309 1311
-rect 1275 1277 1309 1305
-rect 40 353 74 387
-rect 253 501 287 535
-rect 181 427 215 461
-rect 449 353 467 387
-rect 467 353 483 387
-rect 535 353 569 387
-rect 699 501 733 535
-rect 898 501 932 535
-rect 795 421 829 455
-rect 1377 649 1411 683
-rect 1206 575 1240 609
-rect 1226 421 1260 455
-rect 1018 353 1052 387
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1311 1452 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 1003 1311
-rect 1037 1277 1139 1311
-rect 1173 1277 1275 1311
-rect 1309 1277 1452 1311
-rect 0 1271 1452 1277
-rect 1365 683 1423 689
-rect 1343 649 1377 683
-rect 1411 649 1423 683
-rect 1365 643 1423 649
-rect 1194 609 1252 615
-rect 1172 575 1206 609
-rect 1240 575 1252 609
-rect 1194 569 1252 575
-rect 241 535 299 541
-rect 687 535 745 541
-rect 886 535 944 541
-rect 241 501 253 535
-rect 287 501 699 535
-rect 733 501 898 535
-rect 932 501 944 535
-rect 241 495 299 501
-rect 687 495 745 501
-rect 886 495 944 501
-rect 169 461 227 467
-rect 169 427 181 461
-rect 215 427 249 461
-rect 783 455 841 461
-rect 1214 455 1272 461
-rect 169 421 227 427
-rect 783 421 795 455
-rect 829 421 1226 455
-rect 1260 421 1272 455
-rect 783 415 841 421
-rect 1214 415 1272 421
-rect 28 387 86 393
-rect 437 387 495 393
-rect 28 353 40 387
-rect 74 353 449 387
-rect 483 353 495 387
-rect 28 347 86 353
-rect 437 347 495 353
-rect 523 387 581 393
-rect 1006 387 1064 393
-rect 523 353 535 387
-rect 569 353 1018 387
-rect 1052 353 1064 387
-rect 523 347 581 353
-rect 1006 347 1064 353
-rect 0 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel metal1 198 444 198 444 1 D
-port 1 n
-rlabel metal1 1394 666 1394 666 1 Q
-port 2 n
-rlabel metal1 1224 592 1224 592 1 QN
-port 3 n
-rlabel metal1 915 518 915 518 1 CK
-port 4 n
-rlabel viali 68 49 68 49 1 gnd
-rlabel viali 68 1285 68 1285 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__dffr_1.mag b/18T_ls/sky130_osu_sc_18T_ls__dffr_1.mag
deleted file mode 100644
index 5839bb5..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__dffr_1.mag
+++ /dev/null
@@ -1,807 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864593
-<< checkpaint >>
-rect -1210 -1243 3112 2575
-<< nwell >>
-rect -10 581 1917 1341
-<< nmos >>
-rect 80 115 110 315
-rect 270 115 300 263
-rect 356 115 386 263
-rect 546 115 576 315
-rect 618 115 648 315
-rect 738 115 768 315
-rect 810 115 840 315
-rect 896 115 926 315
-rect 968 115 998 315
-rect 1088 115 1118 315
-rect 1160 115 1190 315
-rect 1246 115 1276 315
-rect 1436 115 1466 263
-rect 1522 115 1552 263
-rect 1712 115 1742 315
-rect 1798 115 1828 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 270 817 300 1217
-rect 342 817 372 1217
-rect 546 617 576 1217
-rect 618 617 648 1217
-rect 738 617 768 1217
-rect 810 617 840 1217
-rect 896 617 926 1217
-rect 968 617 998 1217
-rect 1088 617 1118 1217
-rect 1160 617 1190 1217
-rect 1246 617 1276 1217
-rect 1436 817 1466 1217
-rect 1508 817 1538 1217
-rect 1712 617 1742 1217
-rect 1798 617 1828 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 493 267 546 315
-rect 110 115 163 131
-rect 217 199 270 263
-rect 217 131 225 199
-rect 259 131 270 199
-rect 217 115 270 131
-rect 300 199 356 263
-rect 300 131 311 199
-rect 345 131 356 199
-rect 300 115 356 131
-rect 386 199 439 263
-rect 386 131 397 199
-rect 431 131 439 199
-rect 386 115 439 131
-rect 493 131 501 267
-rect 535 131 546 267
-rect 493 115 546 131
-rect 576 115 618 315
-rect 648 267 738 315
-rect 648 131 659 267
-rect 727 131 738 267
-rect 648 115 738 131
-rect 768 115 810 315
-rect 840 199 896 315
-rect 840 131 851 199
-rect 885 131 896 199
-rect 840 115 896 131
-rect 926 115 968 315
-rect 998 267 1088 315
-rect 998 131 1009 267
-rect 1077 131 1088 267
-rect 998 115 1088 131
-rect 1118 115 1160 315
-rect 1190 267 1246 315
-rect 1190 131 1201 267
-rect 1235 131 1246 267
-rect 1190 115 1246 131
-rect 1276 267 1329 315
-rect 1276 131 1287 267
-rect 1321 131 1329 267
-rect 1276 115 1329 131
-rect 1383 199 1436 263
-rect 1383 131 1391 199
-rect 1425 131 1436 199
-rect 1383 115 1436 131
-rect 1466 199 1522 263
-rect 1466 131 1477 199
-rect 1511 131 1522 199
-rect 1466 115 1522 131
-rect 1552 199 1605 263
-rect 1552 131 1563 199
-rect 1597 131 1605 199
-rect 1552 115 1605 131
-rect 1659 199 1712 315
-rect 1659 131 1667 199
-rect 1701 131 1712 199
-rect 1659 115 1712 131
-rect 1742 199 1798 315
-rect 1742 131 1753 199
-rect 1787 131 1798 199
-rect 1742 115 1798 131
-rect 1828 199 1881 315
-rect 1828 131 1839 199
-rect 1873 131 1881 199
-rect 1828 115 1881 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 217 1201 270 1217
-rect 217 861 225 1201
-rect 259 861 270 1201
-rect 217 817 270 861
-rect 300 817 342 1217
-rect 372 1201 425 1217
-rect 372 861 383 1201
-rect 417 861 425 1201
-rect 372 817 425 861
-rect 493 1201 546 1217
-rect 110 617 163 657
-rect 493 725 501 1201
-rect 535 725 546 1201
-rect 493 617 546 725
-rect 576 617 618 1217
-rect 648 1201 738 1217
-rect 648 657 659 1201
-rect 727 657 738 1201
-rect 648 617 738 657
-rect 768 617 810 1217
-rect 840 1201 896 1217
-rect 840 725 851 1201
-rect 885 725 896 1201
-rect 840 617 896 725
-rect 926 617 968 1217
-rect 998 1201 1088 1217
-rect 998 725 1009 1201
-rect 1077 725 1088 1201
-rect 998 617 1088 725
-rect 1118 617 1160 1217
-rect 1190 1201 1246 1217
-rect 1190 657 1201 1201
-rect 1235 657 1246 1201
-rect 1190 617 1246 657
-rect 1276 1201 1329 1217
-rect 1276 657 1287 1201
-rect 1321 657 1329 1201
-rect 1383 1201 1436 1217
-rect 1383 861 1391 1201
-rect 1425 861 1436 1201
-rect 1383 817 1436 861
-rect 1466 817 1508 1217
-rect 1538 1201 1591 1217
-rect 1538 861 1549 1201
-rect 1583 861 1591 1201
-rect 1538 817 1591 861
-rect 1659 1201 1712 1217
-rect 1659 861 1667 1201
-rect 1701 861 1712 1201
-rect 1276 617 1329 657
-rect 1659 617 1712 861
-rect 1742 1201 1798 1217
-rect 1742 861 1753 1201
-rect 1787 861 1798 1201
-rect 1742 617 1798 861
-rect 1828 1201 1881 1217
-rect 1828 861 1839 1201
-rect 1873 861 1881 1201
-rect 1828 617 1881 861
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 225 131 259 199
-rect 311 131 345 199
-rect 397 131 431 199
-rect 501 131 535 267
-rect 659 131 727 267
-rect 851 131 885 199
-rect 1009 131 1077 267
-rect 1201 131 1235 267
-rect 1287 131 1321 267
-rect 1391 131 1425 199
-rect 1477 131 1511 199
-rect 1563 131 1597 199
-rect 1667 131 1701 199
-rect 1753 131 1787 199
-rect 1839 131 1873 199
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 225 861 259 1201
-rect 383 861 417 1201
-rect 501 725 535 1201
-rect 659 657 727 1201
-rect 851 725 885 1201
-rect 1009 725 1077 1201
-rect 1201 657 1235 1201
-rect 1287 657 1321 1201
-rect 1391 861 1425 1201
-rect 1549 861 1583 1201
-rect 1667 861 1701 1201
-rect 1753 861 1787 1201
-rect 1839 861 1873 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-rect 1658 1271 1682 1305
-rect 1716 1271 1740 1305
-rect 1794 1271 1818 1305
-rect 1852 1271 1876 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-rect 1682 1271 1716 1305
-rect 1818 1271 1852 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 270 1217 300 1243
-rect 342 1217 372 1243
-rect 546 1217 576 1243
-rect 618 1217 648 1243
-rect 738 1217 768 1243
-rect 810 1217 840 1243
-rect 896 1217 926 1243
-rect 968 1217 998 1243
-rect 1088 1217 1118 1243
-rect 1160 1217 1190 1243
-rect 1246 1217 1276 1243
-rect 1436 1217 1466 1243
-rect 1508 1217 1538 1243
-rect 1712 1217 1742 1243
-rect 1798 1217 1828 1243
-rect 80 494 110 617
-rect 79 478 133 494
-rect 79 444 89 478
-rect 123 444 133 478
-rect 79 428 133 444
-rect 79 427 110 428
-rect 80 315 110 427
-rect 270 351 300 817
-rect 342 584 372 817
-rect 342 568 415 584
-rect 342 534 371 568
-rect 405 534 415 568
-rect 342 518 415 534
-rect 219 335 300 351
-rect 219 301 229 335
-rect 263 301 300 335
-rect 219 285 300 301
-rect 270 263 300 285
-rect 356 263 386 518
-rect 546 477 576 617
-rect 618 586 648 617
-rect 618 570 672 586
-rect 618 536 628 570
-rect 662 536 672 570
-rect 618 520 672 536
-rect 546 461 600 477
-rect 738 475 768 617
-rect 810 580 840 617
-rect 896 580 926 617
-rect 810 570 926 580
-rect 810 536 842 570
-rect 876 536 926 570
-rect 810 526 926 536
-rect 968 475 998 617
-rect 1088 586 1118 617
-rect 1064 570 1118 586
-rect 1064 536 1074 570
-rect 1108 536 1118 570
-rect 1064 520 1118 536
-rect 546 427 556 461
-rect 590 427 600 461
-rect 546 411 600 427
-rect 642 445 1094 475
-rect 546 315 576 411
-rect 642 367 672 445
-rect 1064 403 1094 445
-rect 1160 471 1190 617
-rect 1246 586 1276 617
-rect 1246 570 1317 586
-rect 1246 556 1273 570
-rect 1257 536 1273 556
-rect 1307 536 1317 570
-rect 1257 520 1317 536
-rect 1160 455 1214 471
-rect 1160 421 1170 455
-rect 1204 421 1214 455
-rect 1160 405 1214 421
-rect 618 337 672 367
-rect 714 387 768 403
-rect 714 353 724 387
-rect 758 353 768 387
-rect 714 337 768 353
-rect 618 315 648 337
-rect 738 315 768 337
-rect 810 387 926 397
-rect 810 353 842 387
-rect 876 353 926 387
-rect 810 343 926 353
-rect 810 315 840 343
-rect 896 315 926 343
-rect 968 387 1022 403
-rect 968 353 978 387
-rect 1012 353 1022 387
-rect 968 337 1022 353
-rect 1064 387 1118 403
-rect 1064 353 1074 387
-rect 1108 353 1118 387
-rect 1064 337 1118 353
-rect 968 315 998 337
-rect 1088 315 1118 337
-rect 1160 315 1190 405
-rect 1257 367 1287 520
-rect 1436 403 1466 817
-rect 1246 337 1287 367
-rect 1399 387 1466 403
-rect 1399 353 1409 387
-rect 1443 353 1466 387
-rect 1399 337 1466 353
-rect 1246 315 1276 337
-rect 1423 336 1466 337
-rect 1436 263 1466 336
-rect 1508 351 1538 817
-rect 1712 601 1742 617
-rect 1702 571 1742 601
-rect 1702 471 1732 571
-rect 1798 512 1828 617
-rect 1677 455 1732 471
-rect 1677 421 1687 455
-rect 1721 421 1732 455
-rect 1774 496 1828 512
-rect 1774 462 1784 496
-rect 1818 462 1828 496
-rect 1774 446 1828 462
-rect 1677 405 1732 421
-rect 1702 360 1732 405
-rect 1508 335 1589 351
-rect 1508 301 1545 335
-rect 1579 301 1589 335
-rect 1702 330 1742 360
-rect 1712 315 1742 330
-rect 1798 315 1828 446
-rect 1508 285 1589 301
-rect 1522 263 1552 285
-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 444 123 478
-rect 371 534 405 568
-rect 229 301 263 335
-rect 628 536 662 570
-rect 842 536 876 570
-rect 1074 536 1108 570
-rect 556 427 590 461
-rect 1273 536 1307 570
-rect 1170 421 1204 455
-rect 724 353 758 387
-rect 842 353 876 387
-rect 978 353 1012 387
-rect 1074 353 1108 387
-rect 1409 353 1443 387
-rect 1687 421 1721 455
-rect 1784 462 1818 496
-rect 1545 301 1579 335
-<< locali >>
-rect 0 1311 1914 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1682 1311
-rect 1716 1271 1818 1311
-rect 1852 1271 1914 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 494 81 649
-rect 121 565 155 657
-rect 225 1201 259 1217
-rect 121 531 191 565
-rect 47 478 123 494
-rect 47 444 89 478
-rect 89 428 123 444
-rect 157 335 191 531
-rect 225 421 259 861
-rect 383 1201 417 1271
-rect 383 845 417 861
-rect 501 1201 535 1271
-rect 501 709 535 725
-rect 659 1201 727 1217
-rect 851 1201 885 1271
-rect 851 709 885 725
-rect 1009 1201 1077 1217
-rect 659 654 727 657
-rect 1009 654 1077 725
-rect 405 620 727 654
-rect 910 620 1077 654
-rect 1201 1201 1235 1271
-rect 1201 641 1235 657
-rect 1287 1201 1321 1217
-rect 1391 1201 1425 1217
-rect 1391 773 1425 861
-rect 1549 1201 1583 1271
-rect 1549 845 1583 861
-rect 1667 1201 1701 1217
-rect 1391 739 1511 773
-rect 1287 654 1321 657
-rect 1287 620 1377 654
-rect 405 584 439 620
-rect 371 568 439 584
-rect 405 534 439 568
-rect 371 518 439 534
-rect 225 387 345 421
-rect 229 335 263 351
-rect 121 301 229 335
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 301
-rect 121 115 155 131
-rect 225 199 259 215
-rect 225 61 259 131
-rect 311 199 345 353
-rect 405 370 439 518
-rect 628 570 662 586
-rect 628 535 662 536
-rect 842 570 876 586
-rect 662 501 758 535
-rect 556 461 590 477
-rect 556 411 590 427
-rect 724 387 758 501
-rect 842 387 876 536
-rect 405 336 690 370
-rect 724 337 758 353
-rect 842 337 876 353
-rect 910 387 944 620
-rect 1074 570 1108 586
-rect 1074 535 1108 536
-rect 656 283 690 336
-rect 910 303 944 353
-rect 978 501 1074 535
-rect 1273 570 1307 586
-rect 1273 535 1307 536
-rect 978 387 1012 501
-rect 1341 455 1377 620
-rect 1154 421 1170 455
-rect 1204 421 1220 455
-rect 1287 421 1377 455
-rect 1477 455 1511 739
-rect 1667 609 1701 861
-rect 1753 1201 1787 1271
-rect 1753 845 1787 861
-rect 1839 1201 1873 1217
-rect 1839 683 1873 861
-rect 1872 666 1873 683
-rect 1872 649 1896 666
-rect 1839 632 1896 649
-rect 1667 570 1701 575
-rect 1667 536 1818 570
-rect 1784 496 1818 536
-rect 1477 421 1687 455
-rect 1721 421 1737 455
-rect 1287 387 1321 421
-rect 1058 353 1074 387
-rect 1108 353 1321 387
-rect 978 337 1012 353
-rect 501 267 535 283
-rect 311 115 345 131
-rect 397 199 431 215
-rect 397 61 431 131
-rect 656 267 727 283
-rect 910 269 1077 303
-rect 656 249 659 267
-rect 501 61 535 131
-rect 1009 267 1077 269
-rect 659 115 727 131
-rect 851 199 885 215
-rect 851 61 885 131
-rect 1009 115 1077 131
-rect 1201 267 1235 283
-rect 1201 61 1235 131
-rect 1287 267 1321 353
-rect 1409 387 1443 403
-rect 1409 337 1443 353
-rect 1287 115 1321 131
-rect 1391 199 1425 215
-rect 1391 61 1425 131
-rect 1477 199 1511 421
-rect 1784 387 1818 462
-rect 1667 353 1818 387
-rect 1545 335 1579 351
-rect 1477 115 1511 131
-rect 1563 199 1597 215
-rect 1563 61 1597 131
-rect 1667 199 1701 353
-rect 1862 320 1896 632
-rect 1839 286 1896 320
-rect 1667 115 1701 131
-rect 1753 199 1787 215
-rect 1753 61 1787 131
-rect 1839 199 1873 286
-rect 1839 115 1873 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 1682 1305 1716 1311
-rect 1682 1277 1716 1305
-rect 1818 1305 1852 1311
-rect 1818 1277 1852 1305
-rect 47 649 81 683
-rect 311 353 345 387
-rect 229 301 263 313
-rect 229 279 263 301
-rect 628 501 662 535
-rect 556 427 590 461
-rect 824 353 842 387
-rect 842 353 858 387
-rect 910 353 944 387
-rect 1074 501 1108 535
-rect 1273 501 1307 535
-rect 1170 421 1204 455
-rect 1838 649 1872 683
-rect 1667 575 1701 609
-rect 1687 421 1721 455
-rect 1409 353 1443 387
-rect 1545 301 1579 313
-rect 1545 279 1579 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 1311 1914 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1682 1311
-rect 1716 1277 1818 1311
-rect 1852 1277 1914 1311
-rect 0 1271 1914 1277
-rect 35 683 93 689
-rect 1826 683 1884 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 1804 649 1838 683
-rect 1872 649 1884 683
-rect 35 643 93 649
-rect 1826 643 1884 649
-rect 1655 609 1713 615
-rect 1632 575 1667 609
-rect 1701 575 1713 609
-rect 1655 569 1713 575
-rect 616 535 674 541
-rect 1062 535 1120 541
-rect 1261 535 1319 541
-rect 616 501 628 535
-rect 662 501 1074 535
-rect 1108 501 1273 535
-rect 1307 501 1319 535
-rect 616 495 674 501
-rect 1062 495 1120 501
-rect 1261 495 1319 501
-rect 544 461 602 467
-rect 544 427 556 461
-rect 590 427 624 461
-rect 1158 455 1216 461
-rect 1675 455 1733 461
-rect 544 421 602 427
-rect 1158 421 1170 455
-rect 1204 421 1687 455
-rect 1721 421 1733 455
-rect 1158 415 1216 421
-rect 1675 415 1733 421
-rect 299 387 357 393
-rect 812 387 870 393
-rect 299 353 311 387
-rect 345 353 824 387
-rect 858 353 870 387
-rect 299 347 357 353
-rect 812 347 870 353
-rect 898 387 956 393
-rect 1397 387 1455 393
-rect 898 353 910 387
-rect 944 353 1409 387
-rect 1443 353 1455 387
-rect 898 347 956 353
-rect 1397 347 1455 353
-rect 217 313 275 319
-rect 1533 313 1591 319
-rect 217 279 229 313
-rect 263 279 1545 313
-rect 1579 279 1591 313
-rect 217 273 275 279
-rect 1533 273 1591 279
-rect 0 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel metal1 65 666 65 666 1 RN
-port 1 n
-rlabel metal1 573 444 573 444 1 D
-port 2 n
-rlabel metal1 1290 518 1290 518 1 CK
-port 3 n
-rlabel metal1 1855 666 1855 666 1 Q
-port 4 n
-rlabel metal1 1685 592 1685 592 1 QN
-port 5 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__dffr_l.mag b/18T_ls/sky130_osu_sc_18T_ls__dffr_l.mag
deleted file mode 100644
index 06e7502..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__dffr_l.mag
+++ /dev/null
@@ -1,807 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864593
-<< checkpaint >>
-rect -1210 -1243 3112 2575
-<< nwell >>
-rect -10 581 1917 1341
-<< nmos >>
-rect 80 115 110 315
-rect 270 115 300 263
-rect 356 115 386 263
-rect 546 115 576 315
-rect 618 115 648 315
-rect 738 115 768 315
-rect 810 115 840 315
-rect 896 115 926 315
-rect 968 115 998 315
-rect 1088 115 1118 315
-rect 1160 115 1190 315
-rect 1246 115 1276 315
-rect 1436 115 1466 263
-rect 1522 115 1552 263
-rect 1712 115 1742 263
-rect 1798 115 1828 263
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 270 817 300 1217
-rect 342 817 372 1217
-rect 546 617 576 1217
-rect 618 617 648 1217
-rect 738 617 768 1217
-rect 810 617 840 1217
-rect 896 617 926 1217
-rect 968 617 998 1217
-rect 1088 617 1118 1217
-rect 1160 617 1190 1217
-rect 1246 617 1276 1217
-rect 1436 817 1466 1217
-rect 1508 817 1538 1217
-rect 1712 817 1742 1217
-rect 1798 817 1828 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 493 267 546 315
-rect 110 115 163 131
-rect 217 199 270 263
-rect 217 131 225 199
-rect 259 131 270 199
-rect 217 115 270 131
-rect 300 199 356 263
-rect 300 131 311 199
-rect 345 131 356 199
-rect 300 115 356 131
-rect 386 199 439 263
-rect 386 131 397 199
-rect 431 131 439 199
-rect 386 115 439 131
-rect 493 131 501 267
-rect 535 131 546 267
-rect 493 115 546 131
-rect 576 115 618 315
-rect 648 267 738 315
-rect 648 131 659 267
-rect 727 131 738 267
-rect 648 115 738 131
-rect 768 115 810 315
-rect 840 199 896 315
-rect 840 131 851 199
-rect 885 131 896 199
-rect 840 115 896 131
-rect 926 115 968 315
-rect 998 267 1088 315
-rect 998 131 1009 267
-rect 1077 131 1088 267
-rect 998 115 1088 131
-rect 1118 115 1160 315
-rect 1190 267 1246 315
-rect 1190 131 1201 267
-rect 1235 131 1246 267
-rect 1190 115 1246 131
-rect 1276 267 1329 315
-rect 1276 131 1287 267
-rect 1321 131 1329 267
-rect 1276 115 1329 131
-rect 1383 199 1436 263
-rect 1383 131 1391 199
-rect 1425 131 1436 199
-rect 1383 115 1436 131
-rect 1466 199 1522 263
-rect 1466 131 1477 199
-rect 1511 131 1522 199
-rect 1466 115 1522 131
-rect 1552 199 1605 263
-rect 1552 131 1563 199
-rect 1597 131 1605 199
-rect 1552 115 1605 131
-rect 1659 199 1712 263
-rect 1659 131 1667 199
-rect 1701 131 1712 199
-rect 1659 115 1712 131
-rect 1742 199 1798 263
-rect 1742 131 1753 199
-rect 1787 131 1798 199
-rect 1742 115 1798 131
-rect 1828 199 1881 263
-rect 1828 131 1839 199
-rect 1873 131 1881 199
-rect 1828 115 1881 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 217 1201 270 1217
-rect 217 861 225 1201
-rect 259 861 270 1201
-rect 217 817 270 861
-rect 300 817 342 1217
-rect 372 1201 425 1217
-rect 372 861 383 1201
-rect 417 861 425 1201
-rect 372 817 425 861
-rect 493 1201 546 1217
-rect 110 617 163 657
-rect 493 725 501 1201
-rect 535 725 546 1201
-rect 493 617 546 725
-rect 576 617 618 1217
-rect 648 1201 738 1217
-rect 648 657 659 1201
-rect 727 657 738 1201
-rect 648 617 738 657
-rect 768 617 810 1217
-rect 840 1201 896 1217
-rect 840 725 851 1201
-rect 885 725 896 1201
-rect 840 617 896 725
-rect 926 617 968 1217
-rect 998 1201 1088 1217
-rect 998 725 1009 1201
-rect 1077 725 1088 1201
-rect 998 617 1088 725
-rect 1118 617 1160 1217
-rect 1190 1201 1246 1217
-rect 1190 657 1201 1201
-rect 1235 657 1246 1201
-rect 1190 617 1246 657
-rect 1276 1201 1329 1217
-rect 1276 657 1287 1201
-rect 1321 657 1329 1201
-rect 1383 1201 1436 1217
-rect 1383 861 1391 1201
-rect 1425 861 1436 1201
-rect 1383 817 1436 861
-rect 1466 817 1508 1217
-rect 1538 1201 1591 1217
-rect 1538 861 1549 1201
-rect 1583 861 1591 1201
-rect 1538 817 1591 861
-rect 1659 1201 1712 1217
-rect 1659 861 1667 1201
-rect 1701 861 1712 1201
-rect 1659 817 1712 861
-rect 1742 1201 1798 1217
-rect 1742 861 1753 1201
-rect 1787 861 1798 1201
-rect 1742 817 1798 861
-rect 1828 1201 1881 1217
-rect 1828 861 1839 1201
-rect 1873 861 1881 1201
-rect 1828 817 1881 861
-rect 1276 617 1329 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 225 131 259 199
-rect 311 131 345 199
-rect 397 131 431 199
-rect 501 131 535 267
-rect 659 131 727 267
-rect 851 131 885 199
-rect 1009 131 1077 267
-rect 1201 131 1235 267
-rect 1287 131 1321 267
-rect 1391 131 1425 199
-rect 1477 131 1511 199
-rect 1563 131 1597 199
-rect 1667 131 1701 199
-rect 1753 131 1787 199
-rect 1839 131 1873 199
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 225 861 259 1201
-rect 383 861 417 1201
-rect 501 725 535 1201
-rect 659 657 727 1201
-rect 851 725 885 1201
-rect 1009 725 1077 1201
-rect 1201 657 1235 1201
-rect 1287 657 1321 1201
-rect 1391 861 1425 1201
-rect 1549 861 1583 1201
-rect 1667 861 1701 1201
-rect 1753 861 1787 1201
-rect 1839 861 1873 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-rect 1658 1271 1682 1305
-rect 1716 1271 1740 1305
-rect 1794 1271 1818 1305
-rect 1852 1271 1876 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-rect 1682 1271 1716 1305
-rect 1818 1271 1852 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 270 1217 300 1243
-rect 342 1217 372 1243
-rect 546 1217 576 1243
-rect 618 1217 648 1243
-rect 738 1217 768 1243
-rect 810 1217 840 1243
-rect 896 1217 926 1243
-rect 968 1217 998 1243
-rect 1088 1217 1118 1243
-rect 1160 1217 1190 1243
-rect 1246 1217 1276 1243
-rect 1436 1217 1466 1243
-rect 1508 1217 1538 1243
-rect 1712 1217 1742 1243
-rect 1798 1217 1828 1243
-rect 80 494 110 617
-rect 79 478 133 494
-rect 79 444 89 478
-rect 123 444 133 478
-rect 79 428 133 444
-rect 79 427 110 428
-rect 80 315 110 427
-rect 270 351 300 817
-rect 342 584 372 817
-rect 342 568 415 584
-rect 342 534 371 568
-rect 405 534 415 568
-rect 342 518 415 534
-rect 219 335 300 351
-rect 219 301 229 335
-rect 263 301 300 335
-rect 219 285 300 301
-rect 270 263 300 285
-rect 356 263 386 518
-rect 546 477 576 617
-rect 618 586 648 617
-rect 618 570 672 586
-rect 618 536 628 570
-rect 662 536 672 570
-rect 618 520 672 536
-rect 546 461 600 477
-rect 738 475 768 617
-rect 810 580 840 617
-rect 896 580 926 617
-rect 810 570 926 580
-rect 810 536 842 570
-rect 876 536 926 570
-rect 810 526 926 536
-rect 968 475 998 617
-rect 1088 586 1118 617
-rect 1064 570 1118 586
-rect 1064 536 1074 570
-rect 1108 536 1118 570
-rect 1064 520 1118 536
-rect 546 427 556 461
-rect 590 427 600 461
-rect 546 411 600 427
-rect 642 445 1094 475
-rect 546 315 576 411
-rect 642 367 672 445
-rect 1064 403 1094 445
-rect 1160 471 1190 617
-rect 1246 586 1276 617
-rect 1246 570 1317 586
-rect 1246 556 1273 570
-rect 1257 536 1273 556
-rect 1307 536 1317 570
-rect 1257 520 1317 536
-rect 1160 455 1214 471
-rect 1160 421 1170 455
-rect 1204 421 1214 455
-rect 1160 405 1214 421
-rect 618 337 672 367
-rect 714 387 768 403
-rect 714 353 724 387
-rect 758 353 768 387
-rect 714 337 768 353
-rect 618 315 648 337
-rect 738 315 768 337
-rect 810 387 926 397
-rect 810 353 842 387
-rect 876 353 926 387
-rect 810 343 926 353
-rect 810 315 840 343
-rect 896 315 926 343
-rect 968 387 1022 403
-rect 968 353 978 387
-rect 1012 353 1022 387
-rect 968 337 1022 353
-rect 1064 387 1118 403
-rect 1064 353 1074 387
-rect 1108 353 1118 387
-rect 1064 337 1118 353
-rect 968 315 998 337
-rect 1088 315 1118 337
-rect 1160 315 1190 405
-rect 1257 367 1287 520
-rect 1436 403 1466 817
-rect 1246 337 1287 367
-rect 1399 387 1466 403
-rect 1399 353 1409 387
-rect 1443 353 1466 387
-rect 1399 337 1466 353
-rect 1246 315 1276 337
-rect 1423 336 1466 337
-rect 1436 263 1466 336
-rect 1508 351 1538 817
-rect 1712 601 1742 817
-rect 1702 571 1742 601
-rect 1702 471 1732 571
-rect 1798 512 1828 817
-rect 1677 455 1732 471
-rect 1677 421 1687 455
-rect 1721 421 1732 455
-rect 1774 496 1828 512
-rect 1774 462 1784 496
-rect 1818 462 1828 496
-rect 1774 446 1828 462
-rect 1677 405 1732 421
-rect 1702 360 1732 405
-rect 1508 335 1589 351
-rect 1508 301 1545 335
-rect 1579 301 1589 335
-rect 1702 330 1742 360
-rect 1508 285 1589 301
-rect 1522 263 1552 285
-rect 1712 263 1742 330
-rect 1798 263 1828 446
-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 444 123 478
-rect 371 534 405 568
-rect 229 301 263 335
-rect 628 536 662 570
-rect 842 536 876 570
-rect 1074 536 1108 570
-rect 556 427 590 461
-rect 1273 536 1307 570
-rect 1170 421 1204 455
-rect 724 353 758 387
-rect 842 353 876 387
-rect 978 353 1012 387
-rect 1074 353 1108 387
-rect 1409 353 1443 387
-rect 1687 421 1721 455
-rect 1784 462 1818 496
-rect 1545 301 1579 335
-<< locali >>
-rect 0 1311 1914 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1682 1311
-rect 1716 1271 1818 1311
-rect 1852 1271 1914 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 494 81 649
-rect 121 565 155 657
-rect 225 1201 259 1217
-rect 121 531 191 565
-rect 47 478 123 494
-rect 47 444 89 478
-rect 89 428 123 444
-rect 157 335 191 531
-rect 225 421 259 861
-rect 383 1201 417 1271
-rect 383 845 417 861
-rect 501 1201 535 1271
-rect 501 709 535 725
-rect 659 1201 727 1217
-rect 851 1201 885 1271
-rect 851 709 885 725
-rect 1009 1201 1077 1217
-rect 659 654 727 657
-rect 1009 654 1077 725
-rect 405 620 727 654
-rect 910 620 1077 654
-rect 1201 1201 1235 1271
-rect 1201 641 1235 657
-rect 1287 1201 1321 1217
-rect 1391 1201 1425 1217
-rect 1391 773 1425 861
-rect 1549 1201 1583 1271
-rect 1549 845 1583 861
-rect 1667 1201 1701 1217
-rect 1391 739 1511 773
-rect 1287 654 1321 657
-rect 1287 620 1377 654
-rect 405 584 439 620
-rect 371 568 439 584
-rect 405 534 439 568
-rect 371 518 439 534
-rect 225 387 345 421
-rect 229 335 263 351
-rect 121 301 229 335
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 301
-rect 121 115 155 131
-rect 225 199 259 215
-rect 225 61 259 131
-rect 311 199 345 353
-rect 405 370 439 518
-rect 628 570 662 586
-rect 628 535 662 536
-rect 842 570 876 586
-rect 662 501 758 535
-rect 556 461 590 477
-rect 556 411 590 427
-rect 724 387 758 501
-rect 842 387 876 536
-rect 405 336 690 370
-rect 724 337 758 353
-rect 842 337 876 353
-rect 910 387 944 620
-rect 1074 570 1108 586
-rect 1074 535 1108 536
-rect 656 283 690 336
-rect 910 303 944 353
-rect 978 501 1074 535
-rect 1273 570 1307 586
-rect 1273 535 1307 536
-rect 978 387 1012 501
-rect 1341 455 1377 620
-rect 1154 421 1170 455
-rect 1204 421 1220 455
-rect 1287 421 1377 455
-rect 1477 455 1511 739
-rect 1667 609 1701 861
-rect 1753 1201 1787 1271
-rect 1753 845 1787 861
-rect 1839 1201 1873 1217
-rect 1839 683 1873 861
-rect 1872 666 1873 683
-rect 1872 649 1896 666
-rect 1839 632 1896 649
-rect 1667 570 1701 575
-rect 1667 536 1818 570
-rect 1784 496 1818 536
-rect 1477 421 1687 455
-rect 1721 421 1737 455
-rect 1287 387 1321 421
-rect 1058 353 1074 387
-rect 1108 353 1321 387
-rect 978 337 1012 353
-rect 501 267 535 283
-rect 311 115 345 131
-rect 397 199 431 215
-rect 397 61 431 131
-rect 656 267 727 283
-rect 910 269 1077 303
-rect 656 249 659 267
-rect 501 61 535 131
-rect 1009 267 1077 269
-rect 659 115 727 131
-rect 851 199 885 215
-rect 851 61 885 131
-rect 1009 115 1077 131
-rect 1201 267 1235 283
-rect 1201 61 1235 131
-rect 1287 267 1321 353
-rect 1409 387 1443 403
-rect 1409 337 1443 353
-rect 1287 115 1321 131
-rect 1391 199 1425 215
-rect 1391 61 1425 131
-rect 1477 199 1511 421
-rect 1784 387 1818 462
-rect 1667 353 1818 387
-rect 1545 335 1579 351
-rect 1477 115 1511 131
-rect 1563 199 1597 215
-rect 1563 61 1597 131
-rect 1667 199 1701 353
-rect 1862 320 1896 632
-rect 1839 286 1896 320
-rect 1667 115 1701 131
-rect 1753 199 1787 215
-rect 1753 61 1787 131
-rect 1839 199 1873 286
-rect 1839 115 1873 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 1682 1305 1716 1311
-rect 1682 1277 1716 1305
-rect 1818 1305 1852 1311
-rect 1818 1277 1852 1305
-rect 47 649 81 683
-rect 311 353 345 387
-rect 229 301 263 313
-rect 229 279 263 301
-rect 628 501 662 535
-rect 556 427 590 461
-rect 824 353 842 387
-rect 842 353 858 387
-rect 910 353 944 387
-rect 1074 501 1108 535
-rect 1273 501 1307 535
-rect 1170 421 1204 455
-rect 1838 649 1872 683
-rect 1667 575 1701 609
-rect 1687 421 1721 455
-rect 1409 353 1443 387
-rect 1545 301 1579 313
-rect 1545 279 1579 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 1311 1914 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1682 1311
-rect 1716 1277 1818 1311
-rect 1852 1277 1914 1311
-rect 0 1271 1914 1277
-rect 35 683 93 689
-rect 1826 683 1884 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 1804 649 1838 683
-rect 1872 649 1884 683
-rect 35 643 93 649
-rect 1826 643 1884 649
-rect 1655 609 1713 615
-rect 1632 575 1667 609
-rect 1701 575 1713 609
-rect 1655 569 1713 575
-rect 616 535 674 541
-rect 1062 535 1120 541
-rect 1261 535 1319 541
-rect 616 501 628 535
-rect 662 501 1074 535
-rect 1108 501 1273 535
-rect 1307 501 1319 535
-rect 616 495 674 501
-rect 1062 495 1120 501
-rect 1261 495 1319 501
-rect 544 461 602 467
-rect 544 427 556 461
-rect 590 427 624 461
-rect 1158 455 1216 461
-rect 1675 455 1733 461
-rect 544 421 602 427
-rect 1158 421 1170 455
-rect 1204 421 1687 455
-rect 1721 421 1733 455
-rect 1158 415 1216 421
-rect 1675 415 1733 421
-rect 299 387 357 393
-rect 812 387 870 393
-rect 299 353 311 387
-rect 345 353 824 387
-rect 858 353 870 387
-rect 299 347 357 353
-rect 812 347 870 353
-rect 898 387 956 393
-rect 1397 387 1455 393
-rect 898 353 910 387
-rect 944 353 1409 387
-rect 1443 353 1455 387
-rect 898 347 956 353
-rect 1397 347 1455 353
-rect 217 313 275 319
-rect 1533 313 1591 319
-rect 217 279 229 313
-rect 263 279 1545 313
-rect 1579 279 1591 313
-rect 217 273 275 279
-rect 1533 273 1591 279
-rect 0 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel metal1 65 666 65 666 1 RN
-port 1 n
-rlabel metal1 573 444 573 444 1 D
-port 2 n
-rlabel metal1 1290 518 1290 518 1 CK
-port 3 n
-rlabel metal1 1855 666 1855 666 1 Q
-port 4 n
-rlabel metal1 1685 592 1685 592 1 QN
-port 5 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__dffs_1.mag b/18T_ls/sky130_osu_sc_18T_ls__dffs_1.mag
deleted file mode 100644
index 5058386..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__dffs_1.mag
+++ /dev/null
@@ -1,721 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864593
-<< checkpaint >>
-rect -1210 -1243 2840 2575
-<< nwell >>
-rect -10 581 1741 1341
-<< nmos >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 356 115 386 315
-rect 428 115 458 315
-rect 548 115 578 315
-rect 620 115 650 315
-rect 706 115 736 315
-rect 778 115 808 315
-rect 898 115 928 315
-rect 970 115 1000 315
-rect 1056 115 1086 315
-rect 1246 115 1276 263
-rect 1318 115 1348 263
-rect 1522 115 1552 315
-rect 1608 115 1638 315
-<< pmoshvt >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 356 617 386 1217
-rect 428 617 458 1217
-rect 548 617 578 1217
-rect 620 617 650 1217
-rect 706 617 736 1217
-rect 778 617 808 1217
-rect 898 617 928 1217
-rect 970 617 1000 1217
-rect 1056 617 1086 1217
-rect 1246 817 1276 1217
-rect 1332 817 1362 1217
-rect 1522 617 1552 1217
-rect 1608 617 1638 1217
-<< ndiff >>
-rect 303 267 356 315
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 115 152 263
-rect 182 199 235 263
-rect 182 131 193 199
-rect 227 131 235 199
-rect 182 115 235 131
-rect 303 131 311 267
-rect 345 131 356 267
-rect 303 115 356 131
-rect 386 115 428 315
-rect 458 267 548 315
-rect 458 131 469 267
-rect 537 131 548 267
-rect 458 115 548 131
-rect 578 115 620 315
-rect 650 199 706 315
-rect 650 131 661 199
-rect 695 131 706 199
-rect 650 115 706 131
-rect 736 115 778 315
-rect 808 267 898 315
-rect 808 131 819 267
-rect 887 131 898 267
-rect 808 115 898 131
-rect 928 115 970 315
-rect 1000 267 1056 315
-rect 1000 131 1011 267
-rect 1045 131 1056 267
-rect 1000 115 1056 131
-rect 1086 267 1139 315
-rect 1086 131 1097 267
-rect 1131 131 1139 267
-rect 1086 115 1139 131
-rect 1193 199 1246 263
-rect 1193 131 1201 199
-rect 1235 131 1246 199
-rect 1193 115 1246 131
-rect 1276 115 1318 263
-rect 1348 199 1401 263
-rect 1348 131 1359 199
-rect 1393 131 1401 199
-rect 1348 115 1401 131
-rect 1469 199 1522 315
-rect 1469 131 1477 199
-rect 1511 131 1522 199
-rect 1469 115 1522 131
-rect 1552 199 1608 315
-rect 1552 131 1563 199
-rect 1597 131 1608 199
-rect 1552 115 1608 131
-rect 1638 199 1691 315
-rect 1638 131 1649 199
-rect 1683 131 1691 199
-rect 1638 115 1691 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 817 80 929
-rect 110 1201 166 1217
-rect 110 929 121 1201
-rect 155 929 166 1201
-rect 110 817 166 929
-rect 196 1201 249 1217
-rect 196 929 207 1201
-rect 241 929 249 1201
-rect 196 817 249 929
-rect 303 1201 356 1217
-rect 303 725 311 1201
-rect 345 725 356 1201
-rect 303 617 356 725
-rect 386 617 428 1217
-rect 458 1201 548 1217
-rect 458 657 469 1201
-rect 537 657 548 1201
-rect 458 617 548 657
-rect 578 617 620 1217
-rect 650 1201 706 1217
-rect 650 725 661 1201
-rect 695 725 706 1201
-rect 650 617 706 725
-rect 736 617 778 1217
-rect 808 1201 898 1217
-rect 808 725 819 1201
-rect 887 725 898 1201
-rect 808 617 898 725
-rect 928 617 970 1217
-rect 1000 1201 1056 1217
-rect 1000 657 1011 1201
-rect 1045 657 1056 1201
-rect 1000 617 1056 657
-rect 1086 1201 1139 1217
-rect 1086 657 1097 1201
-rect 1131 657 1139 1201
-rect 1193 1201 1246 1217
-rect 1193 929 1201 1201
-rect 1235 929 1246 1201
-rect 1193 817 1246 929
-rect 1276 1201 1332 1217
-rect 1276 929 1287 1201
-rect 1321 929 1332 1201
-rect 1276 817 1332 929
-rect 1362 1201 1415 1217
-rect 1362 929 1373 1201
-rect 1407 929 1415 1201
-rect 1362 817 1415 929
-rect 1469 1201 1522 1217
-rect 1469 861 1477 1201
-rect 1511 861 1522 1201
-rect 1086 617 1139 657
-rect 1469 617 1522 861
-rect 1552 1201 1608 1217
-rect 1552 861 1563 1201
-rect 1597 861 1608 1201
-rect 1552 617 1608 861
-rect 1638 1201 1691 1217
-rect 1638 861 1649 1201
-rect 1683 861 1691 1201
-rect 1638 617 1691 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 193 131 227 199
-rect 311 131 345 267
-rect 469 131 537 267
-rect 661 131 695 199
-rect 819 131 887 267
-rect 1011 131 1045 267
-rect 1097 131 1131 267
-rect 1201 131 1235 199
-rect 1359 131 1393 199
-rect 1477 131 1511 199
-rect 1563 131 1597 199
-rect 1649 131 1683 199
-<< pdiffc >>
-rect 35 929 69 1201
-rect 121 929 155 1201
-rect 207 929 241 1201
-rect 311 725 345 1201
-rect 469 657 537 1201
-rect 661 725 695 1201
-rect 819 725 887 1201
-rect 1011 657 1045 1201
-rect 1097 657 1131 1201
-rect 1201 929 1235 1201
-rect 1287 929 1321 1201
-rect 1373 929 1407 1201
-rect 1477 861 1511 1201
-rect 1563 861 1597 1201
-rect 1649 861 1683 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 356 1217 386 1243
-rect 428 1217 458 1243
-rect 548 1217 578 1243
-rect 620 1217 650 1243
-rect 706 1217 736 1243
-rect 778 1217 808 1243
-rect 898 1217 928 1243
-rect 970 1217 1000 1243
-rect 1056 1217 1086 1243
-rect 1246 1217 1276 1243
-rect 1332 1217 1362 1243
-rect 1522 1217 1552 1243
-rect 1608 1217 1638 1243
-rect 80 403 110 817
-rect 166 494 196 817
-rect 37 387 110 403
-rect 37 353 47 387
-rect 81 353 110 387
-rect 37 337 110 353
-rect 80 263 110 337
-rect 152 478 233 494
-rect 152 444 189 478
-rect 223 444 233 478
-rect 152 428 233 444
-rect 356 477 386 617
-rect 428 586 458 617
-rect 428 570 482 586
-rect 428 536 438 570
-rect 472 536 482 570
-rect 428 520 482 536
-rect 356 461 410 477
-rect 548 475 578 617
-rect 620 580 650 617
-rect 706 580 736 617
-rect 620 570 736 580
-rect 620 536 652 570
-rect 686 536 736 570
-rect 620 526 736 536
-rect 778 475 808 617
-rect 898 586 928 617
-rect 874 570 928 586
-rect 874 536 884 570
-rect 918 536 928 570
-rect 874 520 928 536
-rect 152 263 182 428
-rect 356 427 366 461
-rect 400 427 410 461
-rect 356 411 410 427
-rect 452 445 904 475
-rect 356 315 386 411
-rect 452 367 482 445
-rect 874 403 904 445
-rect 970 471 1000 617
-rect 1056 586 1086 617
-rect 1056 570 1127 586
-rect 1056 556 1083 570
-rect 1067 536 1083 556
-rect 1117 536 1127 570
-rect 1067 520 1127 536
-rect 970 455 1024 471
-rect 970 421 980 455
-rect 1014 421 1024 455
-rect 970 405 1024 421
-rect 428 337 482 367
-rect 524 387 578 403
-rect 524 353 534 387
-rect 568 353 578 387
-rect 524 337 578 353
-rect 428 315 458 337
-rect 548 315 578 337
-rect 620 387 736 397
-rect 620 353 652 387
-rect 686 353 736 387
-rect 620 343 736 353
-rect 620 315 650 343
-rect 706 315 736 343
-rect 778 387 832 403
-rect 778 353 788 387
-rect 822 353 832 387
-rect 778 337 832 353
-rect 874 387 928 403
-rect 874 353 884 387
-rect 918 353 928 387
-rect 874 337 928 353
-rect 778 315 808 337
-rect 898 315 928 337
-rect 970 315 1000 405
-rect 1067 367 1097 520
-rect 1246 403 1276 817
-rect 1056 337 1097 367
-rect 1193 387 1276 403
-rect 1193 353 1203 387
-rect 1237 353 1276 387
-rect 1193 337 1276 353
-rect 1056 315 1086 337
-rect 1246 263 1276 337
-rect 1332 351 1362 817
-rect 1522 601 1552 617
-rect 1512 571 1552 601
-rect 1512 471 1542 571
-rect 1608 512 1638 617
-rect 1487 455 1542 471
-rect 1487 421 1497 455
-rect 1531 421 1542 455
-rect 1584 496 1638 512
-rect 1584 462 1594 496
-rect 1628 462 1638 496
-rect 1584 446 1638 462
-rect 1487 405 1542 421
-rect 1512 360 1542 405
-rect 1332 335 1399 351
-rect 1318 301 1355 335
-rect 1389 301 1399 335
-rect 1512 330 1552 360
-rect 1522 315 1552 330
-rect 1608 315 1638 446
-rect 1318 285 1399 301
-rect 1318 263 1348 285
-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 353 81 387
-rect 189 444 223 478
-rect 438 536 472 570
-rect 652 536 686 570
-rect 884 536 918 570
-rect 366 427 400 461
-rect 1083 536 1117 570
-rect 980 421 1014 455
-rect 534 353 568 387
-rect 652 353 686 387
-rect 788 353 822 387
-rect 884 353 918 387
-rect 1203 353 1237 387
-rect 1497 421 1531 455
-rect 1594 462 1628 496
-rect 1355 301 1389 335
-<< locali >>
-rect 0 1311 1738 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1738 1311
-rect 35 1201 69 1271
-rect 35 913 69 929
-rect 121 1201 155 1217
-rect 47 387 81 403
-rect 47 313 81 353
-rect 121 387 155 929
-rect 207 1201 241 1271
-rect 207 913 241 929
-rect 311 1201 345 1271
-rect 311 709 345 725
-rect 469 1201 537 1217
-rect 661 1201 695 1271
-rect 661 709 695 725
-rect 819 1201 887 1217
-rect 469 654 537 657
-rect 819 654 887 725
-rect 121 233 155 353
-rect 189 620 537 654
-rect 720 620 887 654
-rect 1011 1201 1045 1271
-rect 1011 641 1045 657
-rect 1097 1201 1131 1217
-rect 1201 1201 1235 1271
-rect 1201 913 1235 929
-rect 1287 1201 1321 1217
-rect 1097 654 1131 657
-rect 1097 620 1187 654
-rect 189 478 223 620
-rect 438 570 472 586
-rect 438 535 472 536
-rect 652 570 686 586
-rect 472 501 568 535
-rect 189 370 223 444
-rect 366 461 400 477
-rect 366 411 400 427
-rect 534 387 568 501
-rect 652 387 686 536
-rect 189 336 500 370
-rect 534 337 568 353
-rect 652 337 686 353
-rect 720 387 754 620
-rect 884 570 918 586
-rect 884 535 918 536
-rect 466 283 500 336
-rect 720 303 754 353
-rect 788 501 884 535
-rect 1083 570 1117 586
-rect 1083 535 1117 536
-rect 788 387 822 501
-rect 1151 467 1187 620
-rect 964 421 980 455
-rect 1014 421 1030 455
-rect 1097 433 1187 467
-rect 1287 455 1321 929
-rect 1373 1201 1407 1271
-rect 1373 913 1407 929
-rect 1477 1201 1511 1217
-rect 1477 609 1511 861
-rect 1563 1201 1597 1271
-rect 1563 845 1597 861
-rect 1649 1201 1683 1217
-rect 1649 683 1683 861
-rect 1682 666 1683 683
-rect 1682 649 1706 666
-rect 1649 632 1706 649
-rect 1477 570 1511 575
-rect 1477 536 1628 570
-rect 1594 496 1628 536
-rect 1097 387 1131 433
-rect 1287 421 1497 455
-rect 1531 421 1547 455
-rect 868 353 884 387
-rect 918 353 1131 387
-rect 1187 353 1203 387
-rect 1237 353 1253 387
-rect 788 337 822 353
-rect 35 199 155 233
-rect 311 267 345 283
-rect 193 199 227 215
-rect 35 115 69 131
-rect 193 61 227 131
-rect 466 267 537 283
-rect 720 269 887 303
-rect 466 249 469 267
-rect 311 61 345 131
-rect 819 267 887 269
-rect 469 115 537 131
-rect 661 199 695 215
-rect 661 61 695 131
-rect 819 115 887 131
-rect 1011 267 1045 283
-rect 1011 61 1045 131
-rect 1097 267 1131 353
-rect 1287 233 1321 421
-rect 1594 387 1628 462
-rect 1477 353 1628 387
-rect 1355 335 1389 351
-rect 1097 115 1131 131
-rect 1201 199 1321 233
-rect 1359 199 1393 215
-rect 1201 115 1235 131
-rect 1359 61 1393 131
-rect 1477 199 1511 353
-rect 1672 320 1706 632
-rect 1649 286 1706 320
-rect 1477 115 1511 131
-rect 1563 199 1597 215
-rect 1563 61 1597 131
-rect 1649 199 1683 286
-rect 1649 115 1683 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 47 279 81 313
-rect 121 353 155 387
-rect 438 501 472 535
-rect 366 427 400 461
-rect 634 353 652 387
-rect 652 353 668 387
-rect 720 353 754 387
-rect 884 501 918 535
-rect 1083 501 1117 535
-rect 980 421 1014 455
-rect 1648 649 1682 683
-rect 1477 575 1511 609
-rect 1497 421 1531 455
-rect 1203 353 1237 387
-rect 1355 301 1389 313
-rect 1355 279 1389 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 1311 1738 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1738 1311
-rect 0 1271 1738 1277
-rect 1636 683 1694 689
-rect 1614 649 1648 683
-rect 1682 649 1694 683
-rect 1636 643 1694 649
-rect 1465 609 1523 615
-rect 1442 575 1477 609
-rect 1511 575 1523 609
-rect 1465 569 1523 575
-rect 426 535 484 541
-rect 872 535 930 541
-rect 1071 535 1129 541
-rect 426 501 438 535
-rect 472 501 884 535
-rect 918 501 1083 535
-rect 1117 501 1129 535
-rect 426 495 484 501
-rect 872 495 930 501
-rect 1071 495 1129 501
-rect 354 461 412 467
-rect 354 427 366 461
-rect 400 427 434 461
-rect 968 455 1026 461
-rect 1485 455 1543 461
-rect 354 421 412 427
-rect 968 421 980 455
-rect 1014 421 1497 455
-rect 1531 421 1543 455
-rect 968 415 1026 421
-rect 1485 415 1543 421
-rect 109 387 167 393
-rect 622 387 680 393
-rect 109 353 121 387
-rect 155 353 634 387
-rect 668 353 680 387
-rect 109 347 167 353
-rect 622 347 680 353
-rect 708 387 766 393
-rect 1191 387 1249 393
-rect 708 353 720 387
-rect 754 353 1203 387
-rect 1237 353 1249 387
-rect 708 347 766 353
-rect 1191 347 1249 353
-rect 35 313 93 319
-rect 1343 313 1401 319
-rect 35 279 47 313
-rect 81 279 1355 313
-rect 1389 279 1401 313
-rect 35 273 93 279
-rect 1343 273 1401 279
-rect 0 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 444 383 444 1 D
-port 1 n
-rlabel viali 1100 518 1100 518 1 CK
-port 2 n
-rlabel viali 1665 666 1665 666 1 Q
-port 4 n
-rlabel viali 1495 592 1495 592 1 QN
-port 3 n
-rlabel viali 64 296 64 296 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__dffs_l.mag b/18T_ls/sky130_osu_sc_18T_ls__dffs_l.mag
deleted file mode 100644
index 6bb4f01..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__dffs_l.mag
+++ /dev/null
@@ -1,721 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864594
-<< checkpaint >>
-rect -1210 -1243 2840 2575
-<< nwell >>
-rect -10 581 1741 1341
-<< nmos >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 356 115 386 315
-rect 428 115 458 315
-rect 548 115 578 315
-rect 620 115 650 315
-rect 706 115 736 315
-rect 778 115 808 315
-rect 898 115 928 315
-rect 970 115 1000 315
-rect 1056 115 1086 315
-rect 1246 115 1276 263
-rect 1318 115 1348 263
-rect 1522 115 1552 263
-rect 1608 115 1638 263
-<< pmoshvt >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 356 617 386 1217
-rect 428 617 458 1217
-rect 548 617 578 1217
-rect 620 617 650 1217
-rect 706 617 736 1217
-rect 778 617 808 1217
-rect 898 617 928 1217
-rect 970 617 1000 1217
-rect 1056 617 1086 1217
-rect 1246 817 1276 1217
-rect 1332 817 1362 1217
-rect 1522 817 1552 1217
-rect 1608 817 1638 1217
-<< ndiff >>
-rect 303 267 356 315
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 115 152 263
-rect 182 199 235 263
-rect 182 131 193 199
-rect 227 131 235 199
-rect 182 115 235 131
-rect 303 131 311 267
-rect 345 131 356 267
-rect 303 115 356 131
-rect 386 115 428 315
-rect 458 267 548 315
-rect 458 131 469 267
-rect 537 131 548 267
-rect 458 115 548 131
-rect 578 115 620 315
-rect 650 199 706 315
-rect 650 131 661 199
-rect 695 131 706 199
-rect 650 115 706 131
-rect 736 115 778 315
-rect 808 267 898 315
-rect 808 131 819 267
-rect 887 131 898 267
-rect 808 115 898 131
-rect 928 115 970 315
-rect 1000 267 1056 315
-rect 1000 131 1011 267
-rect 1045 131 1056 267
-rect 1000 115 1056 131
-rect 1086 267 1139 315
-rect 1086 131 1097 267
-rect 1131 131 1139 267
-rect 1086 115 1139 131
-rect 1193 199 1246 263
-rect 1193 131 1201 199
-rect 1235 131 1246 199
-rect 1193 115 1246 131
-rect 1276 115 1318 263
-rect 1348 199 1401 263
-rect 1348 131 1359 199
-rect 1393 131 1401 199
-rect 1348 115 1401 131
-rect 1469 199 1522 263
-rect 1469 131 1477 199
-rect 1511 131 1522 199
-rect 1469 115 1522 131
-rect 1552 199 1608 263
-rect 1552 131 1563 199
-rect 1597 131 1608 199
-rect 1552 115 1608 131
-rect 1638 199 1691 263
-rect 1638 131 1649 199
-rect 1683 131 1691 199
-rect 1638 115 1691 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 817 80 929
-rect 110 1201 166 1217
-rect 110 929 121 1201
-rect 155 929 166 1201
-rect 110 817 166 929
-rect 196 1201 249 1217
-rect 196 929 207 1201
-rect 241 929 249 1201
-rect 196 817 249 929
-rect 303 1201 356 1217
-rect 303 725 311 1201
-rect 345 725 356 1201
-rect 303 617 356 725
-rect 386 617 428 1217
-rect 458 1201 548 1217
-rect 458 657 469 1201
-rect 537 657 548 1201
-rect 458 617 548 657
-rect 578 617 620 1217
-rect 650 1201 706 1217
-rect 650 725 661 1201
-rect 695 725 706 1201
-rect 650 617 706 725
-rect 736 617 778 1217
-rect 808 1201 898 1217
-rect 808 725 819 1201
-rect 887 725 898 1201
-rect 808 617 898 725
-rect 928 617 970 1217
-rect 1000 1201 1056 1217
-rect 1000 657 1011 1201
-rect 1045 657 1056 1201
-rect 1000 617 1056 657
-rect 1086 1201 1139 1217
-rect 1086 657 1097 1201
-rect 1131 657 1139 1201
-rect 1193 1201 1246 1217
-rect 1193 929 1201 1201
-rect 1235 929 1246 1201
-rect 1193 817 1246 929
-rect 1276 1201 1332 1217
-rect 1276 929 1287 1201
-rect 1321 929 1332 1201
-rect 1276 817 1332 929
-rect 1362 1201 1415 1217
-rect 1362 929 1373 1201
-rect 1407 929 1415 1201
-rect 1362 817 1415 929
-rect 1469 1201 1522 1217
-rect 1469 861 1477 1201
-rect 1511 861 1522 1201
-rect 1469 817 1522 861
-rect 1552 1201 1608 1217
-rect 1552 861 1563 1201
-rect 1597 861 1608 1201
-rect 1552 817 1608 861
-rect 1638 1201 1691 1217
-rect 1638 861 1649 1201
-rect 1683 861 1691 1201
-rect 1638 817 1691 861
-rect 1086 617 1139 657
-<< ndiffc >>
-rect 35 131 69 199
-rect 193 131 227 199
-rect 311 131 345 267
-rect 469 131 537 267
-rect 661 131 695 199
-rect 819 131 887 267
-rect 1011 131 1045 267
-rect 1097 131 1131 267
-rect 1201 131 1235 199
-rect 1359 131 1393 199
-rect 1477 131 1511 199
-rect 1563 131 1597 199
-rect 1649 131 1683 199
-<< pdiffc >>
-rect 35 929 69 1201
-rect 121 929 155 1201
-rect 207 929 241 1201
-rect 311 725 345 1201
-rect 469 657 537 1201
-rect 661 725 695 1201
-rect 819 725 887 1201
-rect 1011 657 1045 1201
-rect 1097 657 1131 1201
-rect 1201 929 1235 1201
-rect 1287 929 1321 1201
-rect 1373 929 1407 1201
-rect 1477 861 1511 1201
-rect 1563 861 1597 1201
-rect 1649 861 1683 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 356 1217 386 1243
-rect 428 1217 458 1243
-rect 548 1217 578 1243
-rect 620 1217 650 1243
-rect 706 1217 736 1243
-rect 778 1217 808 1243
-rect 898 1217 928 1243
-rect 970 1217 1000 1243
-rect 1056 1217 1086 1243
-rect 1246 1217 1276 1243
-rect 1332 1217 1362 1243
-rect 1522 1217 1552 1243
-rect 1608 1217 1638 1243
-rect 80 403 110 817
-rect 166 494 196 817
-rect 37 387 110 403
-rect 37 353 47 387
-rect 81 353 110 387
-rect 37 337 110 353
-rect 80 263 110 337
-rect 152 478 233 494
-rect 152 444 189 478
-rect 223 444 233 478
-rect 152 428 233 444
-rect 356 477 386 617
-rect 428 586 458 617
-rect 428 570 482 586
-rect 428 536 438 570
-rect 472 536 482 570
-rect 428 520 482 536
-rect 356 461 410 477
-rect 548 475 578 617
-rect 620 580 650 617
-rect 706 580 736 617
-rect 620 570 736 580
-rect 620 536 652 570
-rect 686 536 736 570
-rect 620 526 736 536
-rect 778 475 808 617
-rect 898 586 928 617
-rect 874 570 928 586
-rect 874 536 884 570
-rect 918 536 928 570
-rect 874 520 928 536
-rect 152 263 182 428
-rect 356 427 366 461
-rect 400 427 410 461
-rect 356 411 410 427
-rect 452 445 904 475
-rect 356 315 386 411
-rect 452 367 482 445
-rect 874 403 904 445
-rect 970 471 1000 617
-rect 1056 586 1086 617
-rect 1056 570 1127 586
-rect 1056 556 1083 570
-rect 1067 536 1083 556
-rect 1117 536 1127 570
-rect 1067 520 1127 536
-rect 970 455 1024 471
-rect 970 421 980 455
-rect 1014 421 1024 455
-rect 970 405 1024 421
-rect 428 337 482 367
-rect 524 387 578 403
-rect 524 353 534 387
-rect 568 353 578 387
-rect 524 337 578 353
-rect 428 315 458 337
-rect 548 315 578 337
-rect 620 387 736 397
-rect 620 353 652 387
-rect 686 353 736 387
-rect 620 343 736 353
-rect 620 315 650 343
-rect 706 315 736 343
-rect 778 387 832 403
-rect 778 353 788 387
-rect 822 353 832 387
-rect 778 337 832 353
-rect 874 387 928 403
-rect 874 353 884 387
-rect 918 353 928 387
-rect 874 337 928 353
-rect 778 315 808 337
-rect 898 315 928 337
-rect 970 315 1000 405
-rect 1067 367 1097 520
-rect 1246 403 1276 817
-rect 1056 337 1097 367
-rect 1193 387 1276 403
-rect 1193 353 1203 387
-rect 1237 353 1276 387
-rect 1193 337 1276 353
-rect 1056 315 1086 337
-rect 1246 263 1276 337
-rect 1332 351 1362 817
-rect 1522 601 1552 817
-rect 1512 571 1552 601
-rect 1512 471 1542 571
-rect 1608 512 1638 817
-rect 1487 455 1542 471
-rect 1487 421 1497 455
-rect 1531 421 1542 455
-rect 1584 496 1638 512
-rect 1584 462 1594 496
-rect 1628 462 1638 496
-rect 1584 446 1638 462
-rect 1487 405 1542 421
-rect 1512 360 1542 405
-rect 1332 335 1399 351
-rect 1318 301 1355 335
-rect 1389 301 1399 335
-rect 1512 330 1552 360
-rect 1318 285 1399 301
-rect 1318 263 1348 285
-rect 1522 263 1552 330
-rect 1608 263 1638 446
-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 353 81 387
-rect 189 444 223 478
-rect 438 536 472 570
-rect 652 536 686 570
-rect 884 536 918 570
-rect 366 427 400 461
-rect 1083 536 1117 570
-rect 980 421 1014 455
-rect 534 353 568 387
-rect 652 353 686 387
-rect 788 353 822 387
-rect 884 353 918 387
-rect 1203 353 1237 387
-rect 1497 421 1531 455
-rect 1594 462 1628 496
-rect 1355 301 1389 335
-<< locali >>
-rect 0 1311 1738 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1738 1311
-rect 35 1201 69 1271
-rect 35 913 69 929
-rect 121 1201 155 1217
-rect 47 387 81 403
-rect 47 313 81 353
-rect 121 387 155 929
-rect 207 1201 241 1271
-rect 207 913 241 929
-rect 311 1201 345 1271
-rect 311 709 345 725
-rect 469 1201 537 1217
-rect 661 1201 695 1271
-rect 661 709 695 725
-rect 819 1201 887 1217
-rect 469 654 537 657
-rect 819 654 887 725
-rect 121 233 155 353
-rect 189 620 537 654
-rect 720 620 887 654
-rect 1011 1201 1045 1271
-rect 1011 641 1045 657
-rect 1097 1201 1131 1217
-rect 1201 1201 1235 1271
-rect 1201 913 1235 929
-rect 1287 1201 1321 1217
-rect 1097 654 1131 657
-rect 1097 620 1187 654
-rect 189 478 223 620
-rect 438 570 472 586
-rect 438 535 472 536
-rect 652 570 686 586
-rect 472 501 568 535
-rect 189 370 223 444
-rect 366 461 400 477
-rect 366 411 400 427
-rect 534 387 568 501
-rect 652 387 686 536
-rect 189 336 500 370
-rect 534 337 568 353
-rect 652 337 686 353
-rect 720 387 754 620
-rect 884 570 918 586
-rect 884 535 918 536
-rect 466 283 500 336
-rect 720 303 754 353
-rect 788 501 884 535
-rect 1083 570 1117 586
-rect 1083 535 1117 536
-rect 788 387 822 501
-rect 1151 467 1187 620
-rect 964 421 980 455
-rect 1014 421 1030 455
-rect 1097 433 1187 467
-rect 1287 455 1321 929
-rect 1373 1201 1407 1271
-rect 1373 913 1407 929
-rect 1477 1201 1511 1217
-rect 1477 609 1511 861
-rect 1563 1201 1597 1271
-rect 1563 845 1597 861
-rect 1649 1201 1683 1217
-rect 1649 683 1683 861
-rect 1682 666 1683 683
-rect 1682 649 1706 666
-rect 1649 632 1706 649
-rect 1477 570 1511 575
-rect 1477 536 1628 570
-rect 1594 496 1628 536
-rect 1097 387 1131 433
-rect 1287 421 1497 455
-rect 1531 421 1547 455
-rect 868 353 884 387
-rect 918 353 1131 387
-rect 1187 353 1203 387
-rect 1237 353 1253 387
-rect 788 337 822 353
-rect 35 199 155 233
-rect 311 267 345 283
-rect 193 199 227 215
-rect 35 115 69 131
-rect 193 61 227 131
-rect 466 267 537 283
-rect 720 269 887 303
-rect 466 249 469 267
-rect 311 61 345 131
-rect 819 267 887 269
-rect 469 115 537 131
-rect 661 199 695 215
-rect 661 61 695 131
-rect 819 115 887 131
-rect 1011 267 1045 283
-rect 1011 61 1045 131
-rect 1097 267 1131 353
-rect 1287 233 1321 421
-rect 1594 387 1628 462
-rect 1477 353 1628 387
-rect 1355 335 1389 351
-rect 1097 115 1131 131
-rect 1201 199 1321 233
-rect 1359 199 1393 215
-rect 1201 115 1235 131
-rect 1359 61 1393 131
-rect 1477 199 1511 353
-rect 1672 320 1706 632
-rect 1649 286 1706 320
-rect 1477 115 1511 131
-rect 1563 199 1597 215
-rect 1563 61 1597 131
-rect 1649 199 1683 286
-rect 1649 115 1683 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 47 279 81 313
-rect 121 353 155 387
-rect 438 501 472 535
-rect 366 427 400 461
-rect 634 353 652 387
-rect 652 353 668 387
-rect 720 353 754 387
-rect 884 501 918 535
-rect 1083 501 1117 535
-rect 980 421 1014 455
-rect 1648 649 1682 683
-rect 1477 575 1511 609
-rect 1497 421 1531 455
-rect 1203 353 1237 387
-rect 1355 301 1389 313
-rect 1355 279 1389 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 1311 1738 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1738 1311
-rect 0 1271 1738 1277
-rect 1636 683 1694 689
-rect 1614 649 1648 683
-rect 1682 649 1694 683
-rect 1636 643 1694 649
-rect 1465 609 1523 615
-rect 1442 575 1477 609
-rect 1511 575 1523 609
-rect 1465 569 1523 575
-rect 426 535 484 541
-rect 872 535 930 541
-rect 1071 535 1129 541
-rect 426 501 438 535
-rect 472 501 884 535
-rect 918 501 1083 535
-rect 1117 501 1129 535
-rect 426 495 484 501
-rect 872 495 930 501
-rect 1071 495 1129 501
-rect 354 461 412 467
-rect 354 427 366 461
-rect 400 427 434 461
-rect 968 455 1026 461
-rect 1485 455 1543 461
-rect 354 421 412 427
-rect 968 421 980 455
-rect 1014 421 1497 455
-rect 1531 421 1543 455
-rect 968 415 1026 421
-rect 1485 415 1543 421
-rect 109 387 167 393
-rect 622 387 680 393
-rect 109 353 121 387
-rect 155 353 634 387
-rect 668 353 680 387
-rect 109 347 167 353
-rect 622 347 680 353
-rect 708 387 766 393
-rect 1191 387 1249 393
-rect 708 353 720 387
-rect 754 353 1203 387
-rect 1237 353 1249 387
-rect 708 347 766 353
-rect 1191 347 1249 353
-rect 35 313 93 319
-rect 1343 313 1401 319
-rect 35 279 47 313
-rect 81 279 1355 313
-rect 1389 279 1401 313
-rect 35 273 93 279
-rect 1343 273 1401 279
-rect 0 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 444 383 444 1 D
-port 1 n
-rlabel viali 1100 518 1100 518 1 CK
-port 2 n
-rlabel viali 1665 666 1665 666 1 Q
-port 4 n
-rlabel viali 1495 592 1495 592 1 QN
-port 3 n
-rlabel viali 64 296 64 296 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__dffsr_1.mag b/18T_ls/sky130_osu_sc_18T_ls__dffsr_1.mag
deleted file mode 100644
index d95e25d..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__dffsr_1.mag
+++ /dev/null
@@ -1,900 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864594
-<< checkpaint >>
-rect -1210 -1243 3248 2575
-<< nwell >>
-rect -10 581 2090 1341
-<< nmos >>
-rect 80 115 110 315
-rect 272 115 302 263
-rect 370 115 400 315
-rect 442 115 472 315
-rect 632 115 662 315
-rect 704 115 734 315
-rect 824 115 854 315
-rect 896 115 926 315
-rect 982 115 1012 315
-rect 1054 115 1084 315
-rect 1174 115 1204 315
-rect 1246 115 1276 315
-rect 1332 115 1362 315
-rect 1522 115 1552 315
-rect 1594 115 1624 315
-rect 1692 115 1722 263
-rect 1884 115 1914 315
-rect 1970 115 2000 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 270 617 300 1217
-rect 356 617 386 1217
-rect 442 617 472 1217
-rect 632 617 662 1217
-rect 704 617 734 1217
-rect 824 617 854 1217
-rect 896 617 926 1217
-rect 982 617 1012 1217
-rect 1054 617 1084 1217
-rect 1174 617 1204 1217
-rect 1246 617 1276 1217
-rect 1332 617 1362 1217
-rect 1522 617 1552 1217
-rect 1608 617 1638 1217
-rect 1694 617 1724 1217
-rect 1884 617 1914 1217
-rect 1970 617 2000 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 317 267 370 315
-rect 317 263 325 267
-rect 110 115 163 131
-rect 219 199 272 263
-rect 219 131 227 199
-rect 261 131 272 199
-rect 219 115 272 131
-rect 302 131 325 263
-rect 359 131 370 267
-rect 302 115 370 131
-rect 400 115 442 315
-rect 472 267 525 315
-rect 472 131 483 267
-rect 517 131 525 267
-rect 472 115 525 131
-rect 579 267 632 315
-rect 579 131 587 267
-rect 621 131 632 267
-rect 579 115 632 131
-rect 662 115 704 315
-rect 734 267 824 315
-rect 734 131 745 267
-rect 813 131 824 267
-rect 734 115 824 131
-rect 854 115 896 315
-rect 926 199 982 315
-rect 926 131 937 199
-rect 971 131 982 199
-rect 926 115 982 131
-rect 1012 115 1054 315
-rect 1084 267 1174 315
-rect 1084 131 1095 267
-rect 1163 131 1174 267
-rect 1084 115 1174 131
-rect 1204 115 1246 315
-rect 1276 267 1332 315
-rect 1276 131 1287 267
-rect 1321 131 1332 267
-rect 1276 115 1332 131
-rect 1362 267 1415 315
-rect 1362 131 1373 267
-rect 1407 131 1415 267
-rect 1362 115 1415 131
-rect 1469 267 1522 315
-rect 1469 131 1477 267
-rect 1511 131 1522 267
-rect 1469 115 1522 131
-rect 1552 115 1594 315
-rect 1624 267 1677 315
-rect 1624 131 1635 267
-rect 1669 263 1677 267
-rect 1831 267 1884 315
-rect 1669 131 1692 263
-rect 1624 115 1692 131
-rect 1722 199 1775 263
-rect 1722 131 1733 199
-rect 1767 131 1775 199
-rect 1722 115 1775 131
-rect 1831 131 1839 267
-rect 1873 131 1884 267
-rect 1831 115 1884 131
-rect 1914 267 1970 315
-rect 1914 131 1925 267
-rect 1959 131 1970 267
-rect 1914 115 1970 131
-rect 2000 267 2053 315
-rect 2000 131 2011 267
-rect 2045 131 2053 267
-rect 2000 115 2053 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-rect 217 1201 270 1217
-rect 217 725 225 1201
-rect 259 725 270 1201
-rect 217 617 270 725
-rect 300 1201 356 1217
-rect 300 725 311 1201
-rect 345 725 356 1201
-rect 300 617 356 725
-rect 386 1201 442 1217
-rect 386 793 397 1201
-rect 431 793 442 1201
-rect 386 617 442 793
-rect 472 1201 525 1217
-rect 472 725 483 1201
-rect 517 725 525 1201
-rect 472 617 525 725
-rect 579 1201 632 1217
-rect 579 725 587 1201
-rect 621 725 632 1201
-rect 579 617 632 725
-rect 662 617 704 1217
-rect 734 1201 824 1217
-rect 734 657 745 1201
-rect 813 657 824 1201
-rect 734 617 824 657
-rect 854 617 896 1217
-rect 926 1201 982 1217
-rect 926 725 937 1201
-rect 971 725 982 1201
-rect 926 617 982 725
-rect 1012 617 1054 1217
-rect 1084 1201 1174 1217
-rect 1084 725 1095 1201
-rect 1163 725 1174 1201
-rect 1084 617 1174 725
-rect 1204 617 1246 1217
-rect 1276 1201 1332 1217
-rect 1276 657 1287 1201
-rect 1321 657 1332 1201
-rect 1276 617 1332 657
-rect 1362 1201 1415 1217
-rect 1362 657 1373 1201
-rect 1407 657 1415 1201
-rect 1362 617 1415 657
-rect 1469 1201 1522 1217
-rect 1469 725 1477 1201
-rect 1511 725 1522 1201
-rect 1469 617 1522 725
-rect 1552 1201 1608 1217
-rect 1552 793 1563 1201
-rect 1597 793 1608 1201
-rect 1552 617 1608 793
-rect 1638 1201 1694 1217
-rect 1638 725 1649 1201
-rect 1683 725 1694 1201
-rect 1638 617 1694 725
-rect 1724 1201 1777 1217
-rect 1724 725 1735 1201
-rect 1769 725 1777 1201
-rect 1724 617 1777 725
-rect 1831 1201 1884 1217
-rect 1831 657 1839 1201
-rect 1873 657 1884 1201
-rect 1831 617 1884 657
-rect 1914 1201 1970 1217
-rect 1914 657 1925 1201
-rect 1959 657 1970 1201
-rect 1914 617 1970 657
-rect 2000 1201 2053 1217
-rect 2000 657 2011 1201
-rect 2045 657 2053 1201
-rect 2000 617 2053 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 227 131 261 199
-rect 325 131 359 267
-rect 483 131 517 267
-rect 587 131 621 267
-rect 745 131 813 267
-rect 937 131 971 199
-rect 1095 131 1163 267
-rect 1287 131 1321 267
-rect 1373 131 1407 267
-rect 1477 131 1511 267
-rect 1635 131 1669 267
-rect 1733 131 1767 199
-rect 1839 131 1873 267
-rect 1925 131 1959 267
-rect 2011 131 2045 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 225 725 259 1201
-rect 311 725 345 1201
-rect 397 793 431 1201
-rect 483 725 517 1201
-rect 587 725 621 1201
-rect 745 657 813 1201
-rect 937 725 971 1201
-rect 1095 725 1163 1201
-rect 1287 657 1321 1201
-rect 1373 657 1407 1201
-rect 1477 725 1511 1201
-rect 1563 793 1597 1201
-rect 1649 725 1683 1201
-rect 1735 725 1769 1201
-rect 1839 657 1873 1201
-rect 1925 657 1959 1201
-rect 2011 657 2045 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-rect 1658 1271 1682 1305
-rect 1716 1271 1740 1305
-rect 1794 1271 1818 1305
-rect 1852 1271 1876 1305
-rect 1930 1271 1954 1305
-rect 1988 1271 2012 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-rect 1682 1271 1716 1305
-rect 1818 1271 1852 1305
-rect 1954 1271 1988 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 270 1217 300 1243
-rect 356 1217 386 1243
-rect 442 1217 472 1243
-rect 632 1217 662 1243
-rect 704 1217 734 1243
-rect 824 1217 854 1243
-rect 896 1217 926 1243
-rect 982 1217 1012 1243
-rect 1054 1217 1084 1243
-rect 1174 1217 1204 1243
-rect 1246 1217 1276 1243
-rect 1332 1217 1362 1243
-rect 1522 1217 1552 1243
-rect 1608 1217 1638 1243
-rect 1694 1217 1724 1243
-rect 1884 1217 1914 1243
-rect 1970 1217 2000 1243
-rect 80 494 110 617
-rect 270 579 300 617
-rect 243 549 300 579
-rect 79 478 133 494
-rect 79 444 89 478
-rect 123 444 133 478
-rect 79 428 133 444
-rect 79 427 110 428
-rect 80 315 110 427
-rect 243 351 273 549
-rect 356 507 386 617
-rect 442 586 472 617
-rect 432 570 486 586
-rect 432 536 442 570
-rect 476 536 486 570
-rect 432 520 486 536
-rect 315 491 386 507
-rect 315 457 325 491
-rect 359 477 386 491
-rect 359 457 400 477
-rect 315 441 400 457
-rect 356 355 400 441
-rect 219 335 273 351
-rect 219 301 229 335
-rect 263 317 273 335
-rect 263 301 302 317
-rect 370 315 400 355
-rect 442 315 472 520
-rect 632 477 662 617
-rect 704 586 734 617
-rect 704 570 758 586
-rect 704 536 714 570
-rect 748 536 758 570
-rect 704 520 758 536
-rect 632 461 686 477
-rect 824 475 854 617
-rect 896 580 926 617
-rect 982 580 1012 617
-rect 896 570 1012 580
-rect 896 536 928 570
-rect 962 536 1012 570
-rect 896 526 1012 536
-rect 1054 475 1084 617
-rect 1174 586 1204 617
-rect 1150 570 1204 586
-rect 1150 536 1160 570
-rect 1194 536 1204 570
-rect 1150 520 1204 536
-rect 632 427 642 461
-rect 676 427 686 461
-rect 632 411 686 427
-rect 728 445 1180 475
-rect 632 315 662 411
-rect 728 367 758 445
-rect 1150 403 1180 445
-rect 1246 471 1276 617
-rect 1332 586 1362 617
-rect 1332 570 1403 586
-rect 1522 580 1552 617
-rect 1332 556 1359 570
-rect 1343 536 1359 556
-rect 1393 536 1403 570
-rect 1343 520 1403 536
-rect 1486 570 1552 580
-rect 1486 536 1502 570
-rect 1536 536 1552 570
-rect 1486 526 1552 536
-rect 1246 455 1300 471
-rect 1246 421 1256 455
-rect 1290 421 1300 455
-rect 1246 405 1300 421
-rect 704 337 758 367
-rect 800 387 854 403
-rect 800 353 810 387
-rect 844 353 854 387
-rect 800 337 854 353
-rect 704 315 734 337
-rect 824 315 854 337
-rect 896 387 1012 397
-rect 896 353 928 387
-rect 962 353 1012 387
-rect 896 343 1012 353
-rect 896 315 926 343
-rect 982 315 1012 343
-rect 1054 387 1108 403
-rect 1054 353 1064 387
-rect 1098 353 1108 387
-rect 1054 337 1108 353
-rect 1150 387 1204 403
-rect 1150 353 1160 387
-rect 1194 353 1204 387
-rect 1150 337 1204 353
-rect 1054 315 1084 337
-rect 1174 315 1204 337
-rect 1246 315 1276 405
-rect 1343 367 1373 520
-rect 1332 337 1373 367
-rect 1486 370 1516 526
-rect 1608 484 1638 617
-rect 1694 579 1724 617
-rect 1884 601 1914 617
-rect 1694 553 1751 579
-rect 1874 571 1914 601
-rect 1694 549 1775 553
-rect 1721 521 1775 549
-rect 1576 468 1638 484
-rect 1576 434 1588 468
-rect 1622 434 1638 468
-rect 1576 418 1638 434
-rect 1486 338 1552 370
-rect 1332 315 1362 337
-rect 1522 315 1552 338
-rect 1594 315 1624 418
-rect 1745 351 1775 521
-rect 1874 471 1904 571
-rect 1970 512 2000 617
-rect 1849 455 1904 471
-rect 1849 421 1859 455
-rect 1893 421 1904 455
-rect 1946 496 2000 512
-rect 1946 462 1956 496
-rect 1990 462 2000 496
-rect 1946 446 2000 462
-rect 1849 405 1904 421
-rect 1874 360 1904 405
-rect 1745 335 1799 351
-rect 1745 315 1755 335
-rect 219 285 302 301
-rect 272 263 302 285
-rect 1692 301 1755 315
-rect 1789 301 1799 335
-rect 1874 330 1914 360
-rect 1884 315 1914 330
-rect 1970 315 2000 446
-rect 1692 285 1799 301
-rect 1692 263 1722 285
-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 444 123 478
-rect 442 536 476 570
-rect 325 457 359 491
-rect 229 301 263 335
-rect 714 536 748 570
-rect 928 536 962 570
-rect 1160 536 1194 570
-rect 642 427 676 461
-rect 1359 536 1393 570
-rect 1502 536 1536 570
-rect 1256 421 1290 455
-rect 810 353 844 387
-rect 928 353 962 387
-rect 1064 353 1098 387
-rect 1160 353 1194 387
-rect 1588 434 1622 468
-rect 1859 421 1893 455
-rect 1956 462 1990 496
-rect 1755 301 1789 335
-<< locali >>
-rect 0 1311 2090 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1682 1311
-rect 1716 1271 1818 1311
-rect 1852 1271 1954 1311
-rect 1988 1271 2090 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 494 81 649
-rect 121 565 155 657
-rect 225 1201 259 1217
-rect 121 531 191 565
-rect 47 478 123 494
-rect 47 444 89 478
-rect 89 428 123 444
-rect 157 335 191 531
-rect 225 421 259 725
-rect 311 1201 345 1217
-rect 397 1201 431 1271
-rect 397 777 431 793
-rect 483 1201 517 1217
-rect 345 725 483 743
-rect 311 709 517 725
-rect 587 1201 621 1271
-rect 587 709 621 725
-rect 745 1201 813 1217
-rect 937 1201 971 1271
-rect 937 709 971 725
-rect 1095 1201 1163 1217
-rect 813 657 816 675
-rect 745 654 816 657
-rect 1095 654 1163 725
-rect 442 620 816 654
-rect 996 620 1163 654
-rect 1287 1201 1321 1271
-rect 1287 641 1321 657
-rect 1373 1201 1407 1217
-rect 1477 1201 1511 1217
-rect 1563 1201 1597 1271
-rect 1563 777 1597 793
-rect 1649 1201 1683 1217
-rect 1511 725 1649 743
-rect 1477 709 1683 725
-rect 1735 1201 1769 1217
-rect 1373 654 1407 657
-rect 1373 620 1461 654
-rect 325 491 359 575
-rect 442 570 476 620
-rect 309 457 325 491
-rect 359 457 375 491
-rect 225 387 359 421
-rect 121 301 229 335
-rect 263 301 279 335
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 301
-rect 325 267 359 353
-rect 442 370 476 536
-rect 714 570 748 586
-rect 714 535 748 536
-rect 928 570 962 586
-rect 748 501 844 535
-rect 642 461 676 477
-rect 642 411 676 427
-rect 810 387 844 501
-rect 928 387 962 536
-rect 442 336 776 370
-rect 810 337 844 353
-rect 928 337 962 353
-rect 996 387 1030 620
-rect 1160 570 1194 586
-rect 1160 535 1194 536
-rect 742 283 776 336
-rect 996 303 1030 353
-rect 1064 501 1160 535
-rect 1359 570 1393 586
-rect 1359 535 1393 536
-rect 1064 387 1098 501
-rect 1427 455 1461 620
-rect 1240 421 1256 455
-rect 1290 421 1306 455
-rect 1373 421 1461 455
-rect 1502 570 1536 586
-rect 1373 387 1407 421
-rect 1144 353 1160 387
-rect 1194 353 1407 387
-rect 1502 387 1536 536
-rect 1570 484 1604 575
-rect 1570 468 1638 484
-rect 1570 434 1588 468
-rect 1622 434 1638 468
-rect 1735 455 1769 725
-rect 1839 1201 1873 1217
-rect 1839 609 1873 657
-rect 1925 1201 1959 1271
-rect 1925 641 1959 657
-rect 2011 1201 2045 1217
-rect 2011 635 2045 649
-rect 2011 601 2068 635
-rect 1839 570 1873 575
-rect 1839 536 1990 570
-rect 1956 496 1990 536
-rect 1672 421 1859 455
-rect 1893 421 1909 455
-rect 1672 399 1706 421
-rect 1635 365 1706 399
-rect 1956 387 1990 462
-rect 1064 337 1098 353
-rect 121 115 155 131
-rect 227 199 261 215
-rect 227 61 261 131
-rect 325 115 359 131
-rect 483 267 517 283
-rect 483 61 517 131
-rect 587 267 621 283
-rect 742 267 813 283
-rect 996 269 1163 303
-rect 742 249 745 267
-rect 587 61 621 131
-rect 1095 267 1163 269
-rect 745 115 813 131
-rect 937 199 971 215
-rect 937 61 971 131
-rect 1095 115 1163 131
-rect 1287 267 1321 283
-rect 1287 61 1321 131
-rect 1373 267 1407 353
-rect 1373 115 1407 131
-rect 1477 267 1511 283
-rect 1477 61 1511 131
-rect 1635 267 1669 365
-rect 1839 353 1990 387
-rect 1739 301 1755 335
-rect 1789 301 1805 335
-rect 1839 267 1873 353
-rect 2034 320 2068 601
-rect 2011 286 2068 320
-rect 1635 115 1669 131
-rect 1733 199 1767 215
-rect 1733 61 1767 131
-rect 1839 115 1873 131
-rect 1925 267 1959 283
-rect 1925 61 1959 131
-rect 2011 267 2045 286
-rect 2011 115 2045 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 1682 1305 1716 1311
-rect 1682 1277 1716 1305
-rect 1818 1305 1852 1311
-rect 1818 1277 1852 1305
-rect 1954 1305 1988 1311
-rect 1954 1277 1988 1305
-rect 47 649 81 683
-rect 325 575 359 609
-rect 325 353 359 387
-rect 229 301 263 313
-rect 229 279 263 301
-rect 714 501 748 535
-rect 642 427 676 461
-rect 910 353 928 387
-rect 928 353 944 387
-rect 996 353 1030 387
-rect 1160 501 1194 535
-rect 1359 501 1393 535
-rect 1256 421 1290 455
-rect 1570 575 1604 609
-rect 2011 657 2045 683
-rect 2011 649 2045 657
-rect 1839 575 1873 609
-rect 1859 421 1893 455
-rect 1502 353 1536 387
-rect 1755 301 1789 313
-rect 1755 279 1789 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 1311 2090 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1682 1311
-rect 1716 1277 1818 1311
-rect 1852 1277 1954 1311
-rect 1988 1277 2090 1311
-rect 0 1271 2090 1277
-rect 35 683 93 689
-rect 1999 683 2057 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 1977 649 2011 683
-rect 2045 649 2057 683
-rect 35 643 93 649
-rect 1999 643 2057 649
-rect 313 609 371 615
-rect 1558 609 1616 615
-rect 1827 609 1885 615
-rect 313 575 325 609
-rect 359 575 1570 609
-rect 1604 575 1616 609
-rect 1804 575 1839 609
-rect 1873 575 1885 609
-rect 313 569 371 575
-rect 1558 569 1616 575
-rect 1827 569 1885 575
-rect 702 535 760 541
-rect 1148 535 1206 541
-rect 1347 535 1405 541
-rect 702 501 714 535
-rect 748 501 1160 535
-rect 1194 501 1359 535
-rect 1393 501 1405 535
-rect 702 495 760 501
-rect 1148 495 1206 501
-rect 1347 495 1405 501
-rect 630 461 688 467
-rect 630 427 642 461
-rect 676 427 710 461
-rect 1244 455 1302 461
-rect 1847 455 1905 461
-rect 630 421 688 427
-rect 1244 421 1256 455
-rect 1290 421 1859 455
-rect 1893 421 1905 455
-rect 1244 415 1302 421
-rect 1847 415 1905 421
-rect 313 387 371 393
-rect 898 387 956 393
-rect 313 353 325 387
-rect 359 353 910 387
-rect 944 353 956 387
-rect 313 347 371 353
-rect 898 347 956 353
-rect 984 387 1042 393
-rect 1490 387 1548 393
-rect 984 353 996 387
-rect 1030 353 1502 387
-rect 1536 353 1548 387
-rect 984 347 1042 353
-rect 1490 347 1548 353
-rect 217 313 275 319
-rect 1743 313 1801 319
-rect 217 279 229 313
-rect 263 279 1755 313
-rect 1789 279 1801 313
-rect 217 273 275 279
-rect 1743 273 1801 279
-rect 0 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel metal1 659 444 659 444 1 D
-port 1 n
-rlabel metal1 1376 518 1376 518 1 CK
-port 2 n
-rlabel metal1 1857 592 1857 592 1 QN
-port 3 n
-rlabel metal1 1587 592 1587 592 1 SN
-port 4 n
-rlabel metal1 65 666 65 666 1 RN
-port 5 n
-rlabel metal1 2028 666 2028 666 1 Q
-port 6 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__dffsr_l.mag b/18T_ls/sky130_osu_sc_18T_ls__dffsr_l.mag
deleted file mode 100644
index 1de3dcd..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__dffsr_l.mag
+++ /dev/null
@@ -1,899 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864594
-<< checkpaint >>
-rect -1210 -1243 3248 2575
-<< nwell >>
-rect -10 581 2090 1341
-<< nmos >>
-rect 80 115 110 315
-rect 272 115 302 263
-rect 370 115 400 315
-rect 442 115 472 315
-rect 632 115 662 315
-rect 704 115 734 315
-rect 824 115 854 315
-rect 896 115 926 315
-rect 982 115 1012 315
-rect 1054 115 1084 315
-rect 1174 115 1204 315
-rect 1246 115 1276 315
-rect 1332 115 1362 315
-rect 1522 115 1552 315
-rect 1594 115 1624 315
-rect 1692 115 1722 263
-rect 1884 115 1914 263
-rect 1970 115 2000 263
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 270 617 300 1217
-rect 356 617 386 1217
-rect 442 617 472 1217
-rect 632 617 662 1217
-rect 704 617 734 1217
-rect 824 617 854 1217
-rect 896 617 926 1217
-rect 982 617 1012 1217
-rect 1054 617 1084 1217
-rect 1174 617 1204 1217
-rect 1246 617 1276 1217
-rect 1332 617 1362 1217
-rect 1522 617 1552 1217
-rect 1608 617 1638 1217
-rect 1694 617 1724 1217
-rect 1884 817 1914 1217
-rect 1970 817 2000 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 317 267 370 315
-rect 317 263 325 267
-rect 110 115 163 131
-rect 219 199 272 263
-rect 219 131 227 199
-rect 261 131 272 199
-rect 219 115 272 131
-rect 302 131 325 263
-rect 359 131 370 267
-rect 302 115 370 131
-rect 400 115 442 315
-rect 472 267 525 315
-rect 472 131 483 267
-rect 517 131 525 267
-rect 472 115 525 131
-rect 579 267 632 315
-rect 579 131 587 267
-rect 621 131 632 267
-rect 579 115 632 131
-rect 662 115 704 315
-rect 734 267 824 315
-rect 734 131 745 267
-rect 813 131 824 267
-rect 734 115 824 131
-rect 854 115 896 315
-rect 926 199 982 315
-rect 926 131 937 199
-rect 971 131 982 199
-rect 926 115 982 131
-rect 1012 115 1054 315
-rect 1084 267 1174 315
-rect 1084 131 1095 267
-rect 1163 131 1174 267
-rect 1084 115 1174 131
-rect 1204 115 1246 315
-rect 1276 267 1332 315
-rect 1276 131 1287 267
-rect 1321 131 1332 267
-rect 1276 115 1332 131
-rect 1362 267 1415 315
-rect 1362 131 1373 267
-rect 1407 131 1415 267
-rect 1362 115 1415 131
-rect 1469 267 1522 315
-rect 1469 131 1477 267
-rect 1511 131 1522 267
-rect 1469 115 1522 131
-rect 1552 115 1594 315
-rect 1624 267 1677 315
-rect 1624 131 1635 267
-rect 1669 263 1677 267
-rect 1669 131 1692 263
-rect 1624 115 1692 131
-rect 1722 199 1775 263
-rect 1722 131 1733 199
-rect 1767 131 1775 199
-rect 1722 115 1775 131
-rect 1831 199 1884 263
-rect 1831 131 1839 199
-rect 1873 131 1884 199
-rect 1831 115 1884 131
-rect 1914 199 1970 263
-rect 1914 131 1925 199
-rect 1959 131 1970 199
-rect 1914 115 1970 131
-rect 2000 199 2053 263
-rect 2000 131 2011 199
-rect 2045 131 2053 199
-rect 2000 115 2053 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-rect 217 1201 270 1217
-rect 217 725 225 1201
-rect 259 725 270 1201
-rect 217 617 270 725
-rect 300 1201 356 1217
-rect 300 725 311 1201
-rect 345 725 356 1201
-rect 300 617 356 725
-rect 386 1201 442 1217
-rect 386 793 397 1201
-rect 431 793 442 1201
-rect 386 617 442 793
-rect 472 1201 525 1217
-rect 472 725 483 1201
-rect 517 725 525 1201
-rect 472 617 525 725
-rect 579 1201 632 1217
-rect 579 725 587 1201
-rect 621 725 632 1201
-rect 579 617 632 725
-rect 662 617 704 1217
-rect 734 1201 824 1217
-rect 734 657 745 1201
-rect 813 657 824 1201
-rect 734 617 824 657
-rect 854 617 896 1217
-rect 926 1201 982 1217
-rect 926 725 937 1201
-rect 971 725 982 1201
-rect 926 617 982 725
-rect 1012 617 1054 1217
-rect 1084 1201 1174 1217
-rect 1084 725 1095 1201
-rect 1163 725 1174 1201
-rect 1084 617 1174 725
-rect 1204 617 1246 1217
-rect 1276 1201 1332 1217
-rect 1276 657 1287 1201
-rect 1321 657 1332 1201
-rect 1276 617 1332 657
-rect 1362 1201 1415 1217
-rect 1362 657 1373 1201
-rect 1407 657 1415 1201
-rect 1362 617 1415 657
-rect 1469 1201 1522 1217
-rect 1469 725 1477 1201
-rect 1511 725 1522 1201
-rect 1469 617 1522 725
-rect 1552 1201 1608 1217
-rect 1552 793 1563 1201
-rect 1597 793 1608 1201
-rect 1552 617 1608 793
-rect 1638 1201 1694 1217
-rect 1638 725 1649 1201
-rect 1683 725 1694 1201
-rect 1638 617 1694 725
-rect 1724 1201 1777 1217
-rect 1724 725 1735 1201
-rect 1769 725 1777 1201
-rect 1831 1201 1884 1217
-rect 1831 861 1839 1201
-rect 1873 861 1884 1201
-rect 1831 817 1884 861
-rect 1914 1201 1970 1217
-rect 1914 861 1925 1201
-rect 1959 861 1970 1201
-rect 1914 817 1970 861
-rect 2000 1201 2053 1217
-rect 2000 861 2011 1201
-rect 2045 861 2053 1201
-rect 2000 817 2053 861
-rect 1724 617 1777 725
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 227 131 261 199
-rect 325 131 359 267
-rect 483 131 517 267
-rect 587 131 621 267
-rect 745 131 813 267
-rect 937 131 971 199
-rect 1095 131 1163 267
-rect 1287 131 1321 267
-rect 1373 131 1407 267
-rect 1477 131 1511 267
-rect 1635 131 1669 267
-rect 1733 131 1767 199
-rect 1839 131 1873 199
-rect 1925 131 1959 199
-rect 2011 131 2045 199
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 225 725 259 1201
-rect 311 725 345 1201
-rect 397 793 431 1201
-rect 483 725 517 1201
-rect 587 725 621 1201
-rect 745 657 813 1201
-rect 937 725 971 1201
-rect 1095 725 1163 1201
-rect 1287 657 1321 1201
-rect 1373 657 1407 1201
-rect 1477 725 1511 1201
-rect 1563 793 1597 1201
-rect 1649 725 1683 1201
-rect 1735 725 1769 1201
-rect 1839 861 1873 1201
-rect 1925 861 1959 1201
-rect 2011 861 2045 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-rect 1658 1271 1682 1305
-rect 1716 1271 1740 1305
-rect 1794 1271 1818 1305
-rect 1852 1271 1876 1305
-rect 1930 1271 1954 1305
-rect 1988 1271 2012 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-rect 1682 1271 1716 1305
-rect 1818 1271 1852 1305
-rect 1954 1271 1988 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 270 1217 300 1243
-rect 356 1217 386 1243
-rect 442 1217 472 1243
-rect 632 1217 662 1243
-rect 704 1217 734 1243
-rect 824 1217 854 1243
-rect 896 1217 926 1243
-rect 982 1217 1012 1243
-rect 1054 1217 1084 1243
-rect 1174 1217 1204 1243
-rect 1246 1217 1276 1243
-rect 1332 1217 1362 1243
-rect 1522 1217 1552 1243
-rect 1608 1217 1638 1243
-rect 1694 1217 1724 1243
-rect 1884 1217 1914 1243
-rect 1970 1217 2000 1243
-rect 80 494 110 617
-rect 270 579 300 617
-rect 243 549 300 579
-rect 79 478 133 494
-rect 79 444 89 478
-rect 123 444 133 478
-rect 79 428 133 444
-rect 79 427 110 428
-rect 80 315 110 427
-rect 243 351 273 549
-rect 356 507 386 617
-rect 442 586 472 617
-rect 432 570 486 586
-rect 432 536 442 570
-rect 476 536 486 570
-rect 432 520 486 536
-rect 315 491 386 507
-rect 315 457 325 491
-rect 359 457 386 491
-rect 315 441 386 457
-rect 356 385 386 441
-rect 356 355 400 385
-rect 219 335 273 351
-rect 219 301 229 335
-rect 263 317 273 335
-rect 263 301 302 317
-rect 370 315 400 355
-rect 442 315 472 520
-rect 632 477 662 617
-rect 704 586 734 617
-rect 704 570 758 586
-rect 704 536 714 570
-rect 748 536 758 570
-rect 704 520 758 536
-rect 632 461 686 477
-rect 824 475 854 617
-rect 896 580 926 617
-rect 982 580 1012 617
-rect 896 570 1012 580
-rect 896 536 928 570
-rect 962 536 1012 570
-rect 896 526 1012 536
-rect 1054 475 1084 617
-rect 1174 586 1204 617
-rect 1150 570 1204 586
-rect 1150 536 1160 570
-rect 1194 536 1204 570
-rect 1150 520 1204 536
-rect 632 427 642 461
-rect 676 427 686 461
-rect 632 411 686 427
-rect 728 445 1180 475
-rect 632 315 662 411
-rect 728 367 758 445
-rect 1150 403 1180 445
-rect 1246 471 1276 617
-rect 1332 586 1362 617
-rect 1332 570 1403 586
-rect 1522 580 1552 617
-rect 1332 556 1359 570
-rect 1343 536 1359 556
-rect 1393 536 1403 570
-rect 1343 520 1403 536
-rect 1486 570 1552 580
-rect 1486 536 1502 570
-rect 1536 536 1552 570
-rect 1486 526 1552 536
-rect 1246 455 1300 471
-rect 1246 421 1256 455
-rect 1290 421 1300 455
-rect 1246 405 1300 421
-rect 704 337 758 367
-rect 800 387 854 403
-rect 800 353 810 387
-rect 844 353 854 387
-rect 800 337 854 353
-rect 704 315 734 337
-rect 824 315 854 337
-rect 896 387 1012 397
-rect 896 353 928 387
-rect 962 353 1012 387
-rect 896 343 1012 353
-rect 896 315 926 343
-rect 982 315 1012 343
-rect 1054 387 1108 403
-rect 1054 353 1064 387
-rect 1098 353 1108 387
-rect 1054 337 1108 353
-rect 1150 387 1204 403
-rect 1150 353 1160 387
-rect 1194 353 1204 387
-rect 1150 337 1204 353
-rect 1054 315 1084 337
-rect 1174 315 1204 337
-rect 1246 315 1276 405
-rect 1343 367 1373 520
-rect 1332 337 1373 367
-rect 1486 370 1516 526
-rect 1608 484 1638 617
-rect 1694 579 1724 617
-rect 1884 601 1914 817
-rect 1694 549 1775 579
-rect 1576 468 1638 484
-rect 1576 434 1588 468
-rect 1622 434 1638 468
-rect 1576 418 1638 434
-rect 1486 338 1552 370
-rect 1332 315 1362 337
-rect 1522 315 1552 338
-rect 1594 315 1624 418
-rect 1745 351 1775 549
-rect 1874 571 1914 601
-rect 1874 471 1904 571
-rect 1970 512 2000 817
-rect 1849 455 1904 471
-rect 1849 421 1859 455
-rect 1893 421 1904 455
-rect 1946 496 2000 512
-rect 1946 462 1956 496
-rect 1990 462 2000 496
-rect 1946 446 2000 462
-rect 1849 405 1904 421
-rect 1874 360 1904 405
-rect 1745 335 1799 351
-rect 1745 315 1755 335
-rect 219 285 302 301
-rect 272 263 302 285
-rect 1692 301 1755 315
-rect 1789 301 1799 335
-rect 1874 330 1914 360
-rect 1692 285 1799 301
-rect 1692 263 1722 285
-rect 1884 263 1914 330
-rect 1970 263 2000 446
-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 444 123 478
-rect 442 536 476 570
-rect 325 457 359 491
-rect 229 301 263 335
-rect 714 536 748 570
-rect 928 536 962 570
-rect 1160 536 1194 570
-rect 642 427 676 461
-rect 1359 536 1393 570
-rect 1502 536 1536 570
-rect 1256 421 1290 455
-rect 810 353 844 387
-rect 928 353 962 387
-rect 1064 353 1098 387
-rect 1160 353 1194 387
-rect 1588 434 1622 468
-rect 1859 421 1893 455
-rect 1956 462 1990 496
-rect 1755 301 1789 335
-<< locali >>
-rect 0 1311 2090 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1682 1311
-rect 1716 1271 1818 1311
-rect 1852 1271 1954 1311
-rect 1988 1271 2090 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 494 81 649
-rect 121 565 155 657
-rect 225 1201 259 1217
-rect 121 531 191 565
-rect 47 478 123 494
-rect 47 444 89 478
-rect 89 428 123 444
-rect 157 335 191 531
-rect 225 421 259 725
-rect 311 1201 345 1217
-rect 397 1201 431 1271
-rect 397 777 431 793
-rect 483 1201 517 1217
-rect 345 725 483 743
-rect 311 709 517 725
-rect 587 1201 621 1271
-rect 587 709 621 725
-rect 745 1201 813 1217
-rect 937 1201 971 1271
-rect 937 709 971 725
-rect 1095 1201 1163 1217
-rect 813 657 816 675
-rect 745 654 816 657
-rect 1095 654 1163 725
-rect 442 620 816 654
-rect 996 620 1163 654
-rect 1287 1201 1321 1271
-rect 1287 641 1321 657
-rect 1373 1201 1407 1217
-rect 1477 1201 1511 1217
-rect 1563 1201 1597 1271
-rect 1563 777 1597 793
-rect 1649 1201 1683 1217
-rect 1511 725 1649 743
-rect 1477 709 1683 725
-rect 1735 1201 1769 1217
-rect 1373 654 1407 657
-rect 1373 620 1461 654
-rect 325 491 359 575
-rect 442 570 476 620
-rect 309 457 325 491
-rect 359 457 375 491
-rect 225 387 359 421
-rect 121 301 229 335
-rect 263 301 279 335
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 301
-rect 325 267 359 353
-rect 442 370 476 536
-rect 714 570 748 586
-rect 714 535 748 536
-rect 928 570 962 586
-rect 748 501 844 535
-rect 642 461 676 477
-rect 642 411 676 427
-rect 810 387 844 501
-rect 928 387 962 536
-rect 442 336 776 370
-rect 810 337 844 353
-rect 928 337 962 353
-rect 996 387 1030 620
-rect 1160 570 1194 586
-rect 1160 535 1194 536
-rect 742 283 776 336
-rect 996 303 1030 353
-rect 1064 501 1160 535
-rect 1359 570 1393 586
-rect 1359 535 1393 536
-rect 1064 387 1098 501
-rect 1427 455 1461 620
-rect 1240 421 1256 455
-rect 1290 421 1306 455
-rect 1373 421 1461 455
-rect 1502 570 1536 586
-rect 1373 387 1407 421
-rect 1144 353 1160 387
-rect 1194 353 1407 387
-rect 1502 387 1536 536
-rect 1570 484 1604 575
-rect 1570 468 1638 484
-rect 1570 434 1588 468
-rect 1622 434 1638 468
-rect 1735 455 1769 725
-rect 1839 1201 1873 1217
-rect 1839 609 1873 861
-rect 1925 1201 1959 1271
-rect 1925 845 1959 861
-rect 2011 1201 2045 1217
-rect 2011 683 2045 861
-rect 2044 666 2045 683
-rect 2044 649 2068 666
-rect 2011 632 2068 649
-rect 1839 570 1873 575
-rect 1839 536 1990 570
-rect 1956 496 1990 536
-rect 1672 421 1859 455
-rect 1893 421 1909 455
-rect 1672 399 1706 421
-rect 1635 365 1706 399
-rect 1956 387 1990 462
-rect 1064 337 1098 353
-rect 121 115 155 131
-rect 227 199 261 215
-rect 227 61 261 131
-rect 325 115 359 131
-rect 483 267 517 283
-rect 483 61 517 131
-rect 587 267 621 283
-rect 742 267 813 283
-rect 996 269 1163 303
-rect 742 249 745 267
-rect 587 61 621 131
-rect 1095 267 1163 269
-rect 745 115 813 131
-rect 937 199 971 215
-rect 937 61 971 131
-rect 1095 115 1163 131
-rect 1287 267 1321 283
-rect 1287 61 1321 131
-rect 1373 267 1407 353
-rect 1373 115 1407 131
-rect 1477 267 1511 283
-rect 1477 61 1511 131
-rect 1635 267 1669 365
-rect 1839 353 1990 387
-rect 1739 301 1755 335
-rect 1789 301 1805 335
-rect 1635 115 1669 131
-rect 1733 199 1767 215
-rect 1733 61 1767 131
-rect 1839 199 1873 353
-rect 2034 320 2068 632
-rect 2011 286 2068 320
-rect 1839 115 1873 131
-rect 1925 199 1959 215
-rect 1925 61 1959 131
-rect 2011 199 2045 286
-rect 2011 115 2045 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 1682 1305 1716 1311
-rect 1682 1277 1716 1305
-rect 1818 1305 1852 1311
-rect 1818 1277 1852 1305
-rect 1954 1305 1988 1311
-rect 1954 1277 1988 1305
-rect 47 649 81 683
-rect 325 575 359 609
-rect 325 353 359 387
-rect 229 301 263 313
-rect 229 279 263 301
-rect 714 501 748 535
-rect 642 427 676 461
-rect 910 353 928 387
-rect 928 353 944 387
-rect 996 353 1030 387
-rect 1160 501 1194 535
-rect 1359 501 1393 535
-rect 1256 421 1290 455
-rect 1570 575 1604 609
-rect 2010 649 2044 683
-rect 1839 575 1873 609
-rect 1859 421 1893 455
-rect 1502 353 1536 387
-rect 1755 301 1789 313
-rect 1755 279 1789 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 1311 2090 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1682 1311
-rect 1716 1277 1818 1311
-rect 1852 1277 1954 1311
-rect 1988 1277 2090 1311
-rect 0 1271 2090 1277
-rect 35 683 93 689
-rect 1998 683 2056 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 1976 649 2010 683
-rect 2044 649 2056 683
-rect 35 643 93 649
-rect 1998 643 2056 649
-rect 313 609 371 615
-rect 1558 609 1616 615
-rect 1827 609 1885 615
-rect 313 575 325 609
-rect 359 575 1570 609
-rect 1604 575 1616 609
-rect 1804 575 1839 609
-rect 1873 575 1885 609
-rect 313 569 371 575
-rect 1558 569 1616 575
-rect 1827 569 1885 575
-rect 702 535 760 541
-rect 1148 535 1206 541
-rect 1347 535 1405 541
-rect 702 501 714 535
-rect 748 501 1160 535
-rect 1194 501 1359 535
-rect 1393 501 1405 535
-rect 702 495 760 501
-rect 1148 495 1206 501
-rect 1347 495 1405 501
-rect 630 461 688 467
-rect 630 427 642 461
-rect 676 427 710 461
-rect 1244 455 1302 461
-rect 1847 455 1905 461
-rect 630 421 688 427
-rect 1244 421 1256 455
-rect 1290 421 1859 455
-rect 1893 421 1905 455
-rect 1244 415 1302 421
-rect 1847 415 1905 421
-rect 313 387 371 393
-rect 898 387 956 393
-rect 313 353 325 387
-rect 359 353 910 387
-rect 944 353 956 387
-rect 313 347 371 353
-rect 898 347 956 353
-rect 984 387 1042 393
-rect 1490 387 1548 393
-rect 984 353 996 387
-rect 1030 353 1502 387
-rect 1536 353 1548 387
-rect 984 347 1042 353
-rect 1490 347 1548 353
-rect 217 313 275 319
-rect 1743 313 1801 319
-rect 217 279 229 313
-rect 263 279 1755 313
-rect 1789 279 1801 313
-rect 217 273 275 279
-rect 1743 273 1801 279
-rect 0 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel metal1 659 444 659 444 1 D
-port 1 n
-rlabel metal1 1376 518 1376 518 1 CK
-port 2 n
-rlabel metal1 1857 592 1857 592 1 QN
-port 3 n
-rlabel metal1 2027 666 2027 666 1 Q
-port 4 n
-rlabel metal1 1587 592 1587 592 1 SN
-port 5 n
-rlabel metal1 65 666 65 666 1 RN
-port 6 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__fill_1.mag b/18T_ls/sky130_osu_sc_18T_ls__fill_1.mag
deleted file mode 100644
index 8d5ce0c..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__fill_1.mag
+++ /dev/null
@@ -1,22 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548551
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< error_p >>
-rect 0 1271 34 1332
-rect 41 581 154 1341
-rect 0 0 34 61
-<< nwell >>
-rect -14 581 41 1341
-<< locali >>
-rect 0 1271 22 1332
-rect 0 0 22 61
-<< metal1 >>
-rect 0 1271 22 1332
-rect 0 0 22 61
-<< labels >>
-rlabel metal1 11 28 11 28 1 gnd
-rlabel metal1 11 1299 11 1299 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__fill_16.mag b/18T_ls/sky130_osu_sc_18T_ls__fill_16.mag
deleted file mode 100644
index 877376a..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__fill_16.mag
+++ /dev/null
@@ -1,18 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548584
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 581 355 1341
-<< locali >>
-rect 0 1271 352 1332
-rect 0 0 352 61
-<< metal1 >>
-rect 0 1271 352 1332
-rect 0 0 352 61
-<< labels >>
-rlabel metal1 196 30 196 30 1 gnd
-rlabel metal1 199 1300 199 1300 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__fill_2.mag b/18T_ls/sky130_osu_sc_18T_ls__fill_2.mag
deleted file mode 100644
index 65e2cf3..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__fill_2.mag
+++ /dev/null
@@ -1,22 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548559
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< error_p >>
-rect 0 1271 44 1332
-rect 50 581 161 1341
-rect 0 0 44 61
-<< nwell >>
-rect -7 581 50 1341
-<< locali >>
-rect 0 1271 44 1332
-rect 0 0 44 61
-<< metal1 >>
-rect 0 1271 44 1332
-rect 0 0 44 61
-<< labels >>
-rlabel metal1 23 28 23 28 1 gnd
-rlabel metal1 22 1300 22 1300 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__fill_32.mag b/18T_ls/sky130_osu_sc_18T_ls__fill_32.mag
deleted file mode 100644
index bcb8614..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__fill_32.mag
+++ /dev/null
@@ -1,18 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548594
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 581 707 1341
-<< locali >>
-rect 0 1271 704 1332
-rect 0 0 704 61
-<< metal1 >>
-rect 0 1271 704 1332
-rect 0 0 704 61
-<< labels >>
-rlabel metal1 363 26 363 26 1 gnd
-rlabel metal1 374 1298 374 1298 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__fill_4.mag b/18T_ls/sky130_osu_sc_18T_ls__fill_4.mag
deleted file mode 100644
index b47e23b..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__fill_4.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548567
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< error_p >>
-rect 96 581 159 1341
-<< nwell >>
-rect -9 581 96 1341
-<< locali >>
-rect 0 1271 88 1332
-rect 0 0 88 61
-<< metal1 >>
-rect 0 1271 88 1332
-rect 0 0 88 61
-<< labels >>
-rlabel metal1 71 28 71 28 1 gnd
-rlabel metal1 72 1301 72 1301 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__fill_8.mag b/18T_ls/sky130_osu_sc_18T_ls__fill_8.mag
deleted file mode 100644
index 024779e..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__fill_8.mag
+++ /dev/null
@@ -1,18 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548573
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 581 179 1341
-<< locali >>
-rect 0 1271 176 1332
-rect 0 0 176 61
-<< metal1 >>
-rect 0 1271 176 1332
-rect 0 0 176 61
-<< labels >>
-rlabel metal1 112 28 112 28 1 gnd
-rlabel metal1 111 1303 111 1303 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__inv_1.mag b/18T_ls/sky130_osu_sc_18T_ls__inv_1.mag
deleted file mode 100644
index 59fe6c3..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__inv_1.mag
+++ /dev/null
@@ -1,113 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864596
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< nmos >>
-rect 80 115 110 315
-<< pmoshvt >>
-rect 80 617 110 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 494 110 617
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 315 110 428
-rect 80 89 110 115
-<< polycont >>
-rect 90 444 124 478
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 121 279 155 313
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 109 575 121 609
-rect 155 575 167 609
-rect 109 569 167 575
-rect 121 319 155 569
-rect 109 313 167 319
-rect 109 279 121 313
-rect 155 279 167 313
-rect 109 273 167 279
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 151 441 151 441 1 Y
-port 1 n
-rlabel metal1 64 666 64 666 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__inv_10.mag b/18T_ls/sky130_osu_sc_18T_ls__inv_10.mag
deleted file mode 100644
index 87a4f5a..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__inv_10.mag
+++ /dev/null
@@ -1,418 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864595
-<< checkpaint >>
-rect -1209 -1243 2161 2575
-<< nwell >>
-rect -9 581 990 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-rect 768 115 798 315
-rect 854 115 884 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-rect 768 617 798 1217
-rect 854 617 884 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 768 315
-rect 712 131 723 267
-rect 757 131 768 267
-rect 712 115 768 131
-rect 798 267 854 315
-rect 798 131 809 267
-rect 843 131 854 267
-rect 798 115 854 131
-rect 884 267 937 315
-rect 884 131 895 267
-rect 929 131 937 267
-rect 884 115 937 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 768 1217
-rect 712 657 723 1201
-rect 757 657 768 1201
-rect 712 617 768 657
-rect 798 1201 854 1217
-rect 798 657 809 1201
-rect 843 657 854 1201
-rect 798 617 854 657
-rect 884 1201 937 1217
-rect 884 657 895 1201
-rect 929 657 937 1201
-rect 884 617 937 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-rect 809 131 843 267
-rect 895 131 929 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-rect 809 657 843 1201
-rect 895 657 929 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 768 1217 798 1243
-rect 854 1217 884 1243
-rect 80 592 110 617
-rect 166 592 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 596 592 626 617
-rect 682 592 712 617
-rect 768 592 798 617
-rect 854 592 884 617
-rect 80 562 884 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 424 370 454 562
-rect 80 340 884 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 252 315 282 340
-rect 338 315 368 340
-rect 424 315 454 340
-rect 510 315 540 340
-rect 596 315 626 340
-rect 682 315 712 340
-rect 768 315 798 340
-rect 854 315 884 340
-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 444 124 478
-<< locali >>
-rect 0 1311 990 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 990 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 293 1201 327 1217
-rect 293 609 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 609 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 637 1201 671 1217
-rect 637 609 671 657
-rect 723 1201 757 1271
-rect 723 641 757 657
-rect 809 1201 843 1217
-rect 809 609 843 657
-rect 895 1201 929 1271
-rect 895 641 929 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 637 267 671 279
-rect 637 115 671 131
-rect 723 267 757 283
-rect 723 61 757 131
-rect 809 267 843 279
-rect 809 115 843 131
-rect 895 267 929 283
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 293 575 327 609
-rect 465 575 499 609
-rect 637 575 671 609
-rect 809 575 843 609
-rect 121 279 155 313
-rect 293 279 327 313
-rect 465 279 499 313
-rect 637 279 671 313
-rect 809 279 843 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1311 990 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 990 1311
-rect 0 1271 990 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 281 609 339 615
-rect 453 609 511 615
-rect 625 609 683 615
-rect 797 609 855 615
-rect 109 575 121 609
-rect 155 575 293 609
-rect 327 575 465 609
-rect 499 575 637 609
-rect 671 575 809 609
-rect 843 575 855 609
-rect 109 569 167 575
-rect 281 569 339 575
-rect 453 569 511 575
-rect 625 569 683 575
-rect 797 569 855 575
-rect 121 319 155 569
-rect 293 319 327 569
-rect 465 319 499 569
-rect 637 319 671 569
-rect 809 319 843 569
-rect 109 313 167 319
-rect 281 313 339 319
-rect 453 313 511 319
-rect 625 313 683 319
-rect 797 313 855 319
-rect 109 279 121 313
-rect 155 279 293 313
-rect 327 279 465 313
-rect 499 279 637 313
-rect 671 279 809 313
-rect 843 279 855 313
-rect 109 273 167 279
-rect 281 273 339 279
-rect 453 273 511 279
-rect 625 273 683 279
-rect 797 273 855 279
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 152 440 152 440 1 Y
-port 1 n
-rlabel metal1 64 665 64 665 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__inv_2.mag b/18T_ls/sky130_osu_sc_18T_ls__inv_2.mag
deleted file mode 100644
index 0937d08..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__inv_2.mag
+++ /dev/null
@@ -1,151 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864596
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 287 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 249 315
-rect 196 131 207 267
-rect 241 131 249 267
-rect 196 115 249 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 249 1217
-rect 196 657 207 1201
-rect 241 657 249 1201
-rect 196 617 249 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1244
-rect 80 592 110 617
-rect 166 592 196 617
-rect 80 562 196 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 80 340 196 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 90 444 124 478
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 121 279 155 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 109 575 121 609
-rect 155 575 167 609
-rect 109 569 167 575
-rect 121 319 155 569
-rect 109 313 167 319
-rect 109 279 121 313
-rect 155 279 167 313
-rect 109 273 167 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 152 440 152 440 1 Y
-port 1 n
-rlabel metal1 64 665 64 665 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__inv_3.mag b/18T_ls/sky130_osu_sc_18T_ls__inv_3.mag
deleted file mode 100644
index 5f717a5..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__inv_3.mag
+++ /dev/null
@@ -1,180 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864596
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 375 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 335 315
-rect 282 131 293 267
-rect 327 131 335 267
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 335 1217
-rect 282 657 293 1201
-rect 327 657 335 1201
-rect 282 617 335 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 592 110 617
-rect 166 592 196 617
-rect 252 592 282 617
-rect 80 562 282 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 80 340 282 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 252 315 282 340
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 90 444 124 478
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 293 1201 327 1217
-rect 293 609 327 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 293 575 327 609
-rect 121 279 155 313
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 281 609 339 615
-rect 109 575 121 609
-rect 155 575 293 609
-rect 327 575 339 609
-rect 109 569 167 575
-rect 281 569 339 575
-rect 121 319 155 569
-rect 293 319 327 569
-rect 109 313 167 319
-rect 281 313 339 319
-rect 109 279 121 313
-rect 155 279 293 313
-rect 327 279 339 313
-rect 109 273 167 279
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 152 440 152 440 1 Y
-port 1 n
-rlabel metal1 64 665 64 665 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__inv_4.mag b/18T_ls/sky130_osu_sc_18T_ls__inv_4.mag
deleted file mode 100644
index 04eb4e5..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__inv_4.mag
+++ /dev/null
@@ -1,214 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864596
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 463 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 421 315
-rect 368 131 379 267
-rect 413 131 421 267
-rect 368 115 421 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 421 1217
-rect 368 657 379 1201
-rect 413 657 421 1201
-rect 368 617 421 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1243
-rect 80 592 110 617
-rect 166 592 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 80 562 368 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 80 340 368 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 252 315 282 340
-rect 338 315 368 340
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 90 444 124 478
-<< locali >>
-rect 0 1311 462 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 462 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 293 1201 327 1217
-rect 293 609 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 293 575 327 609
-rect 121 279 155 313
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 462 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 462 1311
-rect 0 1271 462 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 281 609 339 615
-rect 109 575 121 609
-rect 155 575 293 609
-rect 327 575 339 609
-rect 109 569 167 575
-rect 281 569 339 575
-rect 121 319 155 569
-rect 293 319 327 569
-rect 109 313 167 319
-rect 281 313 339 319
-rect 109 279 121 313
-rect 155 279 293 313
-rect 327 279 339 313
-rect 109 273 167 279
-rect 281 273 339 279
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 64 665 64 665 1 A
-port 1 n
-rlabel metal1 152 440 152 440 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__inv_6.mag b/18T_ls/sky130_osu_sc_18T_ls__inv_6.mag
deleted file mode 100644
index 1c1a4eb..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__inv_6.mag
+++ /dev/null
@@ -1,278 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864596
-<< checkpaint >>
-rect -1209 -1243 1753 2575
-<< nwell >>
-rect -9 581 639 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 593 315
-rect 540 131 551 267
-rect 585 131 593 267
-rect 540 115 593 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 593 1217
-rect 540 657 551 1201
-rect 585 657 593 1201
-rect 540 617 593 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 80 592 110 617
-rect 166 592 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 80 562 540 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 424 370 454 562
-rect 80 340 540 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 252 315 282 340
-rect 338 315 368 340
-rect 424 315 454 340
-rect 510 315 540 340
-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 444 124 478
-<< locali >>
-rect 0 1311 638 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 638 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 293 1201 327 1217
-rect 293 609 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 609 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 293 575 327 609
-rect 465 575 499 609
-rect 121 279 155 313
-rect 293 279 327 313
-rect 465 279 499 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 638 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 638 1311
-rect 0 1271 638 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 281 609 339 615
-rect 453 609 511 615
-rect 109 575 121 609
-rect 155 575 293 609
-rect 327 575 465 609
-rect 499 575 511 609
-rect 109 569 167 575
-rect 281 569 339 575
-rect 453 569 511 575
-rect 121 319 155 569
-rect 293 319 327 569
-rect 465 319 499 569
-rect 109 313 167 319
-rect 281 313 339 319
-rect 453 313 511 319
-rect 109 279 121 313
-rect 155 279 293 313
-rect 327 279 465 313
-rect 499 279 511 313
-rect 109 273 167 279
-rect 281 273 339 279
-rect 453 273 511 279
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 64 665 64 665 1 A
-port 1 n
-rlabel metal1 152 440 152 440 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__inv_8.mag b/18T_ls/sky130_osu_sc_18T_ls__inv_8.mag
deleted file mode 100644
index 9b5d559..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__inv_8.mag
+++ /dev/null
@@ -1,341 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864596
-<< checkpaint >>
-rect -1209 -1243 1889 2575
-<< nwell >>
-rect -9 581 814 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 765 315
-rect 712 131 723 267
-rect 757 131 765 267
-rect 712 115 765 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 765 1217
-rect 712 657 723 1201
-rect 757 657 765 1201
-rect 712 617 765 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 80 592 110 617
-rect 166 592 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 596 592 626 617
-rect 682 592 712 617
-rect 80 562 712 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 424 370 454 562
-rect 80 340 712 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 252 315 282 340
-rect 338 315 368 340
-rect 424 315 454 340
-rect 510 315 540 340
-rect 596 315 626 340
-rect 682 315 712 340
-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 444 124 478
-<< locali >>
-rect 0 1311 814 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 814 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 293 1201 327 1217
-rect 293 609 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 609 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 637 1201 671 1217
-rect 637 609 671 657
-rect 723 1201 757 1271
-rect 723 641 757 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 637 267 671 279
-rect 637 115 671 131
-rect 723 267 757 283
-rect 723 61 757 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 814 61
-rect 0 0 814 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 293 575 327 609
-rect 465 575 499 609
-rect 637 575 671 609
-rect 121 279 155 313
-rect 293 279 327 313
-rect 465 279 499 313
-rect 637 279 671 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-<< metal1 >>
-rect 0 1311 814 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 814 1311
-rect 0 1271 814 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 281 609 339 615
-rect 453 609 511 615
-rect 625 609 683 615
-rect 109 575 121 609
-rect 155 575 293 609
-rect 327 575 465 609
-rect 499 575 637 609
-rect 671 575 683 609
-rect 109 569 167 575
-rect 281 569 339 575
-rect 453 569 511 575
-rect 625 569 683 575
-rect 121 319 155 569
-rect 293 319 327 569
-rect 465 319 499 569
-rect 637 319 671 569
-rect 109 313 167 319
-rect 281 313 339 319
-rect 453 313 511 319
-rect 625 313 683 319
-rect 109 279 121 313
-rect 155 279 293 313
-rect 327 279 465 313
-rect 499 279 637 313
-rect 671 279 683 313
-rect 109 273 167 279
-rect 281 273 339 279
-rect 453 273 511 279
-rect 625 273 683 279
-rect 0 55 814 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 814 55
-rect 0 0 814 21
-<< labels >>
-rlabel metal1 152 440 152 440 1 Y
-port 1 n
-rlabel metal1 64 665 64 665 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__inv_l.mag b/18T_ls/sky130_osu_sc_18T_ls__inv_l.mag
deleted file mode 100644
index 2075ffd..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__inv_l.mag
+++ /dev/null
@@ -1,113 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864597
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< nmos >>
-rect 80 115 110 263
-<< pmoshvt >>
-rect 80 817 110 1217
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 163 263
-rect 110 131 121 199
-rect 155 131 163 199
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 817 80 929
-rect 110 1201 163 1217
-rect 110 929 121 1201
-rect 155 929 163 1201
-rect 110 817 163 929
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-<< pdiffc >>
-rect 35 929 69 1201
-rect 121 929 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 494 110 817
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 263 110 428
-rect 80 89 110 115
-<< polycont >>
-rect 90 444 124 478
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 913 69 929
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 929
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 199 69 215
-rect 35 61 69 131
-rect 121 199 155 279
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 121 279 155 313
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 109 575 121 609
-rect 155 575 167 609
-rect 109 569 167 575
-rect 121 319 155 569
-rect 109 313 167 319
-rect 109 279 121 313
-rect 155 279 167 313
-rect 109 273 167 279
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 64 666 64 666 1 A
-port 1 n
-rlabel metal1 151 441 151 441 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__mux2_1.mag b/18T_ls/sky130_osu_sc_18T_ls__mux2_1.mag
deleted file mode 100644
index 5871dea..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__mux2_1.mag
+++ /dev/null
@@ -1,226 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864597
-<< checkpaint >>
-rect -801 1315 1753 2575
-rect -1209 -1243 1753 1315
-<< nwell >>
-rect -9 581 553 1341
-<< nmos >>
-rect 80 115 110 315
-rect 270 115 300 315
-rect 356 115 386 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 270 617 300 1217
-rect 356 617 386 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-rect 217 267 270 315
-rect 217 131 225 267
-rect 259 131 270 267
-rect 217 115 270 131
-rect 300 267 356 315
-rect 300 131 311 267
-rect 345 131 356 267
-rect 300 115 356 131
-rect 386 267 439 315
-rect 386 131 397 267
-rect 431 131 439 267
-rect 386 115 439 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-rect 217 1201 270 1217
-rect 217 657 225 1201
-rect 259 657 270 1201
-rect 217 617 270 657
-rect 300 1201 356 1217
-rect 300 657 311 1201
-rect 345 657 356 1201
-rect 300 617 356 657
-rect 386 1201 439 1217
-rect 386 657 397 1201
-rect 431 657 439 1201
-rect 386 617 439 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 225 131 259 267
-rect 311 131 345 267
-rect 397 131 431 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 225 657 259 1201
-rect 311 657 345 1201
-rect 397 657 431 1201
-<< 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 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1232 300 1262
-rect 80 1217 110 1232
-rect 270 1217 300 1232
-rect 356 1217 386 1243
-rect 80 494 110 617
-rect 270 591 300 617
-rect 152 555 218 565
-rect 152 521 168 555
-rect 202 541 218 555
-rect 356 541 386 617
-rect 202 521 386 541
-rect 152 511 386 521
-rect 27 478 110 494
-rect 27 444 37 478
-rect 71 469 110 478
-rect 71 444 386 469
-rect 27 439 386 444
-rect 27 428 110 439
-rect 80 315 110 428
-rect 152 387 218 397
-rect 152 353 168 387
-rect 202 373 218 387
-rect 202 353 300 373
-rect 152 343 300 353
-rect 270 315 300 343
-rect 356 315 386 439
-rect 80 89 110 115
-rect 270 89 300 115
-rect 356 89 386 115
-<< polycont >>
-rect 168 521 202 555
-rect 37 444 71 478
-rect 168 353 202 387
-<< locali >>
-rect 0 1311 550 1332
-rect 0 1271 459 1311
-rect 493 1271 550 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 37 478 71 649
-rect 37 428 71 444
-rect 121 571 155 657
-rect 225 1201 259 1217
-rect 311 1201 345 1217
-rect 225 623 270 657
-rect 236 609 270 623
-rect 121 555 202 571
-rect 121 521 168 555
-rect 121 505 202 521
-rect 121 403 155 505
-rect 121 387 202 403
-rect 121 353 168 387
-rect 121 337 202 353
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 337
-rect 236 301 270 575
-rect 311 461 345 657
-rect 397 1201 431 1217
-rect 397 535 431 657
-rect 121 115 155 131
-rect 225 267 270 301
-rect 311 267 345 279
-rect 225 115 259 131
-rect 311 115 345 131
-rect 397 267 431 501
-rect 397 115 431 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 37 649 71 683
-rect 236 575 270 609
-rect 311 427 345 461
-rect 397 501 431 535
-rect 311 279 345 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 550 1332
-rect 0 1277 459 1311
-rect 493 1277 550 1311
-rect 0 1271 550 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 117 683
-rect 25 643 83 649
-rect 224 609 282 615
-rect 190 575 236 609
-rect 270 575 282 609
-rect 224 569 282 575
-rect 385 535 443 541
-rect 351 501 397 535
-rect 431 501 443 535
-rect 385 495 443 501
-rect 299 461 357 467
-rect 299 427 311 461
-rect 345 427 357 461
-rect 299 421 357 427
-rect 311 319 345 421
-rect 299 313 357 319
-rect 299 279 311 313
-rect 345 279 357 313
-rect 299 273 357 279
-rect 0 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel metal1 54 666 54 666 1 S0
-port 1 n
-rlabel metal1 328 444 328 444 1 Y
-port 2 n
-rlabel metal1 253 592 253 592 1 A0
-port 3 n
-rlabel metal1 414 518 414 518 1 A1
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 476 1284 476 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__nand2_1.mag b/18T_ls/sky130_osu_sc_18T_ls__nand2_1.mag
deleted file mode 100644
index c9ee6a4..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__nand2_1.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864597
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 286 1341
-<< nmos >>
-rect 80 115 110 315
-rect 152 115 182 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 235 315
-rect 182 131 193 267
-rect 227 131 235 267
-rect 182 115 235 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 249 1217
-rect 196 725 207 1201
-rect 241 725 249 1201
-rect 196 617 249 725
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 725 241 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 80 570 110 617
-rect 37 554 110 570
-rect 37 520 47 554
-rect 81 520 110 554
-rect 37 504 110 520
-rect 80 315 110 504
-rect 166 477 196 617
-rect 152 461 210 477
-rect 152 427 166 461
-rect 200 427 210 461
-rect 152 411 210 427
-rect 152 315 182 411
-rect 80 89 110 115
-rect 152 89 182 115
-<< polycont >>
-rect 47 520 81 554
-rect 166 427 200 461
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 554 81 649
-rect 47 504 81 520
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 121 535 155 657
-rect 195 461 229 575
-rect 150 427 166 461
-rect 200 427 229 461
-rect 35 267 69 279
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 47 649 81 683
-rect 121 501 155 535
-rect 195 575 229 609
-rect 35 279 69 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 115 683
-rect 35 643 93 649
-rect 183 609 241 615
-rect 161 575 195 609
-rect 229 575 241 609
-rect 183 569 241 575
-rect 109 535 167 541
-rect 109 501 121 535
-rect 155 501 167 535
-rect 109 495 167 501
-rect 23 313 81 319
-rect 121 313 155 495
-rect 23 279 35 313
-rect 69 279 155 313
-rect 23 273 81 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 470 136 470 1 Y
-port 1 n
-rlabel metal1 64 666 64 666 1 A
-port 2 n
-rlabel metal1 212 592 212 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__nand2_l.mag b/18T_ls/sky130_osu_sc_18T_ls__nand2_l.mag
deleted file mode 100644
index d58b468..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__nand2_l.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864597
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 286 1341
-<< nmos >>
-rect 80 115 110 263
-rect 152 115 182 263
-<< pmoshvt >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 115 152 263
-rect 182 199 235 263
-rect 182 131 193 199
-rect 227 131 235 199
-rect 182 115 235 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 817 80 929
-rect 110 1201 166 1217
-rect 110 929 121 1201
-rect 155 929 166 1201
-rect 110 817 166 929
-rect 196 1201 249 1217
-rect 196 929 207 1201
-rect 241 929 249 1201
-rect 196 817 249 929
-<< ndiffc >>
-rect 35 131 69 199
-rect 193 131 227 199
-<< pdiffc >>
-rect 35 929 69 1201
-rect 121 929 155 1201
-rect 207 929 241 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 80 570 110 817
-rect 37 554 110 570
-rect 37 520 47 554
-rect 81 520 110 554
-rect 37 504 110 520
-rect 80 263 110 504
-rect 166 420 196 817
-rect 152 404 210 420
-rect 152 370 166 404
-rect 200 370 210 404
-rect 152 354 210 370
-rect 152 263 182 354
-rect 80 89 110 115
-rect 152 89 182 115
-<< polycont >>
-rect 47 520 81 554
-rect 166 370 200 404
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1271
-rect 35 913 69 929
-rect 121 1201 155 1217
-rect 47 554 81 649
-rect 47 504 81 520
-rect 121 535 155 929
-rect 207 1201 241 1271
-rect 207 913 241 929
-rect 195 404 229 575
-rect 150 370 166 404
-rect 200 370 229 404
-rect 35 199 69 279
-rect 35 115 69 131
-rect 193 199 227 215
-rect 193 61 227 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 47 649 81 683
-rect 121 501 155 535
-rect 195 575 229 609
-rect 35 279 69 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 115 683
-rect 35 643 93 649
-rect 183 609 241 615
-rect 161 575 195 609
-rect 229 575 241 609
-rect 183 569 241 575
-rect 109 535 167 541
-rect 109 501 121 535
-rect 155 501 167 535
-rect 109 495 167 501
-rect 23 313 81 319
-rect 121 313 155 495
-rect 23 279 35 313
-rect 69 279 155 313
-rect 23 273 81 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 470 136 470 1 Y
-port 1 n
-rlabel metal1 212 592 212 592 1 B
-port 2 n
-rlabel metal1 64 666 64 666 1 A
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__nor2_1.mag b/18T_ls/sky130_osu_sc_18T_ls__nor2_1.mag
deleted file mode 100644
index 79aa4e2..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__nor2_1.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864597
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 286 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 152 617 182 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 249 315
-rect 196 131 207 267
-rect 241 131 249 267
-rect 196 115 249 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 617 152 1217
-rect 182 1201 235 1217
-rect 182 793 193 1201
-rect 227 793 235 1201
-rect 182 617 235 793
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 193 793 227 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 152 1217 182 1243
-rect 80 451 110 617
-rect 152 584 182 617
-rect 152 568 225 584
-rect 152 534 181 568
-rect 215 534 225 568
-rect 152 518 225 534
-rect 56 435 110 451
-rect 56 401 66 435
-rect 100 401 110 435
-rect 56 385 110 401
-rect 80 315 110 385
-rect 166 315 196 518
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 181 534 215 568
-rect 66 401 100 435
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1217
-rect 193 1201 227 1271
-rect 193 777 227 793
-rect 35 535 69 657
-rect 113 435 147 575
-rect 181 568 215 649
-rect 181 518 215 534
-rect 50 401 66 435
-rect 100 401 147 435
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 181 649 215 683
-rect 35 501 69 535
-rect 113 575 147 609
-rect 121 279 155 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 169 683 227 689
-rect 148 649 181 683
-rect 215 649 227 683
-rect 169 643 227 649
-rect 101 609 159 615
-rect 79 575 113 609
-rect 147 575 159 609
-rect 101 569 159 575
-rect 23 535 81 541
-rect 23 501 35 535
-rect 69 501 155 535
-rect 23 495 81 501
-rect 121 319 155 501
-rect 109 313 167 319
-rect 109 279 121 313
-rect 155 279 167 313
-rect 109 273 167 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 137 393 137 393 1 Y
-port 1 n
-rlabel metal1 130 592 130 592 1 B
-port 2 n
-rlabel metal1 198 666 198 666 1 A
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__nor2_l.mag b/18T_ls/sky130_osu_sc_18T_ls__nor2_l.mag
deleted file mode 100644
index 73884c4..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__nor2_l.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864598
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 286 1341
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-<< pmoshvt >>
-rect 80 817 110 1217
-rect 152 817 182 1217
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 166 263
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 199 249 263
-rect 196 131 207 199
-rect 241 131 249 199
-rect 196 115 249 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 817 152 1217
-rect 182 1201 235 1217
-rect 182 861 193 1201
-rect 227 861 235 1201
-rect 182 817 235 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-rect 207 131 241 199
-<< pdiffc >>
-rect 35 861 69 1201
-rect 193 861 227 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 152 1217 182 1243
-rect 80 451 110 817
-rect 152 584 182 817
-rect 152 568 225 584
-rect 152 534 181 568
-rect 215 534 225 568
-rect 152 518 225 534
-rect 56 435 110 451
-rect 56 401 66 435
-rect 100 401 110 435
-rect 56 385 110 401
-rect 80 263 110 385
-rect 166 263 196 518
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 181 534 215 568
-rect 66 401 100 435
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1217
-rect 35 535 69 861
-rect 193 1201 227 1271
-rect 193 845 227 861
-rect 113 435 147 575
-rect 181 568 215 649
-rect 181 518 215 534
-rect 50 401 66 435
-rect 100 401 147 435
-rect 35 199 69 215
-rect 35 61 69 131
-rect 121 199 155 279
-rect 121 115 155 131
-rect 207 199 241 215
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 181 649 215 683
-rect 35 501 69 535
-rect 113 575 147 609
-rect 121 279 155 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 169 683 227 689
-rect 148 649 181 683
-rect 215 649 227 683
-rect 169 643 227 649
-rect 101 609 159 615
-rect 79 575 113 609
-rect 147 575 159 609
-rect 101 569 159 575
-rect 23 535 81 541
-rect 23 501 35 535
-rect 69 501 155 535
-rect 23 495 81 501
-rect 121 319 155 501
-rect 109 313 167 319
-rect 109 279 121 313
-rect 155 279 167 313
-rect 109 273 167 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 137 393 137 393 1 Y
-port 1 n
-rlabel metal1 198 666 198 666 1 A
-port 2 n
-rlabel metal1 130 592 130 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__oai21_l.mag b/18T_ls/sky130_osu_sc_18T_ls__oai21_l.mag
deleted file mode 100644
index 31a326d..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__oai21_l.mag
+++ /dev/null
@@ -1,194 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864598
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 152 617 182 1217
-rect 250 817 280 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 199 166 315
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 266 335 315
-rect 282 131 293 266
-rect 327 131 335 266
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 617 152 1217
-rect 182 1201 250 1217
-rect 182 861 193 1201
-rect 227 861 250 1201
-rect 182 817 250 861
-rect 280 1201 333 1217
-rect 280 861 291 1201
-rect 325 861 333 1201
-rect 280 817 333 861
-rect 182 617 235 817
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 199
-rect 207 131 241 267
-rect 293 131 327 266
-<< pdiffc >>
-rect 35 793 69 1201
-rect 193 861 227 1201
-rect 291 861 325 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 152 1217 182 1243
-rect 250 1217 280 1243
-rect 80 585 110 617
-rect 56 569 110 585
-rect 56 535 66 569
-rect 100 535 110 569
-rect 56 519 110 535
-rect 56 370 86 519
-rect 152 471 182 617
-rect 136 461 202 471
-rect 136 427 152 461
-rect 186 427 202 461
-rect 136 417 202 427
-rect 56 340 110 370
-rect 80 315 110 340
-rect 166 315 196 417
-rect 250 409 280 817
-rect 250 393 306 409
-rect 252 359 262 393
-rect 296 359 306 393
-rect 252 343 306 359
-rect 252 315 282 343
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 66 535 100 569
-rect 152 427 186 461
-rect 262 359 296 393
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 193 1201 227 1271
-rect 193 845 227 861
-rect 291 1201 325 1217
-rect 35 751 69 793
-rect 291 751 325 861
-rect 35 717 325 751
-rect 66 569 100 649
-rect 66 519 100 535
-rect 152 575 162 609
-rect 152 461 186 575
-rect 152 411 186 427
-rect 223 393 257 501
-rect 291 461 325 717
-rect 223 359 262 393
-rect 296 359 312 393
-rect 35 267 241 301
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 207 115 241 131
-rect 293 266 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 66 649 100 683
-rect 162 575 196 609
-rect 223 501 257 535
-rect 291 427 325 461
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 54 683 112 689
-rect 54 649 66 683
-rect 100 649 134 683
-rect 54 643 112 649
-rect 150 609 208 615
-rect 150 575 162 609
-rect 196 575 230 609
-rect 150 569 208 575
-rect 211 535 269 541
-rect 189 501 223 535
-rect 257 501 269 535
-rect 211 495 269 501
-rect 279 461 337 467
-rect 279 427 291 461
-rect 325 427 337 461
-rect 279 421 337 427
-rect 293 319 327 421
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 83 666 83 666 1 A0
-port 1 n
-rlabel metal1 179 592 179 592 1 A1
-port 2 n
-rlabel metal1 308 444 308 444 1 Y
-port 3 n
-rlabel metal1 240 518 240 518 1 B0
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__oai22_l.mag b/18T_ls/sky130_osu_sc_18T_ls__oai22_l.mag
deleted file mode 100644
index 9e6070c..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__oai22_l.mag
+++ /dev/null
@@ -1,239 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864598
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 462 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 152 617 182 1217
-rect 252 617 282 1217
-rect 324 617 354 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 199 166 315
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 199 293 267
-rect 327 199 338 267
-rect 282 115 338 199
-rect 368 199 421 315
-rect 368 131 379 199
-rect 413 131 421 199
-rect 368 115 421 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 617 152 1217
-rect 182 1201 252 1217
-rect 182 725 200 1201
-rect 234 725 252 1201
-rect 182 617 252 725
-rect 282 617 324 1217
-rect 354 1201 407 1217
-rect 354 793 365 1201
-rect 399 793 407 1201
-rect 354 617 407 793
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 199
-rect 207 131 241 267
-rect 293 199 327 267
-rect 379 131 413 199
-<< pdiffc >>
-rect 35 793 69 1201
-rect 200 725 234 1201
-rect 365 793 399 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 152 1217 182 1243
-rect 252 1217 282 1243
-rect 324 1217 354 1243
-rect 80 585 110 617
-rect 56 569 110 585
-rect 56 535 66 569
-rect 100 535 110 569
-rect 56 519 110 535
-rect 56 370 86 519
-rect 152 471 182 617
-rect 130 461 196 471
-rect 130 427 146 461
-rect 180 427 196 461
-rect 130 417 196 427
-rect 56 340 110 370
-rect 80 315 110 340
-rect 166 315 196 417
-rect 252 409 282 617
-rect 324 592 354 617
-rect 324 562 368 592
-rect 338 478 368 562
-rect 338 462 430 478
-rect 338 428 384 462
-rect 418 428 430 462
-rect 338 412 430 428
-rect 238 393 292 409
-rect 238 359 248 393
-rect 282 359 292 393
-rect 238 343 292 359
-rect 252 315 282 343
-rect 338 315 368 412
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 66 535 100 569
-rect 146 427 180 461
-rect 384 428 418 462
-rect 248 359 282 393
-<< locali >>
-rect 0 1311 462 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 462 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 200 1201 234 1217
-rect 365 1201 399 1271
-rect 365 777 399 793
-rect 200 700 234 725
-rect 200 666 350 700
-rect 66 569 100 649
-rect 66 519 100 535
-rect 146 575 162 609
-rect 146 461 180 575
-rect 146 411 180 427
-rect 223 409 257 501
-rect 223 393 282 409
-rect 223 359 248 393
-rect 223 343 282 359
-rect 316 387 350 666
-rect 384 462 418 478
-rect 384 412 418 428
-rect 35 267 241 301
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 293 279 316 283
-rect 293 267 350 279
-rect 327 249 350 267
-rect 293 183 327 199
-rect 379 199 413 215
-rect 241 131 379 149
-rect 207 115 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 66 649 100 683
-rect 162 575 196 609
-rect 223 501 257 535
-rect 384 428 418 462
-rect 316 353 350 387
-rect 316 279 350 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 462 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 462 1311
-rect 0 1271 462 1277
-rect 54 683 112 689
-rect 54 649 66 683
-rect 100 649 134 683
-rect 54 643 112 649
-rect 150 609 208 615
-rect 150 575 162 609
-rect 196 575 230 609
-rect 150 569 208 575
-rect 211 535 269 541
-rect 189 501 223 535
-rect 257 501 269 535
-rect 211 495 269 501
-rect 372 462 430 468
-rect 350 428 384 462
-rect 418 428 430 462
-rect 372 422 430 428
-rect 304 387 362 393
-rect 304 353 316 387
-rect 350 353 362 387
-rect 304 347 362 353
-rect 316 319 350 347
-rect 304 313 362 319
-rect 304 279 316 313
-rect 350 279 362 313
-rect 304 273 362 279
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 240 518 240 518 1 B0
-port 4 n
-rlabel viali 179 592 179 592 1 A1
-port 2 n
-rlabel viali 83 666 83 666 1 A0
-port 1 n
-rlabel viali 333 370 333 370 1 Y
-port 3 n
-rlabel viali 401 445 401 445 1 B1
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__or2_1.mag b/18T_ls/sky130_osu_sc_18T_ls__or2_1.mag
deleted file mode 100644
index 945e62e..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__or2_1.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864598
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 335 315
-rect 282 131 293 267
-rect 327 131 335 267
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 617 166 1217
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1201 335 1217
-rect 282 657 293 1201
-rect 327 657 335 1201
-rect 282 617 335 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-<< pdiffc >>
-rect 35 725 69 1201
-rect 207 793 241 1201
-rect 293 657 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 568 110 617
-rect 27 552 110 568
-rect 27 518 37 552
-rect 71 518 110 552
-rect 27 502 110 518
-rect 166 510 196 617
-rect 252 592 282 617
-rect 252 562 289 592
-rect 80 315 110 502
-rect 163 494 217 510
-rect 163 460 173 494
-rect 207 460 217 494
-rect 163 444 217 460
-rect 166 315 196 444
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 370 313 404
-rect 252 354 313 370
-rect 252 315 282 354
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 518 71 552
-rect 173 460 207 494
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 207 1201 241 1271
-rect 207 777 241 793
-rect 293 1201 327 1217
-rect 69 725 139 743
-rect 35 709 139 725
-rect 37 552 71 575
-rect 37 502 71 518
-rect 105 404 139 709
-rect 173 494 207 649
-rect 293 535 327 657
-rect 173 444 207 460
-rect 105 370 269 404
-rect 303 370 319 404
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 370
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 37 575 71 609
-rect 173 649 207 683
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 161 683 219 689
-rect 140 649 173 683
-rect 207 649 219 683
-rect 161 643 219 649
-rect 25 609 83 615
-rect 25 575 37 609
-rect 71 575 105 609
-rect 25 569 83 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 190 666 190 666 1 A
-port 2 n
-rlabel metal1 54 592 54 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__or2_2.mag b/18T_ls/sky130_osu_sc_18T_ls__or2_2.mag
deleted file mode 100644
index 9be4858..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__or2_2.mag
+++ /dev/null
@@ -1,221 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864598
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 462 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 421 315
-rect 368 131 379 267
-rect 413 131 421 267
-rect 368 115 421 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 617 166 1217
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 421 1217
-rect 368 657 379 1201
-rect 413 657 421 1201
-rect 368 617 421 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-<< pdiffc >>
-rect 35 725 69 1201
-rect 207 793 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 80 568 110 617
-rect 27 552 110 568
-rect 27 518 37 552
-rect 71 518 110 552
-rect 27 502 110 518
-rect 166 510 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 252 562 368 592
-rect 80 315 110 502
-rect 163 494 217 510
-rect 163 460 173 494
-rect 207 460 217 494
-rect 163 444 217 460
-rect 166 315 196 444
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 303 370 368 384
-rect 252 354 368 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 37 518 71 552
-rect 173 460 207 494
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 462 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 462 1311
-rect 35 1201 69 1217
-rect 207 1201 241 1271
-rect 207 777 241 793
-rect 293 1201 327 1217
-rect 69 725 139 743
-rect 35 709 139 725
-rect 37 552 71 575
-rect 37 502 71 518
-rect 105 404 139 709
-rect 173 494 207 649
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 173 444 207 460
-rect 105 370 269 404
-rect 303 370 319 404
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 370
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 37 575 71 609
-rect 173 649 207 683
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 462 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 462 1311
-rect 0 1271 462 1277
-rect 161 683 219 689
-rect 140 649 173 683
-rect 207 649 219 683
-rect 161 643 219 649
-rect 25 609 83 615
-rect 25 575 37 609
-rect 71 575 105 609
-rect 25 569 83 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 190 666 190 666 1 A
-port 2 n
-rlabel metal1 54 592 54 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__or2_4.mag b/18T_ls/sky130_osu_sc_18T_ls__or2_4.mag
deleted file mode 100644
index 9e02cd8..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__or2_4.mag
+++ /dev/null
@@ -1,284 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864598
-<< checkpaint >>
-rect -1209 -1243 1753 2575
-<< nwell >>
-rect -9 581 638 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 593 315
-rect 540 131 551 267
-rect 585 131 593 267
-rect 540 115 593 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 617 166 1217
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 593 1217
-rect 540 657 551 1201
-rect 585 657 593 1201
-rect 540 617 593 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-<< pdiffc >>
-rect 35 725 69 1201
-rect 207 793 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 80 568 110 617
-rect 27 552 110 568
-rect 27 518 37 552
-rect 71 518 110 552
-rect 27 502 110 518
-rect 166 510 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 252 562 540 592
-rect 80 315 110 502
-rect 163 494 217 510
-rect 163 460 173 494
-rect 207 460 217 494
-rect 163 444 217 460
-rect 166 315 196 444
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 303 370 540 384
-rect 252 354 540 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-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 518 71 552
-rect 173 460 207 494
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 638 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 638 1311
-rect 35 1201 69 1217
-rect 207 1201 241 1271
-rect 207 777 241 793
-rect 293 1201 327 1217
-rect 69 725 139 743
-rect 35 709 139 725
-rect 37 552 71 575
-rect 37 502 71 518
-rect 105 404 139 709
-rect 173 494 207 649
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 535 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 173 444 207 460
-rect 105 370 269 404
-rect 303 370 319 404
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 370
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 37 575 71 609
-rect 173 649 207 683
-rect 293 501 327 535
-rect 465 501 499 535
-rect 293 279 327 313
-rect 465 279 499 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 638 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 638 1311
-rect 0 1271 638 1277
-rect 161 683 219 689
-rect 140 649 173 683
-rect 207 649 219 683
-rect 161 643 219 649
-rect 25 609 83 615
-rect 25 575 37 609
-rect 71 575 105 609
-rect 25 569 83 575
-rect 281 535 339 541
-rect 453 535 511 541
-rect 281 501 293 535
-rect 327 501 465 535
-rect 499 501 511 535
-rect 281 495 339 501
-rect 453 495 511 501
-rect 293 319 327 495
-rect 465 319 499 495
-rect 281 313 339 319
-rect 453 313 511 319
-rect 281 279 293 313
-rect 327 279 465 313
-rect 499 279 511 313
-rect 281 273 339 279
-rect 453 273 511 279
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 190 666 190 666 1 A
-port 2 n
-rlabel metal1 54 592 54 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__or2_8.mag b/18T_ls/sky130_osu_sc_18T_ls__or2_8.mag
deleted file mode 100644
index 3a1a21e..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__or2_8.mag
+++ /dev/null
@@ -1,426 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864599
-<< checkpaint >>
-rect -1209 -1243 2161 2575
-<< nwell >>
-rect -9 581 990 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-rect 768 115 798 315
-rect 854 115 884 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-rect 768 617 798 1217
-rect 854 617 884 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 768 315
-rect 712 131 723 267
-rect 757 131 768 267
-rect 712 115 768 131
-rect 798 267 854 315
-rect 798 131 809 267
-rect 843 131 854 267
-rect 798 115 854 131
-rect 884 267 937 315
-rect 884 131 895 267
-rect 929 131 937 267
-rect 884 115 937 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 617 166 1217
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 768 1217
-rect 712 657 723 1201
-rect 757 657 768 1201
-rect 712 617 768 657
-rect 798 1201 854 1217
-rect 798 657 809 1201
-rect 843 657 854 1201
-rect 798 617 854 657
-rect 884 1201 937 1217
-rect 884 657 895 1201
-rect 929 657 937 1201
-rect 884 617 937 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-rect 809 131 843 267
-rect 895 131 929 267
-<< pdiffc >>
-rect 35 725 69 1201
-rect 207 793 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-rect 809 657 843 1201
-rect 895 657 929 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 768 1217 798 1243
-rect 854 1217 884 1243
-rect 80 568 110 617
-rect 27 552 110 568
-rect 27 518 37 552
-rect 71 518 110 552
-rect 27 502 110 518
-rect 166 510 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 596 592 626 617
-rect 682 592 712 617
-rect 768 592 798 617
-rect 854 592 884 617
-rect 252 562 884 592
-rect 80 315 110 502
-rect 163 494 217 510
-rect 163 460 173 494
-rect 207 460 217 494
-rect 163 444 217 460
-rect 166 315 196 444
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 596 384 626 562
-rect 303 370 884 384
-rect 252 354 884 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-rect 596 315 626 354
-rect 682 315 712 354
-rect 768 315 798 354
-rect 854 315 884 354
-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 518 71 552
-rect 173 460 207 494
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 990 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 990 1311
-rect 35 1201 69 1217
-rect 207 1201 241 1271
-rect 207 777 241 793
-rect 293 1201 327 1217
-rect 69 725 139 743
-rect 35 709 139 725
-rect 37 552 71 575
-rect 37 502 71 518
-rect 105 404 139 709
-rect 173 494 207 649
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 535 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 637 1201 671 1217
-rect 637 535 671 657
-rect 723 1201 757 1271
-rect 723 641 757 657
-rect 809 1201 843 1217
-rect 809 535 843 657
-rect 895 1201 929 1271
-rect 895 641 929 657
-rect 173 444 207 460
-rect 105 370 269 404
-rect 303 370 319 404
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 370
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 637 267 671 279
-rect 637 115 671 131
-rect 723 267 757 283
-rect 723 61 757 131
-rect 809 267 843 279
-rect 809 115 843 131
-rect 895 267 929 283
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 37 575 71 609
-rect 173 649 207 683
-rect 293 501 327 535
-rect 465 501 499 535
-rect 637 501 671 535
-rect 809 501 843 535
-rect 293 279 327 313
-rect 465 279 499 313
-rect 637 279 671 313
-rect 809 279 843 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1311 990 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 990 1311
-rect 0 1271 990 1277
-rect 161 683 219 689
-rect 140 649 173 683
-rect 207 649 219 683
-rect 161 643 219 649
-rect 25 609 83 615
-rect 25 575 37 609
-rect 71 575 105 609
-rect 25 569 83 575
-rect 281 535 339 541
-rect 453 535 511 541
-rect 625 535 683 541
-rect 797 535 855 541
-rect 281 501 293 535
-rect 327 501 465 535
-rect 499 501 637 535
-rect 671 501 809 535
-rect 843 501 855 535
-rect 281 495 339 501
-rect 453 495 511 501
-rect 625 495 683 501
-rect 797 495 855 501
-rect 293 319 327 495
-rect 465 319 499 495
-rect 637 319 671 495
-rect 809 319 843 495
-rect 281 313 339 319
-rect 453 313 511 319
-rect 625 313 683 319
-rect 797 313 855 319
-rect 281 279 293 313
-rect 327 279 465 313
-rect 499 279 637 313
-rect 671 279 683 313
-rect 712 279 809 313
-rect 843 279 855 313
-rect 281 273 339 279
-rect 453 273 511 279
-rect 625 273 683 279
-rect 797 273 855 279
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 190 666 190 666 1 A
-port 2 n
-rlabel metal1 54 592 54 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__or2_l.mag b/18T_ls/sky130_osu_sc_18T_ls__or2_l.mag
deleted file mode 100644
index 7113ca5..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__or2_l.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864599
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-<< pmoshvt >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 252 817 282 1217
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 166 263
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 199 252 263
-rect 196 131 207 199
-rect 241 131 252 199
-rect 196 115 252 131
-rect 282 199 335 263
-rect 282 131 293 199
-rect 327 131 335 199
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 817 80 929
-rect 110 817 166 1217
-rect 196 1201 252 1217
-rect 196 929 207 1201
-rect 241 929 252 1201
-rect 196 817 252 929
-rect 282 1201 335 1217
-rect 282 929 293 1201
-rect 327 929 335 1201
-rect 282 817 335 929
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-rect 207 131 241 199
-rect 293 131 327 199
-<< pdiffc >>
-rect 35 929 69 1201
-rect 207 929 241 1201
-rect 293 929 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 568 110 817
-rect 27 552 110 568
-rect 27 518 37 552
-rect 71 518 110 552
-rect 27 502 110 518
-rect 166 510 196 817
-rect 252 592 282 817
-rect 252 562 289 592
-rect 80 263 110 502
-rect 163 494 217 510
-rect 163 460 173 494
-rect 207 460 217 494
-rect 163 444 217 460
-rect 166 263 196 444
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 370 313 404
-rect 252 354 313 370
-rect 252 263 282 354
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 518 71 552
-rect 173 460 207 494
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 35 743 69 929
-rect 207 1201 241 1271
-rect 207 913 241 929
-rect 293 1201 327 1217
-rect 35 709 139 743
-rect 37 552 71 575
-rect 37 502 71 518
-rect 105 404 139 709
-rect 173 494 207 649
-rect 293 535 327 929
-rect 173 444 207 460
-rect 105 370 269 404
-rect 303 370 319 404
-rect 35 199 69 215
-rect 35 61 69 131
-rect 121 199 155 370
-rect 121 115 155 131
-rect 207 199 241 215
-rect 207 61 241 131
-rect 293 199 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 37 575 71 609
-rect 173 649 207 683
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 161 683 219 689
-rect 140 649 173 683
-rect 207 649 219 683
-rect 161 643 219 649
-rect 25 609 83 615
-rect 25 575 37 609
-rect 71 575 105 609
-rect 25 569 83 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 54 592 54 592 1 B
-port 2 n
-rlabel metal1 190 666 190 666 1 A
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__tbufi_1.mag b/18T_ls/sky130_osu_sc_18T_ls__tbufi_1.mag
deleted file mode 100644
index 4f70cd9..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__tbufi_1.mag
+++ /dev/null
@@ -1,185 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864599
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 375 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 238 115 268 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 238 617 268 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 115 238 315
-rect 268 267 321 315
-rect 268 131 279 267
-rect 313 131 321 267
-rect 268 115 321 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 617 238 1217
-rect 268 1201 321 1217
-rect 268 657 279 1201
-rect 313 657 321 1201
-rect 268 617 321 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 279 131 313 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 725 155 1201
-rect 279 657 313 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 80 602 110 617
-rect 39 572 110 602
-rect 39 360 69 572
-rect 166 529 196 617
-rect 133 513 196 529
-rect 133 479 143 513
-rect 177 479 196 513
-rect 133 463 196 479
-rect 238 451 268 617
-rect 238 435 292 451
-rect 111 387 165 403
-rect 111 360 121 387
-rect 39 353 121 360
-rect 155 360 165 387
-rect 238 401 248 435
-rect 282 401 292 435
-rect 238 385 292 401
-rect 155 353 196 360
-rect 39 330 196 353
-rect 80 315 110 330
-rect 166 315 196 330
-rect 238 315 268 385
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 143 479 177 513
-rect 121 353 155 387
-rect 248 401 282 435
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 709 155 725
-rect 279 1201 313 1217
-rect 35 513 69 657
-rect 143 513 177 529
-rect 35 479 143 513
-rect 35 267 69 479
-rect 143 463 177 479
-rect 211 435 245 649
-rect 279 535 313 657
-rect 211 401 248 435
-rect 282 401 298 435
-rect 103 353 121 387
-rect 155 353 171 387
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 279 267 313 279
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 211 649 245 683
-rect 279 501 313 535
-rect 121 353 155 387
-rect 279 279 313 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 199 683 257 689
-rect 177 649 211 683
-rect 245 649 257 683
-rect 199 643 257 649
-rect 109 609 167 615
-rect 109 575 189 609
-rect 109 569 167 575
-rect 121 393 155 569
-rect 267 535 325 541
-rect 267 501 279 535
-rect 313 501 325 535
-rect 267 495 325 501
-rect 109 387 167 393
-rect 109 353 121 387
-rect 155 353 167 387
-rect 109 347 167 353
-rect 279 319 313 495
-rect 267 313 325 319
-rect 267 279 279 313
-rect 313 279 325 313
-rect 267 273 325 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 364 305 364 1 Y
-port 1 n
-rlabel metal1 228 666 228 666 1 A
-port 2 n
-rlabel metal1 138 592 138 592 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__tbufi_l.mag b/18T_ls/sky130_osu_sc_18T_ls__tbufi_l.mag
deleted file mode 100644
index 1308bc3..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__tbufi_l.mag
+++ /dev/null
@@ -1,185 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864599
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 375 1341
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
-<< pmoshvt >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 238 817 268 1217
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 166 263
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 115 238 263
-rect 268 199 321 263
-rect 268 131 279 199
-rect 313 131 321 199
-rect 268 115 321 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 817 166 861
-rect 196 817 238 1217
-rect 268 1201 321 1217
-rect 268 861 279 1201
-rect 313 861 321 1201
-rect 268 817 321 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-rect 279 131 313 199
-<< pdiffc >>
-rect 35 861 69 1201
-rect 121 861 155 1201
-rect 279 861 313 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 80 602 110 817
-rect 39 572 110 602
-rect 39 360 69 572
-rect 166 529 196 817
-rect 133 513 196 529
-rect 133 479 143 513
-rect 177 479 196 513
-rect 133 463 196 479
-rect 238 451 268 817
-rect 238 435 292 451
-rect 111 387 165 403
-rect 111 360 121 387
-rect 39 353 121 360
-rect 155 360 165 387
-rect 238 401 248 435
-rect 282 401 292 435
-rect 238 385 292 401
-rect 155 353 196 360
-rect 39 330 196 353
-rect 80 263 110 330
-rect 166 263 196 330
-rect 238 263 268 385
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 143 479 177 513
-rect 121 353 155 387
-rect 248 401 282 435
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 35 513 69 861
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 279 1201 313 1217
-rect 143 513 177 529
-rect 35 479 143 513
-rect 35 199 69 479
-rect 143 463 177 479
-rect 211 435 245 649
-rect 279 535 313 861
-rect 211 401 248 435
-rect 282 401 298 435
-rect 103 353 121 387
-rect 155 353 171 387
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 279 199 313 279
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 211 649 245 683
-rect 279 501 313 535
-rect 121 353 155 387
-rect 279 279 313 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 199 683 257 689
-rect 177 649 211 683
-rect 245 649 257 683
-rect 199 643 257 649
-rect 109 609 167 615
-rect 109 575 189 609
-rect 109 569 167 575
-rect 121 393 155 569
-rect 267 535 325 541
-rect 267 501 279 535
-rect 313 501 325 535
-rect 267 495 325 501
-rect 109 387 167 393
-rect 109 353 121 387
-rect 155 353 167 387
-rect 109 347 167 353
-rect 279 319 313 495
-rect 267 313 325 319
-rect 267 279 279 313
-rect 313 279 325 313
-rect 267 273 325 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 364 305 364 1 Y
-port 1 n
-rlabel metal1 228 666 228 666 1 A
-port 2 n
-rlabel metal1 138 592 138 592 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__tiehi.mag b/18T_ls/sky130_osu_sc_18T_ls__tiehi.mag
deleted file mode 100644
index 04c93aa..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__tiehi.mag
+++ /dev/null
@@ -1,99 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864599
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< nmos >>
-rect 80 115 110 315
-<< pmoshvt >>
-rect 80 617 110 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 657 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 433 110 617
-rect 80 417 134 433
-rect 80 383 90 417
-rect 124 383 134 417
-rect 80 367 134 383
-rect 80 315 110 367
-rect 80 89 110 115
-<< polycont >>
-rect 90 383 124 417
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 641 69 657
-rect 121 1201 155 1217
-rect 121 609 155 657
-rect 74 383 90 417
-rect 124 383 155 417
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 383
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 121 575 155 609
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 94 609 167 615
-rect 94 575 121 609
-rect 155 575 167 609
-rect 94 569 167 575
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 138 592 138 592 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__tielo.mag b/18T_ls/sky130_osu_sc_18T_ls__tielo.mag
deleted file mode 100644
index c63213e..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__tielo.mag
+++ /dev/null
@@ -1,99 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864600
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< nmos >>
-rect 80 115 110 315
-<< pmoshvt >>
-rect 80 617 110 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 657 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 565 110 617
-rect 80 549 134 565
-rect 80 515 90 549
-rect 124 515 134 549
-rect 80 499 134 515
-rect 80 315 110 499
-rect 80 89 110 115
-<< polycont >>
-rect 90 515 124 549
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 641 69 657
-rect 121 1201 155 1217
-rect 121 549 155 657
-rect 74 515 90 549
-rect 124 515 155 549
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 353
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 121 353 155 387
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 94 387 167 393
-rect 94 353 121 387
-rect 155 353 167 387
-rect 94 347 167 353
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 138 370 138 370 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__tnbufi_1.mag b/18T_ls/sky130_osu_sc_18T_ls__tnbufi_1.mag
deleted file mode 100644
index 20e703a..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__tnbufi_1.mag
+++ /dev/null
@@ -1,180 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864600
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 375 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 238 115 268 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 238 617 268 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 115 238 315
-rect 268 267 321 315
-rect 268 131 279 267
-rect 313 131 321 267
-rect 268 115 321 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 617 238 1217
-rect 268 1201 321 1217
-rect 268 657 279 1201
-rect 313 657 321 1201
-rect 268 617 321 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 279 131 313 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 725 155 1201
-rect 279 657 313 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 80 602 110 617
-rect 166 602 196 617
-rect 39 572 196 602
-rect 39 360 69 572
-rect 111 570 165 572
-rect 111 536 121 570
-rect 155 536 165 570
-rect 111 520 165 536
-rect 111 452 196 468
-rect 111 418 121 452
-rect 155 418 196 452
-rect 111 402 196 418
-rect 39 330 110 360
-rect 80 315 110 330
-rect 166 315 196 402
-rect 238 451 268 617
-rect 238 435 292 451
-rect 238 401 248 435
-rect 282 401 292 435
-rect 238 385 292 401
-rect 238 315 268 385
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 121 536 155 570
-rect 121 418 155 452
-rect 248 401 282 435
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 709 155 725
-rect 279 1201 313 1217
-rect 35 452 69 657
-rect 121 570 155 575
-rect 121 520 155 536
-rect 121 452 155 468
-rect 35 418 121 452
-rect 35 267 69 418
-rect 121 402 155 418
-rect 211 435 245 649
-rect 279 535 313 657
-rect 211 401 248 435
-rect 282 401 298 435
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 279 267 313 279
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 211 649 245 683
-rect 121 575 155 609
-rect 279 501 313 535
-rect 279 279 313 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 199 683 257 689
-rect 177 649 211 683
-rect 245 649 257 683
-rect 199 643 257 649
-rect 109 609 167 615
-rect 109 575 121 609
-rect 155 575 189 609
-rect 109 569 167 575
-rect 267 535 325 541
-rect 267 501 279 535
-rect 313 501 325 535
-rect 267 495 325 501
-rect 279 319 313 495
-rect 267 313 325 319
-rect 267 279 279 313
-rect 313 279 325 313
-rect 267 273 325 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 364 305 364 1 Y
-port 1 n
-rlabel metal1 228 666 228 666 1 A
-port 2 n
-rlabel metal1 138 592 138 592 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__tnbufi_l.mag b/18T_ls/sky130_osu_sc_18T_ls__tnbufi_l.mag
deleted file mode 100644
index 65862b4..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__tnbufi_l.mag
+++ /dev/null
@@ -1,180 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864600
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 375 1341
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
-<< pmoshvt >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 238 817 268 1217
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 166 263
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 115 238 263
-rect 268 199 321 263
-rect 268 131 279 199
-rect 313 131 321 199
-rect 268 115 321 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 817 166 861
-rect 196 817 238 1217
-rect 268 1201 321 1217
-rect 268 861 279 1201
-rect 313 861 321 1201
-rect 268 817 321 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-rect 279 131 313 199
-<< pdiffc >>
-rect 35 861 69 1201
-rect 121 861 155 1201
-rect 279 861 313 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 80 602 110 817
-rect 166 602 196 817
-rect 39 572 196 602
-rect 39 360 69 572
-rect 111 570 165 572
-rect 111 536 121 570
-rect 155 536 165 570
-rect 111 520 165 536
-rect 111 452 196 468
-rect 111 418 121 452
-rect 155 418 196 452
-rect 111 402 196 418
-rect 39 330 110 360
-rect 80 263 110 330
-rect 166 263 196 402
-rect 238 451 268 817
-rect 238 435 292 451
-rect 238 401 248 435
-rect 282 401 292 435
-rect 238 385 292 401
-rect 238 263 268 385
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 121 536 155 570
-rect 121 418 155 452
-rect 248 401 282 435
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 35 452 69 861
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 279 1201 313 1217
-rect 121 570 155 575
-rect 121 520 155 536
-rect 121 452 155 468
-rect 35 418 121 452
-rect 35 199 69 418
-rect 121 402 155 418
-rect 211 435 245 649
-rect 279 535 313 861
-rect 211 401 248 435
-rect 282 401 298 435
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 279 199 313 279
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 211 649 245 683
-rect 121 575 155 609
-rect 279 501 313 535
-rect 279 279 313 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 199 683 257 689
-rect 177 649 211 683
-rect 245 649 257 683
-rect 199 643 257 649
-rect 109 609 167 615
-rect 109 575 121 609
-rect 155 575 189 609
-rect 109 569 167 575
-rect 267 535 325 541
-rect 267 501 279 535
-rect 313 501 325 535
-rect 267 495 325 501
-rect 279 319 313 495
-rect 267 313 325 319
-rect 267 279 279 313
-rect 313 279 325 313
-rect 267 273 325 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 364 305 364 1 Y
-port 1 n
-rlabel metal1 228 666 228 666 1 A
-port 2 n
-rlabel metal1 138 592 138 592 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__xnor2_l.mag b/18T_ls/sky130_osu_sc_18T_ls__xnor2_l.mag
deleted file mode 100644
index f4835ba..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__xnor2_l.mag
+++ /dev/null
@@ -1,291 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864600
-<< checkpaint >>
-rect -1209 -1243 1753 2575
-<< nwell >>
-rect -9 581 638 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 238 115 268 315
-rect 358 115 388 315
-rect 430 115 460 315
-rect 516 115 546 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 238 617 268 1217
-rect 358 617 388 1217
-rect 430 617 460 1217
-rect 516 617 546 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 199 166 315
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 115 238 315
-rect 268 267 358 315
-rect 268 131 279 267
-rect 347 131 358 267
-rect 268 115 358 131
-rect 388 115 430 315
-rect 460 199 516 315
-rect 460 131 471 199
-rect 505 131 516 199
-rect 460 115 516 131
-rect 546 267 599 315
-rect 546 131 557 267
-rect 591 131 599 267
-rect 546 115 599 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 617 238 1217
-rect 268 1201 358 1217
-rect 268 657 279 1201
-rect 347 657 358 1201
-rect 268 617 358 657
-rect 388 617 430 1217
-rect 460 1201 516 1217
-rect 460 657 471 1201
-rect 505 657 516 1201
-rect 460 617 516 657
-rect 546 1201 599 1217
-rect 546 658 557 1201
-rect 591 658 599 1201
-rect 546 617 599 658
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 199
-rect 279 131 347 267
-rect 471 131 505 199
-rect 557 131 591 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 657 155 1201
-rect 279 657 347 1201
-rect 471 657 505 1201
-rect 557 658 591 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 358 1217 388 1243
-rect 430 1217 460 1243
-rect 516 1217 546 1243
-rect 80 602 110 617
-rect 70 572 110 602
-rect 70 360 100 572
-rect 166 511 196 617
-rect 142 495 196 511
-rect 142 461 152 495
-rect 186 461 196 495
-rect 142 445 196 461
-rect 238 586 268 617
-rect 238 570 292 586
-rect 238 536 248 570
-rect 282 536 292 570
-rect 238 520 292 536
-rect 142 387 196 403
-rect 142 360 152 387
-rect 70 353 152 360
-rect 186 353 196 387
-rect 70 330 196 353
-rect 80 315 110 330
-rect 166 315 196 330
-rect 238 315 268 520
-rect 358 511 388 617
-rect 430 602 460 617
-rect 516 602 546 617
-rect 430 572 546 602
-rect 358 495 472 511
-rect 358 481 428 495
-rect 418 461 428 481
-rect 462 461 472 495
-rect 418 445 472 461
-rect 516 403 546 572
-rect 326 387 380 403
-rect 326 353 336 387
-rect 370 360 380 387
-rect 479 387 546 403
-rect 479 360 489 387
-rect 370 353 388 360
-rect 326 337 388 353
-rect 358 315 388 337
-rect 430 353 489 360
-rect 523 353 546 387
-rect 430 330 546 353
-rect 430 315 460 330
-rect 516 315 546 330
-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 461 186 495
-rect 248 536 282 570
-rect 152 353 186 387
-rect 428 461 462 495
-rect 336 353 370 387
-rect 489 353 523 387
-<< locali >>
-rect 0 1311 638 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 638 1311
-rect 35 1201 69 1217
-rect 35 495 69 657
-rect 121 1201 155 1271
-rect 279 1201 347 1217
-rect 121 641 155 657
-rect 268 683 279 689
-rect 302 649 347 657
-rect 279 641 347 649
-rect 471 1201 505 1271
-rect 471 641 505 657
-rect 557 1201 591 1217
-rect 557 570 591 658
-rect 232 536 248 570
-rect 282 536 591 570
-rect 35 461 152 495
-rect 186 461 370 495
-rect 35 267 69 461
-rect 152 387 186 403
-rect 336 387 370 461
-rect 152 313 186 353
-rect 268 283 302 353
-rect 336 337 370 353
-rect 412 461 428 495
-rect 462 461 478 495
-rect 412 313 446 461
-rect 489 387 523 403
-rect 489 337 523 353
-rect 268 267 347 283
-rect 268 249 279 267
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 557 267 591 536
-rect 279 115 347 131
-rect 471 199 505 215
-rect 471 61 505 131
-rect 557 115 591 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 268 657 279 683
-rect 279 657 302 683
-rect 268 649 302 657
-rect 152 279 186 313
-rect 268 353 302 387
-rect 489 353 523 387
-rect 412 279 446 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 638 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 638 1311
-rect 0 1271 638 1277
-rect 256 683 314 689
-rect 256 649 268 683
-rect 302 649 314 683
-rect 256 643 314 649
-rect 268 393 302 643
-rect 256 387 314 393
-rect 477 387 535 393
-rect 256 353 268 387
-rect 302 353 314 387
-rect 455 353 489 387
-rect 523 353 535 387
-rect 256 347 314 353
-rect 477 347 535 353
-rect 140 313 198 319
-rect 400 313 458 319
-rect 140 279 152 313
-rect 186 279 412 313
-rect 446 279 458 313
-rect 140 273 198 279
-rect 400 273 458 279
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 170 296 170 296 1 A
-port 1 n
-rlabel metal1 506 370 506 370 1 B
-port 2 n
-rlabel metal1 284 427 284 427 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ls/sky130_osu_sc_18T_ls__xor2_l.mag b/18T_ls/sky130_osu_sc_18T_ls__xor2_l.mag
deleted file mode 100644
index e6dc57e..0000000
--- a/18T_ls/sky130_osu_sc_18T_ls__xor2_l.mag
+++ /dev/null
@@ -1,290 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864601
-<< checkpaint >>
-rect -1209 -1243 1753 2575
-<< nwell >>
-rect -9 581 638 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 238 115 268 315
-rect 358 115 388 315
-rect 430 115 460 315
-rect 516 115 546 315
-<< pmoshvt >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 238 617 268 1217
-rect 358 617 388 1217
-rect 430 617 460 1217
-rect 516 617 546 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 115 238 315
-rect 268 267 358 315
-rect 268 131 279 267
-rect 347 131 358 267
-rect 268 115 358 131
-rect 388 115 430 315
-rect 460 267 516 315
-rect 460 131 471 267
-rect 505 131 516 267
-rect 460 115 516 131
-rect 546 267 599 315
-rect 546 131 557 267
-rect 591 131 599 267
-rect 546 115 599 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 617 238 1217
-rect 268 1201 358 1217
-rect 268 657 279 1201
-rect 347 657 358 1201
-rect 268 617 358 657
-rect 388 617 430 1217
-rect 460 1201 516 1217
-rect 460 793 471 1201
-rect 505 793 516 1201
-rect 460 617 516 793
-rect 546 1201 599 1217
-rect 546 658 557 1201
-rect 591 658 599 1201
-rect 546 617 599 658
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 279 131 347 267
-rect 471 131 505 267
-rect 557 131 591 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 279 657 347 1201
-rect 471 793 505 1201
-rect 557 658 591 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 358 1217 388 1243
-rect 430 1217 460 1243
-rect 516 1217 546 1243
-rect 80 602 110 617
-rect 166 602 196 617
-rect 70 572 196 602
-rect 70 355 100 572
-rect 142 570 196 572
-rect 142 536 152 570
-rect 186 536 196 570
-rect 142 520 196 536
-rect 142 462 196 478
-rect 142 428 152 462
-rect 186 428 196 462
-rect 142 412 196 428
-rect 70 330 110 355
-rect 80 315 110 330
-rect 166 315 196 412
-rect 238 403 268 617
-rect 358 586 388 617
-rect 334 570 388 586
-rect 430 602 460 617
-rect 516 602 546 617
-rect 430 572 546 602
-rect 334 536 344 570
-rect 378 536 388 570
-rect 334 520 388 536
-rect 479 570 546 572
-rect 479 536 489 570
-rect 523 536 546 570
-rect 479 520 546 536
-rect 420 461 474 477
-rect 420 432 430 461
-rect 358 427 430 432
-rect 464 427 474 461
-rect 238 387 292 403
-rect 238 353 248 387
-rect 282 353 292 387
-rect 238 337 292 353
-rect 358 402 474 427
-rect 238 315 268 337
-rect 358 315 388 402
-rect 516 360 546 520
-rect 430 330 546 360
-rect 430 315 460 330
-rect 516 315 546 330
-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 536 186 570
-rect 152 428 186 462
-rect 344 536 378 570
-rect 489 536 523 570
-rect 430 427 464 461
-rect 248 353 282 387
-<< locali >>
-rect 0 1311 638 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 638 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 279 1201 347 1217
-rect 35 462 69 657
-rect 152 649 200 683
-rect 268 657 279 675
-rect 471 1201 505 1271
-rect 471 777 505 793
-rect 557 1201 591 1217
-rect 152 570 186 649
-rect 268 641 347 657
-rect 136 536 152 570
-rect 186 536 202 570
-rect 268 535 302 641
-rect 344 570 378 586
-rect 344 462 378 536
-rect 35 428 152 462
-rect 186 428 378 462
-rect 412 461 446 649
-rect 489 570 523 575
-rect 489 520 523 536
-rect 35 267 69 428
-rect 412 427 430 461
-rect 464 427 480 461
-rect 557 387 591 658
-rect 232 353 248 387
-rect 282 353 591 387
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 279 279 296 283
-rect 330 279 347 283
-rect 279 267 347 279
-rect 279 115 347 131
-rect 471 267 505 283
-rect 471 61 505 131
-rect 557 267 591 353
-rect 557 115 591 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 200 649 234 683
-rect 412 649 446 683
-rect 268 501 302 535
-rect 489 575 523 609
-rect 296 279 330 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 638 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 638 1311
-rect 0 1271 638 1277
-rect 188 683 246 689
-rect 400 683 458 689
-rect 188 649 200 683
-rect 234 649 412 683
-rect 446 649 458 683
-rect 188 643 246 649
-rect 400 643 458 649
-rect 477 609 535 615
-rect 455 575 489 609
-rect 523 575 535 609
-rect 477 569 535 575
-rect 256 535 314 541
-rect 256 501 268 535
-rect 302 501 314 535
-rect 256 495 314 501
-rect 268 319 302 495
-rect 268 313 342 319
-rect 268 279 296 313
-rect 330 279 342 313
-rect 284 273 342 279
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 218 666 218 666 1 A
-port 1 n
-rlabel metal1 285 486 285 486 1 Y
-port 2 n
-rlabel metal1 506 592 506 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/.magicrc b/18T_ms/.magicrc
deleted file mode 100755
index 79cac60..0000000
--- a/18T_ms/.magicrc
+++ /dev/null
@@ -1,105 +0,0 @@
-puts stdout "Sourcing design .magicrc for technology EFS8A ..."
-
-# Put grid on 0.005 pitch. This is important, as some commands don't
-# rescale the grid automatically (such as lef read?).
-
-set scalefac [tech lambda]
-if {[lindex $scalefac 1] < 2} {
- scalegrid 1 2
-}
-
-# drc off
-drc euclidean on
-
-#set PDKPATH "~/projects/efabless/tech/SkyWater/EFS8A"
-
-# loading technology
-#tech load $PDKPATH/libs.tech/magic/EFS8A.tech
-tech load ../../char/techfiles/sky130A.tech
-
-# load device generator
-#source $PDKPATH/libs.tech/magic/EFS8A.tcl
-
-# load bind keys (optional)
-# source $PDKPATH/libs.tech/magic/EFS8A-BindKeys
-
-# set units to lambda grid
-snap internal
-
-# add path to reference cells
-#set MAGPATH "${PDKPATH}/libs.ref/mag"
-#addpath ${MAGPATH}/primdev
-#addpath ${MAGPATH}/s8fmlt
-#addpath ${MAGPATH}/s8iom0
-#addpath ${MAGPATH}/scs8hd
-#addpath ${MAGPATH}/scs8hdll
-#addpath ${MAGPATH}/scs8hvl
-#addpath ${MAGPATH}/scs8hs
-#addpath ${MAGPATH}/scs8ms
-#addpath ${MAGPATH}/scs8ls
-#addpath ${MAGPATH}/scs8lp
-
-# add path to GDS cells
-
-# add path to IP from catalog. This procedure defined in the PDK script.
-catch {magic::query_mylib_ip}
-# add path to local IP from user design space. Defined in the PDK script.
-catch {magic::query_my_projects}
-
-macro Shift_G "grid 74"
-macro XK_Left "scroll l .1 w"
-macro Shift_XK_Left "scroll l 1 w"
-macro Control_XK_Left "box grow w 1"
-macro Control_Shift_XK_Left "box shrink e 1"
-macro XK_Right "scroll r .1 w"
-macro Shift_XK_Right "scroll r 1 w"
-macro Control_XK_Right "box grow e 1"
-macro Control_Shift_XK_Right "box shrink w 1"
-macro XK_Up "scroll u .1 w"
-macro Shift_XK_Up "scroll u 1 w"
-macro Control_XK_Up "box grow n 1"
-macro Control_Shift_XK_Up "box shrink s 1"
-macro XK_Down "scroll d .1 w"
-macro Shift_XK_Down "scroll d 1 w"
-macro Control_XK_Down "box grow s 1"
-macro Control_Shift_XK_Down "box shrink n 1"
-
-macro XK_Pointer_Button4 "scroll u .05 w"
-macro XK_Pointer_Button5 "scroll d .05 w"
-macro . "history redo -1"
-
-macro XK_L "select less area {ndif pdif nwell poly}"
-macro XK_K "select less area nwell"
-macro XK_J "select less area {m1 lic}"
-macro XK_H "select less area li1"
-macro Control_Shift_XK_X "rotate"
-macro Shift_XK_Pointer_Button4 "stretch N 74"
-macro Shift_XK_Pointer_Button5 "stretch S 74"
-macro Control_XK_Pointer_Button4 "stretch N 34"
-macro Control_XK_Pointer_Button5 "stretch S 34"
-macro Control_Shift_XK_Q "stretch W 88"
-macro Control_Shift_XK_R "stretch E 88"
-macro Control_Shift_XK_W "stretch N 28"
-macro Control_Shift_XK_E "stretch N 4"
-macro XK_Y "stretch N 6"
-#macro Control_Shift_XK_W "stretch S 6"
-#macro Control_Shift_XK_E "stretch S 8"
-
-macro Control_Shift_XK_Pointer_Button4 "stretch N 17"
-macro Control_Shift_XK_Pointer_Button5 "stretch S 17"
-macro Control_Shift_XK_G "select area {m1 lic}"
-macro Control_Shift_XK_F "select area {poly polycont}"
-macro Control_Shift_XK_D "select area {ndc li1}"
-macro Control_Shift_XK_S "select area ntrans"
-
-macro Shift_D "select clear; move S 10; paint m1c"
-macro Shift_F "select clear; move N 10; paint m1c"
-
-
-macro Shift_B "box height 1.0um; move S 1.655um; select area; erase; select clear; move N 1um; select area; move S 1um; select clear; box height 0.26um; move S 4.35um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.26um; select clear; box height 20um; select area; move S 0.26um"
-
-
-macro Shift_N "box height 1.74um; move S 2.395um; select area; erase; select clear; move N 1.74um; select area; move S 1.74um; select clear; box height 0.48um; move S 3.61um; select area; erase; select clear; move S 0.655um; box height 0.655um; select area; move N 0.48um; select clear; box height 20um; select area; move S 0.48um"
-
-
-macro Shift_M "box height 1.02um; move S 2.015um; select area; erase; select clear; move N 1.02um; box height 1.20um; select area; move S 1.02um; select clear; box height 0.12um; move S 0.56um; select area; erase; select clear; box height 5.00um; select area; move S 0.12um; select clear; move N 0.12um; box height 0.21um; move S 2.98um; select area;erase; select clear; box height 1.105um; move S 1.105um; select area; move N 0.21um; select clear; box height 0.17um; move N 0.825um; select area; erase; move S 0.825um; box height 0.825um; select area; move N 0.17um"
diff --git a/18T_ms/sky130_osu_sc_18T_ms__addf_1.mag b/18T_ms/sky130_osu_sc_18T_ms__addf_1.mag
deleted file mode 100644
index ff19ff1..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__addf_1.mag
+++ /dev/null
@@ -1,650 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864598
-<< checkpaint >>
-rect -1209 -1243 2569 2575
-<< nwell >>
-rect -9 581 1435 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 410 115 440 315
-rect 496 115 526 315
-rect 582 115 612 315
-rect 668 115 698 315
-rect 754 115 784 315
-rect 840 115 870 315
-rect 922 115 952 315
-rect 1004 115 1034 315
-rect 1102 115 1132 315
-rect 1292 115 1322 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 410 617 440 1217
-rect 496 617 526 1217
-rect 582 617 612 1217
-rect 668 617 698 1217
-rect 754 617 784 1217
-rect 840 617 870 1217
-rect 922 617 952 1217
-rect 1004 617 1034 1217
-rect 1102 617 1132 1217
-rect 1292 617 1322 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 199 166 315
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 115 410 315
-rect 440 267 496 315
-rect 440 131 451 267
-rect 485 131 496 267
-rect 440 115 496 131
-rect 526 267 582 315
-rect 526 131 537 267
-rect 571 131 582 267
-rect 526 115 582 131
-rect 612 199 668 315
-rect 612 131 623 199
-rect 657 131 668 199
-rect 612 115 668 131
-rect 698 267 754 315
-rect 698 131 709 267
-rect 743 131 754 267
-rect 698 115 754 131
-rect 784 199 840 315
-rect 784 131 795 199
-rect 829 131 840 199
-rect 784 115 840 131
-rect 870 115 922 315
-rect 952 115 1004 315
-rect 1034 267 1102 315
-rect 1034 131 1045 267
-rect 1079 131 1102 267
-rect 1034 115 1102 131
-rect 1132 199 1185 315
-rect 1132 131 1143 199
-rect 1177 131 1185 199
-rect 1132 115 1185 131
-rect 1239 199 1292 315
-rect 1239 131 1247 199
-rect 1281 131 1292 199
-rect 1239 115 1292 131
-rect 1322 267 1375 315
-rect 1322 131 1333 267
-rect 1367 131 1375 267
-rect 1322 115 1375 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 725 293 1201
-rect 327 725 338 1201
-rect 282 617 338 725
-rect 368 617 410 1217
-rect 440 1201 496 1217
-rect 440 725 451 1201
-rect 485 725 496 1201
-rect 440 617 496 725
-rect 526 1201 582 1217
-rect 526 725 537 1201
-rect 571 725 582 1201
-rect 526 617 582 725
-rect 612 1201 668 1217
-rect 612 793 623 1201
-rect 657 793 668 1201
-rect 612 617 668 793
-rect 698 1201 754 1217
-rect 698 725 709 1201
-rect 743 725 754 1201
-rect 698 617 754 725
-rect 784 1201 840 1217
-rect 784 725 795 1201
-rect 829 725 840 1201
-rect 784 617 840 725
-rect 870 617 922 1217
-rect 952 617 1004 1217
-rect 1034 1201 1102 1217
-rect 1034 793 1045 1201
-rect 1079 793 1102 1201
-rect 1034 617 1102 793
-rect 1132 1201 1185 1217
-rect 1132 725 1143 1201
-rect 1177 725 1185 1201
-rect 1132 617 1185 725
-rect 1239 1201 1292 1217
-rect 1239 657 1247 1201
-rect 1281 657 1292 1201
-rect 1239 617 1292 657
-rect 1322 1201 1375 1217
-rect 1322 657 1333 1201
-rect 1367 657 1375 1201
-rect 1322 617 1375 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 199
-rect 207 131 241 267
-rect 293 131 327 267
-rect 451 131 485 267
-rect 537 131 571 267
-rect 623 131 657 199
-rect 709 131 743 267
-rect 795 131 829 199
-rect 1045 131 1079 267
-rect 1143 131 1177 199
-rect 1247 131 1281 199
-rect 1333 131 1367 267
-<< pdiffc >>
-rect 35 725 69 1201
-rect 121 793 155 1201
-rect 207 725 241 1201
-rect 293 725 327 1201
-rect 451 725 485 1201
-rect 537 725 571 1201
-rect 623 793 657 1201
-rect 709 725 743 1201
-rect 795 725 829 1201
-rect 1045 793 1079 1201
-rect 1143 725 1177 1201
-rect 1247 657 1281 1201
-rect 1333 657 1367 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-rect 979 1271 1003 1305
-rect 1037 1271 1061 1305
-rect 1115 1271 1139 1305
-rect 1173 1271 1197 1305
-rect 1251 1271 1275 1305
-rect 1309 1271 1333 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-rect 1003 1271 1037 1305
-rect 1139 1271 1173 1305
-rect 1275 1271 1309 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1245
-rect 338 1217 368 1245
-rect 410 1217 440 1243
-rect 496 1217 526 1243
-rect 582 1217 612 1245
-rect 668 1217 698 1245
-rect 754 1217 784 1245
-rect 840 1217 870 1245
-rect 922 1217 952 1245
-rect 1004 1217 1034 1245
-rect 1102 1217 1132 1245
-rect 1292 1217 1322 1245
-rect 80 403 110 617
-rect 166 585 196 617
-rect 152 569 206 585
-rect 152 535 162 569
-rect 196 535 206 569
-rect 152 519 206 535
-rect 70 387 124 403
-rect 70 353 80 387
-rect 114 353 124 387
-rect 70 337 124 353
-rect 80 315 110 337
-rect 166 315 196 519
-rect 252 477 282 617
-rect 338 519 368 617
-rect 410 592 440 617
-rect 496 592 526 617
-rect 410 562 526 592
-rect 338 503 430 519
-rect 238 461 292 477
-rect 238 427 248 461
-rect 282 427 292 461
-rect 238 411 292 427
-rect 338 469 386 503
-rect 420 469 430 503
-rect 338 453 430 469
-rect 252 315 282 411
-rect 338 315 368 453
-rect 472 403 502 562
-rect 582 403 612 617
-rect 668 551 698 617
-rect 656 535 710 551
-rect 656 501 666 535
-rect 700 501 710 535
-rect 656 485 710 501
-rect 472 387 526 403
-rect 472 367 482 387
-rect 410 353 482 367
-rect 516 353 526 387
-rect 410 337 526 353
-rect 568 387 622 403
-rect 568 353 578 387
-rect 612 353 622 387
-rect 568 337 622 353
-rect 410 315 440 337
-rect 496 315 526 337
-rect 582 315 612 337
-rect 668 315 698 485
-rect 754 403 784 617
-rect 840 551 870 617
-rect 826 535 880 551
-rect 826 501 836 535
-rect 870 501 880 535
-rect 826 485 880 501
-rect 922 513 952 617
-rect 1004 585 1034 617
-rect 1004 555 1048 585
-rect 1102 584 1132 617
-rect 922 497 976 513
-rect 742 387 796 403
-rect 742 353 752 387
-rect 786 353 796 387
-rect 742 337 796 353
-rect 754 315 784 337
-rect 840 315 870 485
-rect 922 463 932 497
-rect 966 463 976 497
-rect 922 447 976 463
-rect 922 315 952 447
-rect 1018 403 1048 555
-rect 1090 568 1144 584
-rect 1292 581 1322 617
-rect 1090 534 1100 568
-rect 1134 534 1144 568
-rect 1090 518 1144 534
-rect 1255 565 1322 581
-rect 1255 531 1265 565
-rect 1299 531 1322 565
-rect 1004 387 1058 403
-rect 1004 353 1014 387
-rect 1048 353 1058 387
-rect 1004 337 1058 353
-rect 1004 315 1034 337
-rect 1102 315 1132 518
-rect 1255 515 1322 531
-rect 1292 315 1322 515
-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 535 196 569
-rect 80 353 114 387
-rect 248 427 282 461
-rect 386 469 420 503
-rect 666 501 700 535
-rect 482 353 516 387
-rect 578 353 612 387
-rect 836 501 870 535
-rect 752 353 786 387
-rect 932 463 966 497
-rect 1100 534 1134 568
-rect 1265 531 1299 565
-rect 1014 353 1048 387
-<< locali >>
-rect 0 1311 1408 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 1003 1311
-rect 1037 1271 1139 1311
-rect 1173 1271 1275 1311
-rect 1309 1271 1408 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 709 69 725
-rect 207 709 241 725
-rect 35 675 241 709
-rect 293 1201 327 1217
-rect 293 642 327 725
-rect 451 1201 485 1271
-rect 451 709 485 725
-rect 537 1201 571 1217
-rect 623 1201 657 1271
-rect 623 777 657 793
-rect 709 1201 743 1217
-rect 537 708 571 725
-rect 709 708 743 725
-rect 537 674 743 708
-rect 795 1201 829 1217
-rect 1045 1201 1079 1271
-rect 1045 777 1079 793
-rect 1143 1201 1177 1217
-rect 795 684 829 725
-rect 1143 684 1177 725
-rect 795 650 1100 684
-rect 293 605 350 642
-rect 795 641 829 650
-rect 80 535 162 569
-rect 196 535 212 569
-rect 248 461 282 477
-rect 248 411 282 427
-rect 64 353 80 387
-rect 114 353 130 387
-rect 316 370 350 605
-rect 752 606 829 641
-rect 578 535 612 541
-rect 386 503 444 535
-rect 420 501 444 503
-rect 650 501 666 535
-rect 700 501 716 535
-rect 386 453 420 469
-rect 578 387 612 501
-rect 666 461 700 501
-rect 752 461 786 606
-rect 1066 584 1100 650
-rect 1247 1201 1281 1271
-rect 1177 650 1202 667
-rect 1143 633 1202 650
-rect 1247 641 1281 657
-rect 1333 1201 1367 1217
-rect 1066 568 1134 584
-rect 1066 537 1100 568
-rect 820 501 836 535
-rect 870 501 886 535
-rect 1089 534 1100 537
-rect 1100 518 1134 534
-rect 932 497 966 513
-rect 932 461 966 463
-rect 1168 461 1202 633
-rect 1333 609 1367 657
-rect 752 427 879 461
-rect 1143 427 1202 461
-rect 1265 565 1299 581
-rect 293 336 350 370
-rect 466 353 482 387
-rect 516 353 532 387
-rect 736 353 752 387
-rect 786 353 811 387
-rect 578 337 612 353
-rect 293 313 327 336
-rect 35 267 241 286
-rect 69 252 207 267
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 207 114 241 131
-rect 777 313 811 353
-rect 293 267 327 279
-rect 293 114 327 131
-rect 451 267 485 283
-rect 451 61 485 131
-rect 537 267 743 286
-rect 571 252 709 267
-rect 537 114 571 131
-rect 623 199 657 215
-rect 623 61 657 131
-rect 845 215 879 427
-rect 998 353 1014 387
-rect 1048 353 1064 387
-rect 709 114 743 131
-rect 795 199 879 215
-rect 829 181 879 199
-rect 1045 267 1079 283
-rect 795 114 829 131
-rect 1045 61 1079 131
-rect 1143 199 1177 427
-rect 1265 313 1299 531
-rect 1245 279 1299 313
-rect 1333 267 1367 575
-rect 1143 115 1177 131
-rect 1247 199 1281 215
-rect 1247 61 1281 131
-rect 1333 115 1367 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 1003 1305 1037 1311
-rect 1003 1277 1037 1305
-rect 1139 1305 1173 1311
-rect 1139 1277 1173 1305
-rect 1275 1305 1309 1311
-rect 1275 1277 1309 1305
-rect 80 501 114 535
-rect 248 427 282 461
-rect 80 353 114 387
-rect 444 501 478 535
-rect 578 501 612 535
-rect 666 427 700 461
-rect 1143 650 1177 684
-rect 836 501 870 535
-rect 932 427 966 461
-rect 482 353 516 387
-rect 293 279 327 313
-rect 777 279 811 313
-rect 1014 353 1048 387
-rect 1211 279 1245 313
-rect 1333 575 1367 609
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1311 1408 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 1003 1311
-rect 1037 1277 1139 1311
-rect 1173 1277 1275 1311
-rect 1309 1277 1408 1311
-rect 0 1271 1408 1277
-rect 1131 684 1189 690
-rect 1109 650 1143 684
-rect 1177 650 1189 684
-rect 1131 644 1189 650
-rect 1321 609 1379 615
-rect 1299 575 1333 609
-rect 1367 575 1379 609
-rect 1321 569 1379 575
-rect 68 535 126 541
-rect 432 535 490 541
-rect 566 535 624 541
-rect 824 535 882 541
-rect 68 501 80 535
-rect 114 501 444 535
-rect 478 501 578 535
-rect 612 502 836 535
-rect 612 501 734 502
-rect 812 501 836 502
-rect 870 501 882 535
-rect 68 495 126 501
-rect 432 495 490 501
-rect 566 495 624 501
-rect 824 495 882 501
-rect 236 461 294 467
-rect 654 461 712 467
-rect 920 461 978 467
-rect 80 427 248 461
-rect 282 427 666 461
-rect 700 427 932 461
-rect 966 427 978 461
-rect 236 421 294 427
-rect 654 421 712 427
-rect 920 421 978 427
-rect 68 387 126 393
-rect 470 387 528 393
-rect 1002 387 1060 393
-rect 68 353 80 387
-rect 114 353 482 387
-rect 516 353 1014 387
-rect 1048 353 1060 387
-rect 68 347 126 353
-rect 470 347 528 353
-rect 1002 347 1060 353
-rect 281 313 339 319
-rect 765 313 823 319
-rect 1199 313 1257 319
-rect 281 279 293 313
-rect 327 279 777 313
-rect 811 279 1211 313
-rect 1245 279 1257 313
-rect 281 273 339 279
-rect 765 273 823 279
-rect 1199 273 1257 279
-rect 0 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel metal1 97 370 97 370 1 A
-port 1 n
-rlabel metal1 265 444 265 444 1 CI
-port 2 n
-rlabel metal1 129 518 129 518 1 B
-port 3 n
-rlabel metal1 1228 296 1228 296 1 CON
-port 4 n
-rlabel metal1 1160 667 1160 667 1 S
-port 5 n
-rlabel metal1 1350 592 1350 592 1 CO
-port 6 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__addf_l.mag b/18T_ms/sky130_osu_sc_18T_ms__addf_l.mag
deleted file mode 100644
index fe5c0dd..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__addf_l.mag
+++ /dev/null
@@ -1,652 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864598
-<< checkpaint >>
-rect -1209 -1243 2569 2575
-<< nwell >>
-rect -9 581 1435 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 410 115 440 315
-rect 496 115 526 315
-rect 582 115 612 315
-rect 668 115 698 315
-rect 754 115 784 315
-rect 840 115 870 315
-rect 922 115 952 315
-rect 1004 115 1034 315
-rect 1102 115 1132 263
-rect 1292 115 1322 263
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 410 617 440 1217
-rect 496 617 526 1217
-rect 582 617 612 1217
-rect 668 617 698 1217
-rect 754 617 784 1217
-rect 840 617 870 1217
-rect 922 617 952 1217
-rect 1004 617 1034 1217
-rect 1102 817 1132 1217
-rect 1292 817 1322 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 199 166 315
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 115 410 315
-rect 440 267 496 315
-rect 440 131 451 267
-rect 485 131 496 267
-rect 440 115 496 131
-rect 526 267 582 315
-rect 526 131 537 267
-rect 571 131 582 267
-rect 526 115 582 131
-rect 612 199 668 315
-rect 612 131 623 199
-rect 657 131 668 199
-rect 612 115 668 131
-rect 698 267 754 315
-rect 698 131 709 267
-rect 743 131 754 267
-rect 698 115 754 131
-rect 784 199 840 315
-rect 784 131 795 199
-rect 829 131 840 199
-rect 784 115 840 131
-rect 870 115 922 315
-rect 952 115 1004 315
-rect 1034 267 1087 315
-rect 1034 131 1045 267
-rect 1079 263 1087 267
-rect 1079 131 1102 263
-rect 1034 115 1102 131
-rect 1132 199 1185 263
-rect 1132 131 1143 199
-rect 1177 131 1185 199
-rect 1132 115 1185 131
-rect 1239 199 1292 263
-rect 1239 131 1247 199
-rect 1281 131 1292 199
-rect 1239 115 1292 131
-rect 1322 199 1375 263
-rect 1322 131 1333 199
-rect 1367 131 1375 199
-rect 1322 115 1375 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 725 293 1201
-rect 327 725 338 1201
-rect 282 617 338 725
-rect 368 617 410 1217
-rect 440 1201 496 1217
-rect 440 725 451 1201
-rect 485 725 496 1201
-rect 440 617 496 725
-rect 526 1201 582 1217
-rect 526 725 537 1201
-rect 571 725 582 1201
-rect 526 617 582 725
-rect 612 1201 668 1217
-rect 612 793 623 1201
-rect 657 793 668 1201
-rect 612 617 668 793
-rect 698 1201 754 1217
-rect 698 725 709 1201
-rect 743 725 754 1201
-rect 698 617 754 725
-rect 784 1201 840 1217
-rect 784 725 795 1201
-rect 829 725 840 1201
-rect 784 617 840 725
-rect 870 617 922 1217
-rect 952 617 1004 1217
-rect 1034 1201 1102 1217
-rect 1034 793 1045 1201
-rect 1079 817 1102 1201
-rect 1132 1201 1185 1217
-rect 1132 855 1143 1201
-rect 1177 855 1185 1201
-rect 1132 817 1185 855
-rect 1239 1201 1292 1217
-rect 1239 855 1247 1201
-rect 1281 855 1292 1201
-rect 1239 817 1292 855
-rect 1322 1201 1375 1217
-rect 1322 855 1333 1201
-rect 1367 855 1375 1201
-rect 1322 817 1375 855
-rect 1079 793 1087 817
-rect 1034 617 1087 793
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 199
-rect 207 131 241 267
-rect 293 131 327 267
-rect 451 131 485 267
-rect 537 131 571 267
-rect 623 131 657 199
-rect 709 131 743 267
-rect 795 131 829 199
-rect 1045 131 1079 267
-rect 1143 131 1177 199
-rect 1247 131 1281 199
-rect 1333 131 1367 199
-<< pdiffc >>
-rect 35 725 69 1201
-rect 121 793 155 1201
-rect 207 725 241 1201
-rect 293 725 327 1201
-rect 451 725 485 1201
-rect 537 725 571 1201
-rect 623 793 657 1201
-rect 709 725 743 1201
-rect 795 725 829 1201
-rect 1045 793 1079 1201
-rect 1143 855 1177 1201
-rect 1247 855 1281 1201
-rect 1333 855 1367 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-rect 979 1271 1003 1305
-rect 1037 1271 1061 1305
-rect 1115 1271 1139 1305
-rect 1173 1271 1197 1305
-rect 1251 1271 1275 1305
-rect 1309 1271 1333 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-rect 1003 1271 1037 1305
-rect 1139 1271 1173 1305
-rect 1275 1271 1309 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1245
-rect 338 1217 368 1245
-rect 410 1217 440 1243
-rect 496 1217 526 1243
-rect 582 1217 612 1245
-rect 668 1217 698 1245
-rect 754 1217 784 1245
-rect 840 1217 870 1245
-rect 922 1217 952 1245
-rect 1004 1217 1034 1245
-rect 1102 1217 1132 1245
-rect 1292 1217 1322 1245
-rect 80 403 110 617
-rect 166 585 196 617
-rect 152 569 206 585
-rect 152 535 162 569
-rect 196 535 206 569
-rect 152 519 206 535
-rect 70 387 124 403
-rect 70 353 80 387
-rect 114 353 124 387
-rect 70 337 124 353
-rect 80 315 110 337
-rect 166 315 196 519
-rect 252 477 282 617
-rect 338 519 368 617
-rect 410 592 440 617
-rect 496 592 526 617
-rect 410 562 526 592
-rect 338 503 430 519
-rect 238 461 292 477
-rect 238 427 248 461
-rect 282 427 292 461
-rect 238 411 292 427
-rect 338 469 386 503
-rect 420 469 430 503
-rect 338 453 430 469
-rect 252 315 282 411
-rect 338 315 368 453
-rect 472 403 502 562
-rect 582 403 612 617
-rect 668 551 698 617
-rect 656 535 710 551
-rect 656 501 666 535
-rect 700 501 710 535
-rect 656 485 710 501
-rect 472 387 526 403
-rect 472 367 482 387
-rect 410 353 482 367
-rect 516 353 526 387
-rect 410 337 526 353
-rect 568 387 622 403
-rect 568 353 578 387
-rect 612 353 622 387
-rect 568 337 622 353
-rect 410 315 440 337
-rect 496 315 526 337
-rect 582 315 612 337
-rect 668 315 698 485
-rect 754 403 784 617
-rect 840 551 870 617
-rect 826 535 880 551
-rect 826 501 836 535
-rect 870 501 880 535
-rect 826 485 880 501
-rect 922 513 952 617
-rect 1004 585 1034 617
-rect 1004 555 1048 585
-rect 1102 584 1132 817
-rect 922 497 976 513
-rect 742 387 796 403
-rect 742 353 752 387
-rect 786 353 796 387
-rect 742 337 796 353
-rect 754 315 784 337
-rect 840 315 870 485
-rect 922 463 932 497
-rect 966 463 976 497
-rect 922 447 976 463
-rect 922 315 952 447
-rect 1018 403 1048 555
-rect 1090 568 1144 584
-rect 1292 581 1322 817
-rect 1090 534 1100 568
-rect 1134 534 1144 568
-rect 1090 518 1144 534
-rect 1255 565 1322 581
-rect 1255 531 1265 565
-rect 1299 531 1322 565
-rect 1004 387 1058 403
-rect 1004 353 1014 387
-rect 1048 353 1058 387
-rect 1004 337 1058 353
-rect 1004 315 1034 337
-rect 1102 263 1132 518
-rect 1255 515 1322 531
-rect 1292 263 1322 515
-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 535 196 569
-rect 80 353 114 387
-rect 248 427 282 461
-rect 386 469 420 503
-rect 666 501 700 535
-rect 482 353 516 387
-rect 578 353 612 387
-rect 836 501 870 535
-rect 752 353 786 387
-rect 932 463 966 497
-rect 1100 534 1134 568
-rect 1265 531 1299 565
-rect 1014 353 1048 387
-<< locali >>
-rect 0 1311 1408 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 1003 1311
-rect 1037 1271 1139 1311
-rect 1173 1271 1275 1311
-rect 1309 1271 1408 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 709 69 725
-rect 207 709 241 725
-rect 35 675 241 709
-rect 293 1201 327 1217
-rect 293 642 327 725
-rect 451 1201 485 1271
-rect 451 709 485 725
-rect 537 1201 571 1217
-rect 623 1201 657 1271
-rect 623 777 657 793
-rect 709 1201 743 1217
-rect 537 708 571 725
-rect 709 708 743 725
-rect 537 674 743 708
-rect 795 1201 829 1217
-rect 1045 1201 1079 1271
-rect 1045 777 1079 793
-rect 1143 1201 1177 1217
-rect 795 684 829 725
-rect 1143 690 1177 855
-rect 1247 1201 1281 1271
-rect 1247 839 1281 855
-rect 1333 1201 1367 1217
-rect 795 650 1100 684
-rect 293 605 350 642
-rect 795 641 829 650
-rect 80 535 162 569
-rect 196 535 212 569
-rect 248 461 282 477
-rect 248 411 282 427
-rect 64 353 80 387
-rect 114 353 130 387
-rect 316 370 350 605
-rect 752 606 829 641
-rect 578 535 612 541
-rect 386 503 444 535
-rect 420 501 444 503
-rect 650 501 666 535
-rect 700 501 716 535
-rect 386 453 420 469
-rect 578 387 612 501
-rect 666 461 700 501
-rect 752 461 786 606
-rect 1066 584 1100 650
-rect 1177 656 1202 667
-rect 1143 633 1202 656
-rect 1066 568 1134 584
-rect 1066 537 1100 568
-rect 820 501 836 535
-rect 870 501 886 535
-rect 1089 534 1100 537
-rect 1100 518 1134 534
-rect 932 497 966 513
-rect 932 461 966 463
-rect 1168 461 1202 633
-rect 1333 609 1367 855
-rect 752 427 879 461
-rect 1143 427 1202 461
-rect 1265 565 1299 581
-rect 293 336 350 370
-rect 466 353 482 387
-rect 516 353 532 387
-rect 736 353 752 387
-rect 786 353 811 387
-rect 578 337 612 353
-rect 293 313 327 336
-rect 35 267 241 286
-rect 69 252 207 267
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 207 114 241 131
-rect 777 313 811 353
-rect 293 267 327 279
-rect 293 114 327 131
-rect 451 267 485 283
-rect 451 61 485 131
-rect 537 267 743 286
-rect 571 252 709 267
-rect 537 114 571 131
-rect 623 199 657 215
-rect 623 61 657 131
-rect 845 215 879 427
-rect 998 353 1014 387
-rect 1048 353 1064 387
-rect 709 114 743 131
-rect 795 199 879 215
-rect 829 181 879 199
-rect 1045 267 1079 283
-rect 795 114 829 131
-rect 1045 61 1079 131
-rect 1143 199 1177 427
-rect 1265 313 1299 531
-rect 1245 279 1299 313
-rect 1143 115 1177 131
-rect 1247 199 1281 215
-rect 1247 61 1281 131
-rect 1333 199 1367 575
-rect 1333 115 1367 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1408 61
-rect 0 0 1408 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 1003 1305 1037 1311
-rect 1003 1277 1037 1305
-rect 1139 1305 1173 1311
-rect 1139 1277 1173 1305
-rect 1275 1305 1309 1311
-rect 1275 1277 1309 1305
-rect 80 501 114 535
-rect 248 427 282 461
-rect 80 353 114 387
-rect 444 501 478 535
-rect 578 501 612 535
-rect 666 427 700 461
-rect 1143 656 1177 690
-rect 836 501 870 535
-rect 932 427 966 461
-rect 482 353 516 387
-rect 293 279 327 313
-rect 777 279 811 313
-rect 1014 353 1048 387
-rect 1211 279 1245 313
-rect 1333 575 1367 609
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1311 1408 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 1003 1311
-rect 1037 1277 1139 1311
-rect 1173 1277 1275 1311
-rect 1309 1277 1408 1311
-rect 0 1271 1408 1277
-rect 1131 690 1189 696
-rect 1109 656 1143 690
-rect 1177 656 1189 690
-rect 1131 650 1189 656
-rect 1321 609 1379 615
-rect 1299 575 1333 609
-rect 1367 575 1379 609
-rect 1321 569 1379 575
-rect 68 535 126 541
-rect 432 535 490 541
-rect 566 535 624 541
-rect 824 535 882 541
-rect 68 501 80 535
-rect 114 501 444 535
-rect 478 501 578 535
-rect 612 502 836 535
-rect 612 501 734 502
-rect 812 501 836 502
-rect 870 501 882 535
-rect 68 495 126 501
-rect 432 495 490 501
-rect 566 495 624 501
-rect 824 495 882 501
-rect 236 461 294 467
-rect 654 461 712 467
-rect 920 461 978 467
-rect 80 427 248 461
-rect 282 427 666 461
-rect 700 427 932 461
-rect 966 427 978 461
-rect 236 421 294 427
-rect 654 421 712 427
-rect 920 421 978 427
-rect 68 387 126 393
-rect 470 387 528 393
-rect 1002 387 1060 393
-rect 68 353 80 387
-rect 114 353 482 387
-rect 516 353 1014 387
-rect 1048 353 1060 387
-rect 68 347 126 353
-rect 470 347 528 353
-rect 1002 347 1060 353
-rect 281 313 339 319
-rect 765 313 823 319
-rect 1199 313 1257 319
-rect 281 279 293 313
-rect 327 279 777 313
-rect 811 279 1211 313
-rect 1245 279 1257 313
-rect 281 273 339 279
-rect 765 273 823 279
-rect 1199 273 1257 279
-rect 0 55 1408 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1408 55
-rect 0 0 1408 21
-<< labels >>
-rlabel metal1 97 370 97 370 1 A
-port 1 n
-rlabel metal1 265 444 265 444 1 CI
-port 2 n
-rlabel metal1 129 518 129 518 1 B
-port 3 n
-rlabel metal1 1350 592 1350 592 1 CO
-port 5 n
-rlabel metal1 1160 673 1160 673 1 S
-port 6 n
-rlabel metal1 1228 296 1228 296 1 CON
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__addh_1.mag b/18T_ms/sky130_osu_sc_18T_ms__addh_1.mag
deleted file mode 100644
index 0851b21..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__addh_1.mag
+++ /dev/null
@@ -1,393 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864599
-<< checkpaint >>
-rect -1209 -1243 2025 2575
-<< nwell >>
-rect -9 581 837 1341
-<< nmos >>
-rect 80 115 110 315
-rect 178 115 208 315
-rect 250 115 280 315
-rect 442 115 472 315
-rect 540 115 570 315
-rect 626 115 656 315
-rect 712 115 742 315
-<< pmos >>
-rect 80 617 110 1217
-rect 178 617 208 1217
-rect 264 617 294 1217
-rect 362 617 392 1217
-rect 552 617 582 1217
-rect 638 617 668 1217
-rect 710 617 740 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 178 315
-rect 110 131 133 267
-rect 167 131 178 267
-rect 110 115 178 131
-rect 208 115 250 315
-rect 280 267 333 315
-rect 280 131 291 267
-rect 325 131 333 267
-rect 280 115 333 131
-rect 389 267 442 315
-rect 389 131 397 267
-rect 431 131 442 267
-rect 389 115 442 131
-rect 472 267 540 315
-rect 472 131 495 267
-rect 529 131 540 267
-rect 472 115 540 131
-rect 570 267 626 315
-rect 570 131 581 267
-rect 615 131 626 267
-rect 570 115 626 131
-rect 656 267 712 315
-rect 656 199 667 267
-rect 701 199 712 267
-rect 656 115 712 199
-rect 742 267 795 315
-rect 742 131 753 267
-rect 787 131 795 267
-rect 742 115 795 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 178 1217
-rect 110 657 133 1201
-rect 167 657 178 1201
-rect 110 617 178 657
-rect 208 1201 264 1217
-rect 208 725 219 1201
-rect 253 725 264 1201
-rect 208 617 264 725
-rect 294 1201 362 1217
-rect 294 725 305 1201
-rect 339 725 362 1201
-rect 294 617 362 725
-rect 392 1201 445 1217
-rect 392 657 403 1201
-rect 437 657 445 1201
-rect 392 617 445 657
-rect 499 1201 552 1217
-rect 499 657 507 1201
-rect 541 657 552 1201
-rect 499 617 552 657
-rect 582 1201 638 1217
-rect 582 657 593 1201
-rect 627 657 638 1201
-rect 582 617 638 657
-rect 668 617 710 1217
-rect 740 1201 796 1217
-rect 740 657 751 1201
-rect 785 657 796 1201
-rect 740 617 796 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 133 131 167 267
-rect 291 131 325 267
-rect 397 131 431 267
-rect 495 131 529 267
-rect 581 131 615 267
-rect 667 199 701 267
-rect 753 131 787 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 133 657 167 1201
-rect 219 725 253 1201
-rect 305 725 339 1201
-rect 403 657 437 1201
-rect 507 657 541 1201
-rect 593 657 627 1201
-rect 751 657 785 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 178 1217 208 1243
-rect 264 1217 294 1243
-rect 362 1217 392 1243
-rect 552 1217 582 1243
-rect 638 1217 668 1243
-rect 710 1217 740 1243
-rect 80 403 110 617
-rect 178 477 208 617
-rect 264 551 294 617
-rect 154 461 208 477
-rect 154 427 164 461
-rect 198 427 208 461
-rect 154 411 208 427
-rect 43 387 110 403
-rect 43 353 53 387
-rect 87 353 110 387
-rect 43 337 110 353
-rect 80 315 110 337
-rect 178 315 208 411
-rect 250 535 304 551
-rect 250 501 260 535
-rect 294 501 304 535
-rect 250 485 304 501
-rect 362 549 392 617
-rect 552 549 582 617
-rect 362 519 582 549
-rect 250 315 280 485
-rect 362 424 392 519
-rect 638 477 668 617
-rect 710 551 740 617
-rect 710 535 764 551
-rect 710 501 720 535
-rect 754 501 764 535
-rect 710 485 764 501
-rect 338 408 392 424
-rect 614 461 668 477
-rect 614 427 624 461
-rect 658 427 668 461
-rect 614 411 668 427
-rect 338 374 348 408
-rect 382 375 392 408
-rect 382 374 570 375
-rect 338 345 570 374
-rect 442 315 472 345
-rect 540 315 570 345
-rect 626 315 656 411
-rect 712 315 742 485
-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 427 198 461
-rect 53 353 87 387
-rect 260 501 294 535
-rect 720 501 754 535
-rect 624 427 658 461
-rect 348 374 382 408
-<< locali >>
-rect 0 1311 836 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 836 1311
-rect 35 1201 69 1217
-rect 35 623 69 649
-rect 133 1201 167 1271
-rect 133 641 167 657
-rect 219 1201 253 1217
-rect 219 619 253 725
-rect 305 1201 339 1271
-rect 305 709 339 725
-rect 403 1201 437 1217
-rect 219 585 362 619
-rect 260 535 294 551
-rect 260 485 294 501
-rect 148 427 164 461
-rect 198 427 214 461
-rect 328 424 362 585
-rect 403 609 437 657
-rect 507 1201 541 1217
-rect 403 575 418 609
-rect 328 408 382 424
-rect 328 392 348 408
-rect 37 353 53 387
-rect 87 353 110 387
-rect 291 374 348 392
-rect 291 358 382 374
-rect 35 267 69 278
-rect 35 115 69 131
-rect 133 267 167 283
-rect 133 61 167 131
-rect 291 267 325 358
-rect 418 312 452 575
-rect 507 607 541 657
-rect 593 1201 627 1271
-rect 593 641 627 657
-rect 751 1201 785 1217
-rect 751 607 785 657
-rect 507 573 785 607
-rect 507 387 541 573
-rect 704 501 720 535
-rect 754 501 770 535
-rect 608 427 624 461
-rect 658 427 674 461
-rect 541 353 667 387
-rect 291 115 325 131
-rect 397 277 452 312
-rect 397 267 431 277
-rect 397 115 431 131
-rect 495 267 529 283
-rect 495 61 529 131
-rect 581 267 615 283
-rect 667 267 701 353
-rect 667 183 701 199
-rect 753 267 787 283
-rect 615 131 753 144
-rect 581 110 787 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 35 657 69 683
-rect 35 649 69 657
-rect 260 501 294 535
-rect 164 427 198 461
-rect 418 575 452 609
-rect 110 353 144 387
-rect 35 278 69 312
-rect 720 501 754 535
-rect 624 427 658 461
-rect 507 353 541 387
-rect 667 353 701 387
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1311 836 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 836 1311
-rect 0 1271 836 1277
-rect 23 683 81 689
-rect 23 649 35 683
-rect 69 649 81 683
-rect 23 643 81 649
-rect 35 318 69 643
-rect 406 609 464 615
-rect 406 575 418 609
-rect 452 575 486 609
-rect 406 569 464 575
-rect 248 535 306 541
-rect 708 535 766 541
-rect 248 501 260 535
-rect 294 501 720 535
-rect 754 501 766 535
-rect 248 500 766 501
-rect 248 495 306 500
-rect 708 495 766 500
-rect 152 462 210 467
-rect 612 462 670 467
-rect 152 461 670 462
-rect 152 427 164 461
-rect 198 427 624 461
-rect 658 427 670 461
-rect 152 421 210 427
-rect 612 421 670 427
-rect 98 387 156 393
-rect 495 387 553 393
-rect 655 387 713 393
-rect 98 353 110 387
-rect 144 353 507 387
-rect 541 353 553 387
-rect 633 353 667 387
-rect 701 353 713 387
-rect 98 347 156 353
-rect 495 347 553 353
-rect 655 347 713 353
-rect 23 312 81 318
-rect 23 278 35 312
-rect 69 278 81 312
-rect 23 272 81 278
-rect 0 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 477 50 477 1 S
-port 1 n
-rlabel metal1 737 518 737 518 1 A
-port 2 n
-rlabel metal1 642 444 642 444 1 B
-port 3 n
-rlabel metal1 435 592 435 592 1 CO
-port 4 n
-rlabel metal1 684 370 684 370 1 CON
-port 5 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__addh_l.mag b/18T_ms/sky130_osu_sc_18T_ms__addh_l.mag
deleted file mode 100644
index 44c4f44..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__addh_l.mag
+++ /dev/null
@@ -1,396 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864599
-<< checkpaint >>
-rect -1209 -1243 2025 2575
-<< nwell >>
-rect -9 581 837 1341
-<< nmos >>
-rect 80 115 110 243
-rect 178 115 208 315
-rect 250 115 280 315
-rect 442 115 472 243
-rect 540 115 570 315
-rect 626 115 656 315
-rect 712 115 742 315
-<< pmos >>
-rect 80 887 110 1217
-rect 178 617 208 1217
-rect 264 617 294 1217
-rect 362 887 392 1217
-rect 552 617 582 1217
-rect 638 617 668 1217
-rect 710 617 740 1217
-<< ndiff >>
-rect 125 267 178 315
-rect 125 243 133 267
-rect 27 199 80 243
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 131 133 243
-rect 167 131 178 267
-rect 110 115 178 131
-rect 208 115 250 315
-rect 280 267 333 315
-rect 280 131 291 267
-rect 325 131 333 267
-rect 487 267 540 315
-rect 487 243 495 267
-rect 280 115 333 131
-rect 389 199 442 243
-rect 389 131 397 199
-rect 431 131 442 199
-rect 389 115 442 131
-rect 472 131 495 243
-rect 529 131 540 267
-rect 472 115 540 131
-rect 570 267 626 315
-rect 570 131 581 267
-rect 615 131 626 267
-rect 570 115 626 131
-rect 656 267 712 315
-rect 656 199 667 267
-rect 701 199 712 267
-rect 656 115 712 199
-rect 742 267 795 315
-rect 742 131 753 267
-rect 787 131 795 267
-rect 742 115 795 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 887 80 929
-rect 110 1201 178 1217
-rect 110 887 133 1201
-rect 125 657 133 887
-rect 167 657 178 1201
-rect 125 617 178 657
-rect 208 1201 264 1217
-rect 208 725 219 1201
-rect 253 725 264 1201
-rect 208 617 264 725
-rect 294 1201 362 1217
-rect 294 725 305 1201
-rect 339 887 362 1201
-rect 392 1201 445 1217
-rect 392 929 403 1201
-rect 437 929 445 1201
-rect 392 887 445 929
-rect 499 1201 552 1217
-rect 339 725 347 887
-rect 294 617 347 725
-rect 499 657 507 1201
-rect 541 657 552 1201
-rect 499 617 552 657
-rect 582 1201 638 1217
-rect 582 657 593 1201
-rect 627 657 638 1201
-rect 582 617 638 657
-rect 668 617 710 1217
-rect 740 1201 796 1217
-rect 740 657 751 1201
-rect 785 657 796 1201
-rect 740 617 796 657
-<< ndiffc >>
-rect 35 131 69 199
-rect 133 131 167 267
-rect 291 131 325 267
-rect 397 131 431 199
-rect 495 131 529 267
-rect 581 131 615 267
-rect 667 199 701 267
-rect 753 131 787 267
-<< pdiffc >>
-rect 35 929 69 1201
-rect 133 657 167 1201
-rect 219 725 253 1201
-rect 305 725 339 1201
-rect 403 929 437 1201
-rect 507 657 541 1201
-rect 593 657 627 1201
-rect 751 657 785 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 178 1217 208 1243
-rect 264 1217 294 1243
-rect 362 1217 392 1243
-rect 552 1217 582 1243
-rect 638 1217 668 1243
-rect 710 1217 740 1243
-rect 80 403 110 887
-rect 178 477 208 617
-rect 264 551 294 617
-rect 154 461 208 477
-rect 154 427 164 461
-rect 198 427 208 461
-rect 154 411 208 427
-rect 43 387 110 403
-rect 43 353 53 387
-rect 87 353 110 387
-rect 43 337 110 353
-rect 80 243 110 337
-rect 178 315 208 411
-rect 250 535 304 551
-rect 250 501 260 535
-rect 294 501 304 535
-rect 250 485 304 501
-rect 362 549 392 887
-rect 552 549 582 617
-rect 362 519 582 549
-rect 250 315 280 485
-rect 362 424 392 519
-rect 638 477 668 617
-rect 710 551 740 617
-rect 710 535 764 551
-rect 710 501 720 535
-rect 754 501 764 535
-rect 710 485 764 501
-rect 338 408 392 424
-rect 614 461 668 477
-rect 614 427 624 461
-rect 658 427 668 461
-rect 614 411 668 427
-rect 338 374 348 408
-rect 382 375 392 408
-rect 382 374 570 375
-rect 338 345 570 374
-rect 442 243 472 345
-rect 540 315 570 345
-rect 626 315 656 411
-rect 712 315 742 485
-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 427 198 461
-rect 53 353 87 387
-rect 260 501 294 535
-rect 720 501 754 535
-rect 624 427 658 461
-rect 348 374 382 408
-<< locali >>
-rect 0 1311 836 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 836 1311
-rect 35 1201 69 1217
-rect 35 683 69 929
-rect 133 1201 167 1271
-rect 133 641 167 657
-rect 219 1201 253 1217
-rect 219 619 253 725
-rect 305 1201 339 1271
-rect 305 709 339 725
-rect 403 1201 437 1217
-rect 219 585 362 619
-rect 260 535 294 551
-rect 260 485 294 501
-rect 148 427 164 461
-rect 198 427 214 461
-rect 328 424 362 585
-rect 403 609 437 929
-rect 507 1201 541 1217
-rect 403 575 418 609
-rect 328 408 382 424
-rect 328 392 348 408
-rect 37 353 53 387
-rect 87 353 110 387
-rect 291 374 348 392
-rect 291 358 382 374
-rect 35 199 69 278
-rect 35 115 69 131
-rect 133 267 167 283
-rect 133 61 167 131
-rect 291 267 325 358
-rect 418 312 452 575
-rect 507 607 541 657
-rect 593 1201 627 1271
-rect 593 641 627 657
-rect 751 1201 785 1217
-rect 751 607 785 657
-rect 507 573 785 607
-rect 507 387 541 573
-rect 704 501 720 535
-rect 754 501 770 535
-rect 608 427 624 461
-rect 658 427 674 461
-rect 541 353 667 387
-rect 291 115 325 131
-rect 397 277 452 312
-rect 397 199 431 277
-rect 397 115 431 131
-rect 495 267 529 283
-rect 495 61 529 131
-rect 581 267 615 283
-rect 667 267 701 353
-rect 667 183 701 199
-rect 753 267 787 283
-rect 615 131 753 144
-rect 581 110 787 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 836 61
-rect 0 0 836 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 35 649 69 683
-rect 260 501 294 535
-rect 164 427 198 461
-rect 418 575 452 609
-rect 110 353 144 387
-rect 35 278 69 312
-rect 720 501 754 535
-rect 624 427 658 461
-rect 507 353 541 387
-rect 667 353 701 387
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1311 836 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 836 1311
-rect 0 1271 836 1277
-rect 23 683 81 689
-rect 23 649 35 683
-rect 69 649 81 683
-rect 23 643 81 649
-rect 35 318 69 643
-rect 406 609 464 615
-rect 406 575 418 609
-rect 452 575 486 609
-rect 406 569 464 575
-rect 248 535 306 541
-rect 708 535 766 541
-rect 248 501 260 535
-rect 294 501 720 535
-rect 754 501 766 535
-rect 248 500 766 501
-rect 248 495 306 500
-rect 708 495 766 500
-rect 152 462 210 467
-rect 612 462 670 467
-rect 152 461 670 462
-rect 152 427 164 461
-rect 198 427 624 461
-rect 658 427 670 461
-rect 152 421 210 427
-rect 612 421 670 427
-rect 98 387 156 393
-rect 495 387 553 393
-rect 655 387 713 393
-rect 98 353 110 387
-rect 144 353 507 387
-rect 541 353 553 387
-rect 633 353 667 387
-rect 701 353 713 387
-rect 98 347 156 353
-rect 495 347 553 353
-rect 655 347 713 353
-rect 23 312 81 318
-rect 23 278 35 312
-rect 69 278 81 312
-rect 23 272 81 278
-rect 0 55 836 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 836 55
-rect 0 0 836 21
-<< labels >>
-rlabel metal1 50 477 50 477 1 S
-port 1 n
-rlabel metal1 737 518 737 518 1 A
-port 2 n
-rlabel metal1 642 444 642 444 1 B
-port 3 n
-rlabel metal1 435 592 435 592 1 CO
-port 4 n
-rlabel metal1 684 370 684 370 1 CON
-port 5 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__and2_1.mag b/18T_ms/sky130_osu_sc_18T_ms__and2_1.mag
deleted file mode 100644
index 5ea78c3..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__and2_1.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864599
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< nmos >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 193 267
-rect 227 131 252 267
-rect 182 115 252 131
-rect 282 267 335 315
-rect 282 131 293 267
-rect 327 131 335 267
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 335 1217
-rect 282 657 293 1201
-rect 327 657 335 1201
-rect 282 617 335 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 293 131 327 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 725 155 1201
-rect 207 725 241 1201
-rect 293 657 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 586 110 617
-rect 27 570 110 586
-rect 27 536 37 570
-rect 71 536 110 570
-rect 27 520 110 536
-rect 80 315 110 520
-rect 166 518 196 617
-rect 252 592 282 617
-rect 252 562 289 592
-rect 152 502 217 518
-rect 152 468 173 502
-rect 207 468 217 502
-rect 152 452 217 468
-rect 152 315 182 452
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 370 313 404
-rect 252 354 313 370
-rect 252 315 282 354
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 536 71 570
-rect 173 468 207 502
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 105 725 121 743
-rect 105 709 155 725
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 293 1201 327 1217
-rect 37 570 71 649
-rect 37 520 71 536
-rect 105 404 139 709
-rect 173 502 207 575
-rect 293 535 327 657
-rect 173 452 207 468
-rect 35 370 269 404
-rect 303 370 319 404
-rect 35 267 69 370
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 37 649 71 683
-rect 173 575 207 609
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 105 683
-rect 25 643 83 649
-rect 161 609 219 615
-rect 140 575 173 609
-rect 207 575 219 609
-rect 161 569 219 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 55 666 55 666 1 A
-port 2 n
-rlabel metal1 191 592 191 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__and2_2.mag b/18T_ms/sky130_osu_sc_18T_ms__and2_2.mag
deleted file mode 100644
index b04f251..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__and2_2.mag
+++ /dev/null
@@ -1,221 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864599
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 462 1341
-<< nmos >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 338 115 368 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 193 267
-rect 227 131 252 267
-rect 182 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 421 315
-rect 368 131 379 267
-rect 413 131 421 267
-rect 368 115 421 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 421 1217
-rect 368 657 379 1201
-rect 413 657 421 1201
-rect 368 617 421 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 293 131 327 267
-rect 379 131 413 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 725 155 1201
-rect 207 725 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 80 586 110 617
-rect 27 570 110 586
-rect 27 536 37 570
-rect 71 536 110 570
-rect 27 520 110 536
-rect 80 315 110 520
-rect 166 518 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 252 562 368 592
-rect 152 502 217 518
-rect 152 468 173 502
-rect 207 468 217 502
-rect 152 452 217 468
-rect 152 315 182 452
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 303 370 368 384
-rect 252 354 368 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 37 536 71 570
-rect 173 468 207 502
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 462 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 462 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 105 725 121 743
-rect 105 709 155 725
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 293 1201 327 1217
-rect 37 570 71 649
-rect 37 520 71 536
-rect 105 404 139 709
-rect 173 502 207 575
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 173 452 207 468
-rect 35 370 269 404
-rect 303 370 319 404
-rect 35 267 69 370
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 37 649 71 683
-rect 173 575 207 609
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 462 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 462 1311
-rect 0 1271 462 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 105 683
-rect 25 643 83 649
-rect 161 609 219 615
-rect 140 575 173 609
-rect 207 575 219 609
-rect 161 569 219 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 191 592 191 592 1 B
-port 1 n
-rlabel metal1 55 666 55 666 1 A
-port 2 n
-rlabel metal1 311 444 311 444 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__and2_4.mag b/18T_ms/sky130_osu_sc_18T_ms__and2_4.mag
deleted file mode 100644
index 7db364d..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__and2_4.mag
+++ /dev/null
@@ -1,284 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864600
-<< checkpaint >>
-rect -1209 -1243 1753 2575
-<< nwell >>
-rect -9 581 638 1341
-<< nmos >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 193 267
-rect 227 131 252 267
-rect 182 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 593 315
-rect 540 131 551 267
-rect 585 131 593 267
-rect 540 115 593 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 593 1217
-rect 540 657 551 1201
-rect 585 657 593 1201
-rect 540 617 593 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 725 155 1201
-rect 207 725 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 80 586 110 617
-rect 27 570 110 586
-rect 27 536 37 570
-rect 71 536 110 570
-rect 27 520 110 536
-rect 80 315 110 520
-rect 166 518 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 252 562 540 592
-rect 152 502 217 518
-rect 152 468 173 502
-rect 207 468 217 502
-rect 152 452 217 468
-rect 152 315 182 452
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 303 370 540 384
-rect 252 354 540 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-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 536 71 570
-rect 173 468 207 502
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 638 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 638 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 105 725 121 743
-rect 105 709 155 725
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 293 1201 327 1217
-rect 37 570 71 649
-rect 37 520 71 536
-rect 105 404 139 709
-rect 173 502 207 575
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 535 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 173 452 207 468
-rect 35 370 269 404
-rect 303 370 319 404
-rect 35 267 69 370
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 37 649 71 683
-rect 173 575 207 609
-rect 293 501 327 535
-rect 465 501 499 535
-rect 293 279 327 313
-rect 465 279 499 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 638 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 638 1311
-rect 0 1271 638 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 105 683
-rect 25 643 83 649
-rect 161 609 219 615
-rect 140 575 173 609
-rect 207 575 219 609
-rect 161 569 219 575
-rect 281 535 339 541
-rect 453 535 511 541
-rect 281 501 293 535
-rect 327 501 465 535
-rect 499 501 511 535
-rect 281 495 339 501
-rect 453 495 511 501
-rect 293 319 327 495
-rect 465 319 499 495
-rect 281 313 339 319
-rect 453 313 511 319
-rect 281 279 293 313
-rect 327 279 465 313
-rect 499 279 511 313
-rect 281 273 339 279
-rect 453 273 511 279
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 55 666 55 666 1 A
-port 2 n
-rlabel metal1 191 592 191 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__and2_6.mag b/18T_ms/sky130_osu_sc_18T_ms__and2_6.mag
deleted file mode 100644
index 67b3b64..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__and2_6.mag
+++ /dev/null
@@ -1,313 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1600380937
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 581 814 1341
-<< nmos >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 193 267
-rect 227 131 252 267
-rect 182 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 765 315
-rect 712 131 723 267
-rect 757 131 765 267
-rect 712 115 765 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 765 1217
-rect 712 657 723 1201
-rect 757 657 765 1201
-rect 712 617 765 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 725 155 1201
-rect 207 725 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 80 586 110 617
-rect 20 570 110 586
-rect 20 536 30 570
-rect 64 536 110 570
-rect 20 520 110 536
-rect 80 315 110 520
-rect 166 519 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 596 592 626 617
-rect 682 592 712 617
-rect 252 562 712 592
-rect 152 502 210 519
-rect 152 468 166 502
-rect 200 468 210 502
-rect 152 452 210 468
-rect 152 315 182 452
-rect 252 420 282 562
-rect 252 404 306 420
-rect 252 370 262 404
-rect 296 384 306 404
-rect 596 384 626 562
-rect 296 370 712 384
-rect 252 354 712 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-rect 596 315 626 354
-rect 682 315 712 354
-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 536 64 570
-rect 166 468 200 502
-rect 262 370 296 404
-<< locali >>
-rect 0 1305 814 1332
-rect 0 1271 51 1305
-rect 85 1271 187 1305
-rect 221 1271 323 1305
-rect 357 1271 459 1305
-rect 493 1271 595 1305
-rect 629 1271 814 1305
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 98 725 121 743
-rect 98 709 155 725
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 293 1201 327 1217
-rect 30 570 64 649
-rect 30 520 64 536
-rect 98 404 132 709
-rect 166 502 200 575
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 535 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 637 1201 671 1217
-rect 637 535 671 657
-rect 723 1201 757 1271
-rect 723 641 757 657
-rect 166 452 200 468
-rect 35 370 262 404
-rect 296 370 312 404
-rect 35 267 69 370
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 637 267 671 279
-rect 637 115 671 131
-rect 723 267 757 283
-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 649 64 683
-rect 166 575 200 609
-rect 293 501 327 535
-rect 465 501 499 535
-rect 637 501 671 535
-rect 293 279 327 313
-rect 465 279 499 313
-rect 637 279 671 313
-<< metal1 >>
-rect 0 1271 814 1332
-rect 18 683 76 689
-rect 18 649 30 683
-rect 64 649 98 683
-rect 18 643 76 649
-rect 154 609 212 615
-rect 132 575 166 609
-rect 200 575 212 609
-rect 154 569 212 575
-rect 281 535 339 541
-rect 453 535 511 541
-rect 625 535 683 541
-rect 281 501 293 535
-rect 327 501 465 535
-rect 499 501 637 535
-rect 671 501 683 535
-rect 281 495 339 501
-rect 453 495 511 501
-rect 625 495 683 501
-rect 293 319 327 495
-rect 465 319 499 495
-rect 637 319 671 495
-rect 281 313 339 319
-rect 453 313 511 319
-rect 625 313 683 319
-rect 281 279 293 313
-rect 327 279 465 313
-rect 499 279 637 313
-rect 671 279 683 313
-rect 281 273 339 279
-rect 453 273 511 279
-rect 625 273 683 279
-rect 0 0 814 61
-<< labels >>
-rlabel metal1 68 44 68 44 1 gnd
-rlabel metal1 68 1288 68 1288 1 vdd
-rlabel metal1 184 592 184 592 1 B
-port 1 n
-rlabel metal1 48 666 48 666 1 A
-port 2 n
-rlabel metal1 311 444 311 444 1 Y
-port 3 n
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__and2_8.mag b/18T_ms/sky130_osu_sc_18T_ms__and2_8.mag
deleted file mode 100644
index 2b2af4a..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__and2_8.mag
+++ /dev/null
@@ -1,426 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864600
-<< checkpaint >>
-rect -1209 -1243 2161 2575
-<< nwell >>
-rect -9 581 990 1341
-<< nmos >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-rect 768 115 798 315
-rect 854 115 884 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-rect 768 617 798 1217
-rect 854 617 884 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 193 267
-rect 227 131 252 267
-rect 182 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 768 315
-rect 712 131 723 267
-rect 757 131 768 267
-rect 712 115 768 131
-rect 798 267 854 315
-rect 798 131 809 267
-rect 843 131 854 267
-rect 798 115 854 131
-rect 884 267 937 315
-rect 884 131 895 267
-rect 929 131 937 267
-rect 884 115 937 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 1201 252 1217
-rect 196 725 207 1201
-rect 241 725 252 1201
-rect 196 617 252 725
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 768 1217
-rect 712 657 723 1201
-rect 757 657 768 1201
-rect 712 617 768 657
-rect 798 1201 854 1217
-rect 798 657 809 1201
-rect 843 657 854 1201
-rect 798 617 854 657
-rect 884 1201 937 1217
-rect 884 657 895 1201
-rect 929 657 937 1201
-rect 884 617 937 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-rect 809 131 843 267
-rect 895 131 929 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 725 155 1201
-rect 207 725 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-rect 809 657 843 1201
-rect 895 657 929 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 768 1217 798 1243
-rect 854 1217 884 1243
-rect 80 586 110 617
-rect 27 570 110 586
-rect 27 536 37 570
-rect 71 536 110 570
-rect 27 520 110 536
-rect 80 315 110 520
-rect 166 518 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 596 592 626 617
-rect 682 592 712 617
-rect 768 592 798 617
-rect 854 592 884 617
-rect 252 562 884 592
-rect 152 502 217 518
-rect 152 468 173 502
-rect 207 468 217 502
-rect 152 452 217 468
-rect 152 315 182 452
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 596 384 626 562
-rect 303 370 884 384
-rect 252 354 884 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-rect 596 315 626 354
-rect 682 315 712 354
-rect 768 315 798 354
-rect 854 315 884 354
-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 536 71 570
-rect 173 468 207 502
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 990 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 990 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 105 725 121 743
-rect 105 709 155 725
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 293 1201 327 1217
-rect 37 570 71 649
-rect 37 520 71 536
-rect 105 404 139 709
-rect 173 502 207 575
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 535 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 637 1201 671 1217
-rect 637 535 671 657
-rect 723 1201 757 1271
-rect 723 641 757 657
-rect 809 1201 843 1217
-rect 809 535 843 657
-rect 895 1201 929 1271
-rect 895 641 929 657
-rect 173 452 207 468
-rect 35 370 269 404
-rect 303 370 319 404
-rect 35 267 69 370
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 637 267 671 279
-rect 637 115 671 131
-rect 723 267 757 283
-rect 723 61 757 131
-rect 809 267 843 279
-rect 809 115 843 131
-rect 895 267 929 283
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 37 649 71 683
-rect 173 575 207 609
-rect 293 501 327 535
-rect 465 501 499 535
-rect 637 501 671 535
-rect 809 501 843 535
-rect 293 279 327 313
-rect 465 279 499 313
-rect 637 279 671 313
-rect 809 279 843 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1311 990 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 990 1311
-rect 0 1271 990 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 105 683
-rect 25 643 83 649
-rect 161 609 219 615
-rect 140 575 173 609
-rect 207 575 219 609
-rect 161 569 219 575
-rect 281 535 339 541
-rect 453 535 511 541
-rect 625 535 683 541
-rect 797 535 855 541
-rect 281 501 293 535
-rect 327 501 465 535
-rect 499 501 637 535
-rect 671 501 809 535
-rect 843 501 855 535
-rect 281 495 339 501
-rect 453 495 511 501
-rect 625 495 683 501
-rect 797 495 855 501
-rect 293 319 327 495
-rect 465 319 499 495
-rect 637 319 671 495
-rect 809 319 843 495
-rect 281 313 339 319
-rect 453 313 511 319
-rect 625 313 683 319
-rect 797 313 855 319
-rect 281 279 293 313
-rect 327 279 465 313
-rect 499 279 637 313
-rect 671 279 683 313
-rect 712 279 809 313
-rect 843 279 855 313
-rect 281 273 339 279
-rect 453 273 511 279
-rect 625 273 683 279
-rect 797 273 855 279
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 191 592 191 592 1 B
-port 1 n
-rlabel metal1 55 666 55 666 1 A
-port 2 n
-rlabel metal1 311 444 311 444 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__and2_l.mag b/18T_ms/sky130_osu_sc_18T_ms__and2_l.mag
deleted file mode 100644
index 802acc1..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__and2_l.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864600
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< nmos >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-<< pmos >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 252 817 282 1217
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 115 152 263
-rect 182 199 252 263
-rect 182 131 193 199
-rect 227 131 252 199
-rect 182 115 252 131
-rect 282 199 335 263
-rect 282 131 293 199
-rect 327 131 335 199
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 817 166 861
-rect 196 1201 252 1217
-rect 196 861 207 1201
-rect 241 861 252 1201
-rect 196 817 252 861
-rect 282 1201 335 1217
-rect 282 861 293 1201
-rect 327 861 335 1201
-rect 282 817 335 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 193 131 227 199
-rect 293 131 327 199
-<< pdiffc >>
-rect 35 861 69 1201
-rect 121 861 155 1201
-rect 207 861 241 1201
-rect 293 861 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 586 110 817
-rect 27 570 110 586
-rect 27 536 37 570
-rect 71 536 110 570
-rect 27 520 110 536
-rect 80 263 110 520
-rect 166 518 196 817
-rect 252 592 282 817
-rect 252 562 289 592
-rect 152 502 217 518
-rect 152 468 173 502
-rect 207 468 217 502
-rect 152 452 217 468
-rect 152 263 182 452
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 370 313 404
-rect 252 354 313 370
-rect 252 263 282 354
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 536 71 570
-rect 173 468 207 502
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1271
-rect 121 1201 155 1217
-rect 35 845 69 861
-rect 105 861 121 879
-rect 105 845 155 861
-rect 207 1201 241 1271
-rect 207 845 241 861
-rect 293 1201 327 1217
-rect 37 570 71 649
-rect 37 520 71 536
-rect 105 404 139 845
-rect 173 502 207 575
-rect 293 535 327 861
-rect 173 452 207 468
-rect 35 370 269 404
-rect 303 370 319 404
-rect 35 199 69 370
-rect 35 115 69 131
-rect 193 199 227 215
-rect 193 61 227 131
-rect 293 199 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 37 649 71 683
-rect 173 575 207 609
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 105 683
-rect 25 643 83 649
-rect 161 609 219 615
-rect 140 575 173 609
-rect 207 575 219 609
-rect 161 569 219 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 55 666 55 666 1 A
-port 2 n
-rlabel metal1 191 592 191 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__ant.mag b/18T_ms/sky130_osu_sc_18T_ms__ant.mag
deleted file mode 100644
index 833fc06..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__ant.mag
+++ /dev/null
@@ -1,101 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864601
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< nmos >>
-rect 80 115 110 315
-<< pmos >>
-rect 80 617 110 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 657 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 551 110 617
-rect 35 535 110 551
-rect 35 501 47 535
-rect 81 501 110 535
-rect 35 485 110 501
-rect 80 315 110 485
-rect 80 89 110 115
-<< polycont >>
-rect 47 501 81 535
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1217
-rect 35 535 69 657
-rect 121 1201 155 1271
-rect 121 641 155 657
-rect 31 501 47 535
-rect 81 501 97 535
-rect 35 417 69 501
-rect 35 383 155 417
-rect 35 267 69 383
-rect 35 115 69 131
-rect 121 267 155 383
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 47 501 81 535
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 35 535 108 541
-rect 35 501 47 535
-rect 81 501 108 535
-rect 35 495 108 501
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 64 518 64 518 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__antfill.mag b/18T_ms/sky130_osu_sc_18T_ms__antfill.mag
deleted file mode 100644
index 288b81a..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__antfill.mag
+++ /dev/null
@@ -1,58 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864600
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 535 69 1217
-rect 121 641 155 1271
-rect 31 501 47 535
-rect 81 501 97 535
-rect 35 417 69 501
-rect 35 383 155 417
-rect 35 115 69 383
-rect 121 115 155 383
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 47 501 81 535
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 35 535 108 541
-rect 35 501 47 535
-rect 81 501 108 535
-rect 35 495 108 501
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 64 518 64 518 1 A
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__aoi21_l.mag b/18T_ms/sky130_osu_sc_18T_ms__aoi21_l.mag
deleted file mode 100644
index f3e7b23..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__aoi21_l.mag
+++ /dev/null
@@ -1,197 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864601
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< nmos >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 250 115 280 263
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 235 315
-rect 182 131 193 267
-rect 227 263 235 267
-rect 227 131 250 263
-rect 182 115 250 131
-rect 280 199 333 263
-rect 280 131 291 199
-rect 325 131 333 199
-rect 280 115 333 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 617 166 861
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1201 335 1217
-rect 282 725 293 1201
-rect 327 725 335 1201
-rect 282 617 335 725
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-rect 291 131 325 199
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 861 155 1201
-rect 207 793 241 1201
-rect 293 725 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 580 110 617
-rect 44 570 110 580
-rect 44 536 60 570
-rect 94 536 110 570
-rect 44 526 110 536
-rect 44 370 74 526
-rect 166 484 196 617
-rect 252 579 282 617
-rect 252 549 309 579
-rect 134 468 196 484
-rect 134 434 146 468
-rect 180 434 196 468
-rect 134 418 196 434
-rect 44 338 110 370
-rect 80 315 110 338
-rect 152 315 182 418
-rect 279 405 309 549
-rect 279 389 333 405
-rect 279 371 289 389
-rect 250 355 289 371
-rect 323 355 333 389
-rect 250 339 333 355
-rect 250 263 280 339
-rect 80 89 110 115
-rect 152 89 182 115
-rect 250 89 280 115
-<< polycont >>
-rect 60 536 94 570
-rect 146 434 180 468
-rect 289 355 323 389
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 207 1201 241 1217
-rect 69 793 207 811
-rect 35 777 241 793
-rect 293 1201 327 1217
-rect 60 570 94 649
-rect 60 520 94 536
-rect 128 484 162 575
-rect 128 468 180 484
-rect 128 434 146 468
-rect 128 418 180 434
-rect 216 389 250 501
-rect 293 461 327 725
-rect 216 355 289 389
-rect 323 355 339 389
-rect 35 267 69 283
-rect 35 61 69 131
-rect 193 267 227 279
-rect 193 115 227 131
-rect 291 199 325 215
-rect 291 61 325 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 60 649 94 683
-rect 128 575 162 609
-rect 216 501 250 535
-rect 293 427 327 461
-rect 193 279 227 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 48 683 106 689
-rect 48 649 60 683
-rect 94 649 128 683
-rect 48 643 106 649
-rect 116 609 174 615
-rect 116 575 128 609
-rect 162 575 196 609
-rect 116 569 174 575
-rect 204 535 262 541
-rect 182 501 216 535
-rect 250 501 262 535
-rect 204 495 262 501
-rect 281 461 339 467
-rect 281 427 293 461
-rect 327 427 339 461
-rect 281 421 339 427
-rect 181 313 239 319
-rect 293 313 327 421
-rect 181 279 193 313
-rect 227 279 327 313
-rect 181 273 239 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 77 666 77 666 1 A0
-port 1 n
-rlabel metal1 233 518 233 518 1 B0
-port 2 n
-rlabel metal1 310 414 310 414 1 Y
-port 3 n
-rlabel metal1 145 592 145 592 1 A1
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__aoi22_l.mag b/18T_ms/sky130_osu_sc_18T_ms__aoi22_l.mag
deleted file mode 100644
index e8f3868..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__aoi22_l.mag
+++ /dev/null
@@ -1,238 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864601
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 462 1341
-<< nmos >>
-rect 80 115 110 315
-rect 152 115 182 315
-rect 252 115 282 315
-rect 324 115 354 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 252 315
-rect 182 131 200 267
-rect 234 131 252 267
-rect 182 115 252 131
-rect 282 115 324 315
-rect 354 267 407 315
-rect 354 131 365 267
-rect 399 131 407 267
-rect 354 115 407 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 617 166 861
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1133 338 1217
-rect 282 793 293 1133
-rect 327 793 338 1133
-rect 282 617 338 793
-rect 368 1201 421 1217
-rect 368 793 379 1201
-rect 413 793 421 1201
-rect 368 617 421 793
-<< ndiffc >>
-rect 35 131 69 267
-rect 200 131 234 267
-rect 365 131 399 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 861 155 1201
-rect 207 793 241 1201
-rect 293 793 327 1133
-rect 379 793 413 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1243
-rect 80 580 110 617
-rect 44 570 110 580
-rect 44 536 60 570
-rect 94 536 110 570
-rect 44 526 110 536
-rect 44 370 74 526
-rect 166 514 196 617
-rect 152 484 196 514
-rect 116 468 182 484
-rect 116 434 128 468
-rect 162 434 182 468
-rect 116 418 182 434
-rect 44 338 110 370
-rect 80 315 110 338
-rect 152 315 182 418
-rect 252 413 282 617
-rect 338 478 368 617
-rect 338 462 416 478
-rect 338 434 370 462
-rect 224 397 282 413
-rect 224 363 234 397
-rect 268 363 282 397
-rect 224 347 282 363
-rect 252 315 282 347
-rect 324 428 370 434
-rect 404 428 416 462
-rect 324 412 416 428
-rect 324 404 368 412
-rect 324 315 354 404
-rect 80 89 110 115
-rect 152 89 182 115
-rect 252 89 282 115
-rect 324 89 354 115
-<< polycont >>
-rect 60 536 94 570
-rect 128 434 162 468
-rect 234 363 268 397
-rect 370 428 404 462
-<< locali >>
-rect 0 1311 462 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 462 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 207 1201 413 1217
-rect 69 793 207 811
-rect 241 1183 379 1201
-rect 35 777 241 793
-rect 293 1133 327 1149
-rect 60 570 94 649
-rect 293 666 327 793
-rect 379 777 413 793
-rect 293 632 336 666
-rect 60 520 94 536
-rect 128 468 162 575
-rect 128 418 162 434
-rect 216 413 250 501
-rect 216 397 268 413
-rect 216 363 234 397
-rect 234 347 268 363
-rect 302 387 336 632
-rect 370 462 404 478
-rect 370 412 404 428
-rect 35 267 69 283
-rect 35 61 69 131
-rect 200 267 234 279
-rect 200 115 234 131
-rect 365 267 399 283
-rect 365 61 399 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 60 649 94 683
-rect 128 575 162 609
-rect 216 501 250 535
-rect 370 428 404 462
-rect 302 353 336 387
-rect 200 279 234 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 462 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 462 1311
-rect 0 1271 462 1277
-rect 48 683 106 689
-rect 48 649 60 683
-rect 94 649 128 683
-rect 48 643 106 649
-rect 116 609 174 615
-rect 116 575 128 609
-rect 162 575 196 609
-rect 116 569 174 575
-rect 204 535 262 541
-rect 182 501 216 535
-rect 250 501 262 535
-rect 204 495 262 501
-rect 358 462 416 468
-rect 336 428 370 462
-rect 404 428 416 462
-rect 358 422 416 428
-rect 290 387 348 393
-rect 290 353 302 387
-rect 336 353 348 387
-rect 290 347 348 353
-rect 188 313 246 319
-rect 304 313 338 347
-rect 188 279 200 313
-rect 234 279 338 313
-rect 188 273 246 279
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel viali 77 666 77 666 1 A0
-port 1 n
-rlabel metal1 233 518 233 518 1 B0
-port 2 n
-rlabel viali 145 592 145 592 1 A1
-port 4 n
-rlabel viali 387 445 387 445 1 B1
-rlabel metal1 321 340 321 340 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__buf_1.mag b/18T_ms/sky130_osu_sc_18T_ms__buf_1.mag
deleted file mode 100644
index 6684382..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__buf_1.mag
+++ /dev/null
@@ -1,156 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864601
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 288 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 249 315
-rect 196 131 207 267
-rect 241 131 249 267
-rect 196 115 249 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 249 1217
-rect 196 657 207 1201
-rect 241 657 249 1201
-rect 196 617 249 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 207 657 241 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 80 529 110 617
-rect 166 602 196 617
-rect 166 572 251 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 315 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 370 251 404
-rect 166 354 251 370
-rect 166 315 196 354
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 110 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 404 69 657
-rect 110 513 144 649
-rect 207 609 241 657
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 267 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 207 267 241 279
-rect 207 115 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 110 649 144 683
-rect 207 575 241 609
-rect 207 279 241 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 195 575 207 609
-rect 241 575 253 609
-rect 195 569 253 575
-rect 207 319 241 569
-rect 195 313 253 319
-rect 195 279 207 313
-rect 241 279 253 313
-rect 195 273 253 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 213 455 213 455 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__buf_2.mag b/18T_ms/sky130_osu_sc_18T_ms__buf_2.mag
deleted file mode 100644
index bec4219..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__buf_2.mag
+++ /dev/null
@@ -1,177 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864601
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 376 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 335 315
-rect 282 131 293 267
-rect 327 131 335 267
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 335 1217
-rect 282 657 293 1201
-rect 327 657 335 1201
-rect 282 617 335 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1244
-rect 80 529 110 617
-rect 166 602 196 617
-rect 252 602 282 617
-rect 166 572 282 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 315 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 384 251 404
-rect 210 370 282 384
-rect 166 354 282 370
-rect 166 315 196 354
-rect 252 315 282 354
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 110 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 404 69 657
-rect 110 513 144 649
-rect 207 609 241 657
-rect 293 1201 327 1271
-rect 293 641 327 657
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 267 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 207 267 241 279
-rect 207 115 241 131
-rect 293 267 327 283
-rect 293 61 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 110 649 144 683
-rect 207 575 241 609
-rect 207 279 241 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 195 575 207 609
-rect 241 575 253 609
-rect 195 569 253 575
-rect 207 319 241 569
-rect 195 313 253 319
-rect 195 279 207 313
-rect 241 279 253 313
-rect 195 273 253 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 211 454 211 454 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__buf_4.mag b/18T_ms/sky130_osu_sc_18T_ms__buf_4.mag
deleted file mode 100644
index 81c44f6..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__buf_4.mag
+++ /dev/null
@@ -1,242 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864601
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 552 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 507 315
-rect 454 131 465 267
-rect 499 131 507 267
-rect 454 115 507 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 507 1217
-rect 454 657 465 1201
-rect 499 657 507 1201
-rect 454 617 507 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1244
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 80 529 110 617
-rect 166 602 196 617
-rect 252 602 282 617
-rect 338 602 368 617
-rect 424 602 454 617
-rect 166 572 454 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 315 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 384 251 404
-rect 210 370 454 384
-rect 166 354 454 370
-rect 166 315 196 354
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-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 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1311 550 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 550 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 404 69 657
-rect 110 513 144 649
-rect 207 609 241 657
-rect 293 1201 327 1271
-rect 293 641 327 657
-rect 379 1201 413 1217
-rect 379 609 413 657
-rect 465 1201 499 1271
-rect 465 641 499 657
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 267 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 267 155 283
-rect 35 61 69 62
-rect 121 61 155 131
-rect 207 267 241 279
-rect 207 115 241 131
-rect 293 267 327 283
-rect 207 61 241 62
-rect 293 61 327 131
-rect 379 267 413 279
-rect 379 115 413 131
-rect 465 267 499 283
-rect 465 61 499 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 110 649 144 683
-rect 207 575 241 609
-rect 379 575 413 609
-rect 207 279 241 313
-rect 379 279 413 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 550 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 550 1311
-rect 0 1271 550 1277
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 367 609 425 615
-rect 195 575 207 609
-rect 241 575 379 609
-rect 413 575 425 609
-rect 195 569 253 575
-rect 367 569 425 575
-rect 207 319 241 569
-rect 379 319 413 569
-rect 195 313 253 319
-rect 367 313 425 319
-rect 195 279 207 313
-rect 241 279 379 313
-rect 413 279 425 313
-rect 195 273 253 279
-rect 367 273 425 279
-rect 0 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 211 454 211 454 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__buf_6.mag b/18T_ms/sky130_osu_sc_18T_ms__buf_6.mag
deleted file mode 100644
index 721bbbf..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__buf_6.mag
+++ /dev/null
@@ -1,284 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598479240
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 581 728 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 679 315
-rect 626 131 637 267
-rect 671 131 679 267
-rect 626 115 679 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 679 1217
-rect 626 657 637 1201
-rect 671 657 679 1201
-rect 626 617 679 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1244
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 80 529 110 617
-rect 166 602 196 617
-rect 252 602 282 617
-rect 338 602 368 617
-rect 424 602 454 617
-rect 510 602 540 617
-rect 596 602 626 617
-rect 166 572 626 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 315 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 384 251 404
-rect 510 384 540 572
-rect 210 370 626 384
-rect 166 354 626 370
-rect 166 315 196 354
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-rect 596 315 626 354
-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 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1305 726 1332
-rect 0 1271 51 1305
-rect 85 1271 187 1305
-rect 221 1271 323 1305
-rect 357 1271 459 1305
-rect 493 1271 595 1305
-rect 629 1271 726 1305
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 404 69 657
-rect 110 513 144 649
-rect 207 609 241 657
-rect 293 1201 327 1271
-rect 293 641 327 657
-rect 379 1201 413 1217
-rect 379 609 413 657
-rect 465 1201 499 1271
-rect 465 641 499 657
-rect 551 1201 585 1217
-rect 551 609 585 657
-rect 637 1201 671 1271
-rect 637 641 671 657
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 267 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 207 267 241 279
-rect 207 115 241 131
-rect 293 267 327 283
-rect 293 61 327 131
-rect 379 267 413 279
-rect 379 115 413 131
-rect 465 267 499 283
-rect 465 61 499 131
-rect 551 267 585 279
-rect 551 115 585 131
-rect 637 267 671 283
-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 649 144 683
-rect 207 575 241 609
-rect 379 575 413 609
-rect 551 575 585 609
-rect 207 279 241 313
-rect 379 279 413 313
-rect 551 279 585 313
-<< metal1 >>
-rect 0 1271 726 1332
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 367 609 425 615
-rect 539 609 597 615
-rect 195 575 207 609
-rect 241 575 379 609
-rect 413 575 551 609
-rect 585 575 597 609
-rect 195 569 253 575
-rect 367 569 425 575
-rect 539 569 597 575
-rect 207 319 241 569
-rect 379 319 413 569
-rect 551 319 585 569
-rect 195 313 253 319
-rect 367 313 425 319
-rect 539 313 597 319
-rect 195 279 207 313
-rect 241 279 379 313
-rect 413 279 551 313
-rect 585 279 597 313
-rect 195 273 253 279
-rect 367 273 425 279
-rect 539 273 597 279
-rect 0 0 726 61
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 211 454 211 454 1 Y
-port 2 n
-rlabel metal1 68 44 68 44 1 gnd
-rlabel metal1 68 1288 68 1288 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__buf_8.mag b/18T_ms/sky130_osu_sc_18T_ms__buf_8.mag
deleted file mode 100644
index 8d1552b..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__buf_8.mag
+++ /dev/null
@@ -1,381 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864602
-<< checkpaint >>
-rect -1209 -1243 2025 2575
-<< nwell >>
-rect -9 581 904 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-rect 768 115 798 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-rect 768 617 798 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 768 315
-rect 712 131 723 267
-rect 757 131 768 267
-rect 712 115 768 131
-rect 798 267 851 315
-rect 798 131 809 267
-rect 843 131 851 267
-rect 798 115 851 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 768 1217
-rect 712 657 723 1201
-rect 757 657 768 1201
-rect 712 617 768 657
-rect 798 1201 851 1217
-rect 798 657 809 1201
-rect 843 657 851 1201
-rect 798 617 851 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-rect 809 131 843 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-rect 809 657 843 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1244
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 768 1217 798 1243
-rect 80 529 110 617
-rect 166 602 196 617
-rect 252 602 282 617
-rect 338 602 368 617
-rect 424 602 454 617
-rect 510 602 540 617
-rect 596 602 626 617
-rect 682 602 712 617
-rect 768 602 798 617
-rect 166 572 798 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 315 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 384 251 404
-rect 510 384 540 572
-rect 210 370 798 384
-rect 166 354 798 370
-rect 166 315 196 354
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-rect 596 315 626 354
-rect 682 315 712 354
-rect 768 315 798 354
-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 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1311 902 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 902 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 207 1201 241 1217
-rect 35 404 69 657
-rect 110 513 144 649
-rect 207 609 241 657
-rect 293 1201 327 1271
-rect 293 641 327 657
-rect 379 1201 413 1217
-rect 379 609 413 657
-rect 465 1201 499 1271
-rect 465 641 499 657
-rect 551 1201 585 1217
-rect 551 609 585 657
-rect 637 1201 671 1271
-rect 637 641 671 657
-rect 723 1201 757 1217
-rect 723 609 757 657
-rect 809 1201 843 1271
-rect 809 641 843 657
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 267 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 207 267 241 279
-rect 207 115 241 131
-rect 293 267 327 283
-rect 293 61 327 131
-rect 379 267 413 279
-rect 379 115 413 131
-rect 465 267 499 283
-rect 465 61 499 131
-rect 551 267 585 279
-rect 551 115 585 131
-rect 637 267 671 283
-rect 637 61 671 131
-rect 723 267 757 279
-rect 723 115 757 131
-rect 809 267 843 283
-rect 809 61 843 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 902 61
-rect 0 0 902 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 110 649 144 683
-rect 207 575 241 609
-rect 379 575 413 609
-rect 551 575 585 609
-rect 723 575 757 609
-rect 207 279 241 313
-rect 379 279 413 313
-rect 551 279 585 313
-rect 723 279 757 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-<< metal1 >>
-rect 0 1311 902 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 902 1311
-rect 0 1271 902 1277
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 367 609 425 615
-rect 539 609 597 615
-rect 711 609 769 615
-rect 195 575 207 609
-rect 241 575 379 609
-rect 413 575 551 609
-rect 585 575 723 609
-rect 757 575 769 609
-rect 195 569 253 575
-rect 367 569 425 575
-rect 539 569 597 575
-rect 711 569 769 575
-rect 207 319 241 569
-rect 379 319 413 569
-rect 551 319 585 569
-rect 723 319 757 569
-rect 195 313 253 319
-rect 367 313 425 319
-rect 539 313 597 319
-rect 711 313 769 319
-rect 195 279 207 313
-rect 241 279 379 313
-rect 413 279 551 313
-rect 585 279 723 313
-rect 757 279 769 313
-rect 195 273 253 279
-rect 367 273 425 279
-rect 539 273 597 279
-rect 711 273 769 279
-rect 0 55 902 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 902 55
-rect 0 0 902 21
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 211 454 211 454 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__buf_l.mag b/18T_ms/sky130_osu_sc_18T_ms__buf_l.mag
deleted file mode 100644
index 460a04a..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__buf_l.mag
+++ /dev/null
@@ -1,156 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864602
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 288 1341
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-<< pmos >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 166 263
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 199 249 263
-rect 196 131 207 199
-rect 241 131 249 199
-rect 196 115 249 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 817 166 861
-rect 196 1201 249 1217
-rect 196 861 207 1201
-rect 241 861 249 1201
-rect 196 817 249 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-rect 207 131 241 199
-<< pdiffc >>
-rect 35 861 69 1201
-rect 121 861 155 1201
-rect 207 861 241 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 80 529 110 817
-rect 166 602 196 817
-rect 166 572 251 602
-rect 80 513 154 529
-rect 80 479 110 513
-rect 144 479 154 513
-rect 80 463 154 479
-rect 80 263 110 463
-rect 221 420 251 572
-rect 166 404 251 420
-rect 166 370 176 404
-rect 210 370 251 404
-rect 166 354 251 370
-rect 166 263 196 354
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 110 479 144 513
-rect 176 370 210 404
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1217
-rect 35 404 69 861
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 207 1201 241 1217
-rect 110 513 144 649
-rect 207 609 241 861
-rect 110 463 144 479
-rect 176 404 210 420
-rect 35 370 176 404
-rect 35 199 69 370
-rect 176 354 210 370
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 207 199 241 279
-rect 207 115 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 110 649 144 683
-rect 207 575 241 609
-rect 207 279 241 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 98 683 156 689
-rect 64 649 110 683
-rect 144 649 156 683
-rect 98 643 156 649
-rect 195 609 253 615
-rect 195 575 207 609
-rect 241 575 253 609
-rect 195 569 253 575
-rect 207 319 241 569
-rect 195 313 253 319
-rect 195 279 207 313
-rect 241 279 253 313
-rect 195 273 253 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 127 666 127 666 1 A
-port 1 n
-rlabel metal1 214 452 214 452 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__decap_1.mag b/18T_ms/sky130_osu_sc_18T_ms__decap_1.mag
deleted file mode 100644
index 842e5d6..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__decap_1.mag
+++ /dev/null
@@ -1,83 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864602
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< nmos >>
-rect 80 115 110 451
-<< pmos >>
-rect 80 817 110 1217
-<< ndiff >>
-rect 27 403 80 451
-rect 27 131 35 403
-rect 69 131 80 403
-rect 27 115 80 131
-rect 110 403 163 451
-rect 110 131 121 403
-rect 155 131 163 403
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 1201 163 1217
-rect 110 861 121 1201
-rect 155 861 163 1201
-rect 110 817 163 861
-<< ndiffc >>
-rect 35 131 69 403
-rect 121 131 155 403
-<< pdiffc >>
-rect 35 861 69 1201
-rect 121 861 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 451 110 817
-rect 80 80 110 115
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 845 69 861
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 35 403 69 419
-rect 35 61 69 131
-rect 121 403 155 419
-rect 121 61 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__decap_l.mag b/18T_ms/sky130_osu_sc_18T_ms__decap_l.mag
deleted file mode 100644
index 8c5f887..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__decap_l.mag
+++ /dev/null
@@ -1,83 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864602
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< nmos >>
-rect 80 115 110 315
-<< pmos >>
-rect 80 1017 110 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 1065 35 1201
-rect 69 1065 80 1201
-rect 27 1017 80 1065
-rect 110 1201 163 1217
-rect 110 1065 121 1201
-rect 155 1065 163 1201
-rect 110 1017 163 1065
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-<< pdiffc >>
-rect 35 1065 69 1201
-rect 121 1065 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 315 110 1017
-rect 80 80 110 115
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 1049 69 1065
-rect 121 1201 155 1271
-rect 121 1049 155 1065
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__dff_1.mag b/18T_ms/sky130_osu_sc_18T_ms__dff_1.mag
deleted file mode 100644
index 78cb4cc..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__dff_1.mag
+++ /dev/null
@@ -1,634 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864603
-<< checkpaint >>
-rect -1209 -1243 2569 2575
-<< nwell >>
-rect -9 581 1456 1341
-<< nmos >>
-rect 85 115 115 315
-rect 171 115 201 315
-rect 243 115 273 315
-rect 363 115 393 315
-rect 435 115 465 315
-rect 521 115 551 315
-rect 593 115 623 315
-rect 713 115 743 315
-rect 785 115 815 315
-rect 871 115 901 315
-rect 1061 115 1091 315
-rect 1251 115 1281 315
-rect 1337 115 1367 315
-<< pmos >>
-rect 85 617 115 1217
-rect 171 617 201 1217
-rect 243 617 273 1217
-rect 363 617 393 1217
-rect 435 617 465 1217
-rect 521 617 551 1217
-rect 593 617 623 1217
-rect 713 617 743 1217
-rect 785 617 815 1217
-rect 871 617 901 1217
-rect 1061 617 1091 1217
-rect 1251 617 1281 1217
-rect 1337 617 1367 1217
-<< ndiff >>
-rect 32 267 85 315
-rect 32 131 40 267
-rect 74 131 85 267
-rect 32 115 85 131
-rect 115 267 171 315
-rect 115 131 126 267
-rect 160 131 171 267
-rect 115 115 171 131
-rect 201 115 243 315
-rect 273 267 363 315
-rect 273 131 284 267
-rect 352 131 363 267
-rect 273 115 363 131
-rect 393 115 435 315
-rect 465 199 521 315
-rect 465 131 476 199
-rect 510 131 521 199
-rect 465 115 521 131
-rect 551 115 593 315
-rect 623 267 713 315
-rect 623 131 634 267
-rect 702 131 713 267
-rect 623 115 713 131
-rect 743 115 785 315
-rect 815 267 871 315
-rect 815 131 826 267
-rect 860 131 871 267
-rect 815 115 871 131
-rect 901 267 954 315
-rect 901 131 912 267
-rect 946 131 954 267
-rect 901 115 954 131
-rect 1008 267 1061 315
-rect 1008 131 1016 267
-rect 1050 131 1061 267
-rect 1008 115 1061 131
-rect 1091 267 1144 315
-rect 1091 131 1102 267
-rect 1136 131 1144 267
-rect 1091 115 1144 131
-rect 1198 267 1251 315
-rect 1198 131 1206 267
-rect 1240 131 1251 267
-rect 1198 115 1251 131
-rect 1281 267 1337 315
-rect 1281 131 1292 267
-rect 1326 131 1337 267
-rect 1281 115 1337 131
-rect 1367 267 1420 315
-rect 1367 131 1378 267
-rect 1412 131 1420 267
-rect 1367 115 1420 131
-<< pdiff >>
-rect 32 1201 85 1217
-rect 32 657 40 1201
-rect 74 657 85 1201
-rect 32 617 85 657
-rect 115 1201 171 1217
-rect 115 725 126 1201
-rect 160 725 171 1201
-rect 115 617 171 725
-rect 201 617 243 1217
-rect 273 1201 363 1217
-rect 273 657 284 1201
-rect 352 657 363 1201
-rect 273 617 363 657
-rect 393 617 435 1217
-rect 465 1201 521 1217
-rect 465 725 476 1201
-rect 510 725 521 1201
-rect 465 617 521 725
-rect 551 617 593 1217
-rect 623 1201 713 1217
-rect 623 657 634 1201
-rect 702 657 713 1201
-rect 623 617 713 657
-rect 743 617 785 1217
-rect 815 1201 871 1217
-rect 815 657 826 1201
-rect 860 657 871 1201
-rect 815 617 871 657
-rect 901 1201 954 1217
-rect 901 657 912 1201
-rect 946 657 954 1201
-rect 901 617 954 657
-rect 1008 1201 1061 1217
-rect 1008 725 1016 1201
-rect 1050 725 1061 1201
-rect 1008 617 1061 725
-rect 1091 1201 1144 1217
-rect 1091 657 1102 1201
-rect 1136 657 1144 1201
-rect 1091 617 1144 657
-rect 1198 1201 1251 1217
-rect 1198 657 1206 1201
-rect 1240 657 1251 1201
-rect 1198 617 1251 657
-rect 1281 1201 1337 1217
-rect 1281 657 1292 1201
-rect 1326 657 1337 1201
-rect 1281 617 1337 657
-rect 1367 1201 1420 1217
-rect 1367 657 1378 1201
-rect 1412 657 1420 1201
-rect 1367 617 1420 657
-<< ndiffc >>
-rect 40 131 74 267
-rect 126 131 160 267
-rect 284 131 352 267
-rect 476 131 510 199
-rect 634 131 702 267
-rect 826 131 860 267
-rect 912 131 946 267
-rect 1016 131 1050 267
-rect 1102 131 1136 267
-rect 1206 131 1240 267
-rect 1292 131 1326 267
-rect 1378 131 1412 267
-<< pdiffc >>
-rect 40 657 74 1201
-rect 126 725 160 1201
-rect 284 657 352 1201
-rect 476 725 510 1201
-rect 634 657 702 1201
-rect 826 657 860 1201
-rect 912 657 946 1201
-rect 1016 725 1050 1201
-rect 1102 657 1136 1201
-rect 1206 657 1240 1201
-rect 1292 657 1326 1201
-rect 1378 657 1412 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-rect 979 1271 1003 1305
-rect 1037 1271 1061 1305
-rect 1115 1271 1139 1305
-rect 1173 1271 1197 1305
-rect 1251 1271 1275 1305
-rect 1309 1271 1333 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-rect 1003 1271 1037 1305
-rect 1139 1271 1173 1305
-rect 1275 1271 1309 1305
-<< poly >>
-rect 85 1217 115 1243
-rect 171 1217 201 1243
-rect 243 1217 273 1243
-rect 363 1217 393 1243
-rect 435 1217 465 1243
-rect 521 1217 551 1243
-rect 593 1217 623 1243
-rect 713 1217 743 1243
-rect 785 1217 815 1243
-rect 871 1217 901 1243
-rect 1061 1217 1091 1243
-rect 1251 1217 1281 1243
-rect 1337 1217 1367 1243
-rect 85 586 115 617
-rect 75 570 129 586
-rect 75 536 85 570
-rect 119 536 129 570
-rect 75 520 129 536
-rect 75 374 105 520
-rect 171 477 201 617
-rect 243 586 273 617
-rect 243 570 297 586
-rect 243 536 253 570
-rect 287 536 297 570
-rect 243 520 297 536
-rect 171 461 225 477
-rect 363 475 393 617
-rect 435 580 465 617
-rect 521 580 551 617
-rect 435 570 551 580
-rect 435 536 467 570
-rect 501 536 551 570
-rect 435 526 551 536
-rect 593 475 623 617
-rect 713 586 743 617
-rect 689 570 743 586
-rect 689 536 699 570
-rect 733 536 743 570
-rect 689 520 743 536
-rect 171 427 181 461
-rect 215 427 225 461
-rect 171 411 225 427
-rect 267 445 719 475
-rect 75 344 115 374
-rect 85 315 115 344
-rect 171 315 201 411
-rect 267 367 297 445
-rect 689 403 719 445
-rect 785 471 815 617
-rect 871 586 901 617
-rect 871 570 942 586
-rect 871 556 898 570
-rect 882 536 898 556
-rect 932 536 942 570
-rect 882 520 942 536
-rect 785 455 839 471
-rect 785 421 795 455
-rect 829 421 839 455
-rect 785 405 839 421
-rect 243 337 297 367
-rect 339 387 393 403
-rect 339 353 349 387
-rect 383 353 393 387
-rect 339 337 393 353
-rect 243 315 273 337
-rect 363 315 393 337
-rect 435 387 551 397
-rect 435 353 467 387
-rect 501 353 551 387
-rect 435 343 551 353
-rect 435 315 465 343
-rect 521 315 551 343
-rect 593 387 647 403
-rect 593 353 603 387
-rect 637 353 647 387
-rect 593 337 647 353
-rect 689 387 743 403
-rect 689 353 699 387
-rect 733 353 743 387
-rect 689 337 743 353
-rect 593 315 623 337
-rect 713 315 743 337
-rect 785 315 815 405
-rect 882 367 912 520
-rect 1061 403 1091 617
-rect 1251 601 1281 617
-rect 1241 571 1281 601
-rect 1241 471 1271 571
-rect 1337 512 1367 617
-rect 1216 455 1271 471
-rect 1216 421 1226 455
-rect 1260 421 1271 455
-rect 1313 496 1367 512
-rect 1313 462 1323 496
-rect 1357 462 1367 496
-rect 1313 446 1367 462
-rect 1216 405 1271 421
-rect 871 337 912 367
-rect 1008 387 1091 403
-rect 1008 353 1018 387
-rect 1052 353 1091 387
-rect 1008 337 1091 353
-rect 871 315 901 337
-rect 1061 315 1091 337
-rect 1241 360 1271 405
-rect 1241 330 1281 360
-rect 1251 315 1281 330
-rect 1337 315 1367 446
-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 536 119 570
-rect 253 536 287 570
-rect 467 536 501 570
-rect 699 536 733 570
-rect 181 427 215 461
-rect 898 536 932 570
-rect 795 421 829 455
-rect 349 353 383 387
-rect 467 353 501 387
-rect 603 353 637 387
-rect 699 353 733 387
-rect 1226 421 1260 455
-rect 1323 462 1357 496
-rect 1018 353 1052 387
-<< locali >>
-rect 0 1311 1452 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 1003 1311
-rect 1037 1271 1139 1311
-rect 1173 1271 1275 1311
-rect 1309 1271 1452 1311
-rect 40 1201 74 1217
-rect 17 657 40 669
-rect 126 1201 160 1271
-rect 126 709 160 725
-rect 284 1201 352 1217
-rect 17 628 74 657
-rect 476 1201 510 1271
-rect 476 709 510 725
-rect 634 1201 702 1217
-rect 352 657 355 675
-rect 284 654 355 657
-rect 634 654 702 657
-rect 17 387 51 628
-rect 108 620 355 654
-rect 535 620 702 654
-rect 826 1201 860 1271
-rect 826 641 860 657
-rect 912 1201 946 1217
-rect 1016 1201 1050 1271
-rect 1016 709 1050 725
-rect 1102 1201 1136 1217
-rect 912 654 946 657
-rect 912 620 1000 654
-rect 108 586 142 620
-rect 85 570 142 586
-rect 119 536 142 570
-rect 85 520 142 536
-rect 17 353 40 387
-rect 17 332 74 353
-rect 108 370 142 520
-rect 253 570 287 586
-rect 253 535 287 536
-rect 467 570 501 586
-rect 287 501 383 535
-rect 181 461 215 477
-rect 181 411 215 427
-rect 349 387 383 501
-rect 467 387 501 536
-rect 108 336 315 370
-rect 349 337 383 353
-rect 467 337 501 353
-rect 535 387 569 620
-rect 699 570 733 586
-rect 699 535 733 536
-rect 40 267 74 332
-rect 281 283 315 336
-rect 535 303 569 353
-rect 603 501 699 535
-rect 898 570 932 586
-rect 898 535 932 536
-rect 603 387 637 501
-rect 966 455 1000 620
-rect 779 421 795 455
-rect 829 421 845 455
-rect 912 421 1000 455
-rect 1102 455 1136 657
-rect 1206 1201 1240 1217
-rect 1206 609 1240 657
-rect 1292 1201 1326 1271
-rect 1292 641 1326 657
-rect 1378 1201 1412 1217
-rect 1412 649 1435 666
-rect 1378 632 1435 649
-rect 1206 570 1240 575
-rect 1206 536 1357 570
-rect 1323 496 1357 536
-rect 1102 421 1226 455
-rect 1260 421 1276 455
-rect 912 387 946 421
-rect 683 353 699 387
-rect 733 353 946 387
-rect 1002 353 1018 387
-rect 1052 353 1068 387
-rect 603 337 637 353
-rect 40 115 74 131
-rect 126 267 160 283
-rect 281 267 352 283
-rect 535 269 702 303
-rect 281 249 284 267
-rect 126 61 160 131
-rect 634 267 702 269
-rect 284 115 352 131
-rect 476 199 510 215
-rect 476 61 510 131
-rect 634 115 702 131
-rect 826 267 860 283
-rect 826 61 860 131
-rect 912 267 946 353
-rect 912 115 946 131
-rect 1016 267 1050 283
-rect 1016 61 1050 131
-rect 1102 267 1136 421
-rect 1323 387 1357 462
-rect 1102 115 1136 131
-rect 1206 353 1357 387
-rect 1206 267 1240 353
-rect 1401 322 1435 632
-rect 1378 286 1435 322
-rect 1206 115 1240 131
-rect 1292 267 1326 283
-rect 1292 61 1326 131
-rect 1378 267 1412 286
-rect 1378 115 1412 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 1003 1305 1037 1311
-rect 1003 1277 1037 1305
-rect 1139 1305 1173 1311
-rect 1139 1277 1173 1305
-rect 1275 1305 1309 1311
-rect 1275 1277 1309 1305
-rect 40 353 74 387
-rect 253 501 287 535
-rect 181 427 215 461
-rect 449 353 467 387
-rect 467 353 483 387
-rect 535 353 569 387
-rect 699 501 733 535
-rect 898 501 932 535
-rect 795 421 829 455
-rect 1378 657 1412 683
-rect 1378 649 1412 657
-rect 1206 575 1240 609
-rect 1226 421 1260 455
-rect 1018 353 1052 387
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1311 1452 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 1003 1311
-rect 1037 1277 1139 1311
-rect 1173 1277 1275 1311
-rect 1309 1277 1452 1311
-rect 0 1271 1452 1277
-rect 1366 683 1424 689
-rect 1343 649 1378 683
-rect 1412 649 1424 683
-rect 1366 643 1424 649
-rect 1194 609 1252 615
-rect 1172 575 1206 609
-rect 1240 575 1252 609
-rect 1194 569 1252 575
-rect 241 535 299 541
-rect 687 535 745 541
-rect 886 535 944 541
-rect 241 501 253 535
-rect 287 501 699 535
-rect 733 501 898 535
-rect 932 501 944 535
-rect 241 495 299 501
-rect 687 495 745 501
-rect 886 495 944 501
-rect 169 461 227 467
-rect 169 427 181 461
-rect 215 427 249 461
-rect 783 455 841 461
-rect 1214 455 1272 461
-rect 169 421 227 427
-rect 783 421 795 455
-rect 829 421 1226 455
-rect 1260 421 1272 455
-rect 783 415 841 421
-rect 1214 415 1272 421
-rect 28 387 86 393
-rect 437 387 495 393
-rect 28 353 40 387
-rect 74 353 449 387
-rect 483 353 495 387
-rect 28 347 86 353
-rect 437 347 495 353
-rect 523 387 581 393
-rect 1006 387 1064 393
-rect 523 353 535 387
-rect 569 353 1018 387
-rect 1052 353 1064 387
-rect 523 347 581 353
-rect 1006 347 1064 353
-rect 0 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel metal1 198 444 198 444 1 D
-port 1 n
-rlabel metal1 915 518 915 518 1 CK
-port 3 n
-rlabel metal1 1395 666 1395 666 1 Q
-port 4 n
-rlabel metal1 1224 592 1224 592 1 QN
-port 2 n
-rlabel viali 68 49 68 49 1 gnd
-rlabel viali 68 1285 68 1285 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__dff_l.mag b/18T_ms/sky130_osu_sc_18T_ms__dff_l.mag
deleted file mode 100644
index 3ed0bbf..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__dff_l.mag
+++ /dev/null
@@ -1,635 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864603
-<< checkpaint >>
-rect -1209 -1243 2569 2575
-<< nwell >>
-rect -9 581 1456 1341
-<< nmos >>
-rect 85 115 115 315
-rect 171 115 201 315
-rect 243 115 273 315
-rect 363 115 393 315
-rect 435 115 465 315
-rect 521 115 551 315
-rect 593 115 623 315
-rect 713 115 743 315
-rect 785 115 815 315
-rect 871 115 901 315
-rect 1061 115 1091 315
-rect 1251 115 1281 263
-rect 1337 115 1367 263
-<< pmos >>
-rect 85 617 115 1217
-rect 171 617 201 1217
-rect 243 617 273 1217
-rect 363 617 393 1217
-rect 435 617 465 1217
-rect 521 617 551 1217
-rect 593 617 623 1217
-rect 713 617 743 1217
-rect 785 617 815 1217
-rect 871 617 901 1217
-rect 1061 617 1091 1217
-rect 1251 817 1281 1217
-rect 1337 817 1367 1217
-<< ndiff >>
-rect 32 267 85 315
-rect 32 131 40 267
-rect 74 131 85 267
-rect 32 115 85 131
-rect 115 267 171 315
-rect 115 131 126 267
-rect 160 131 171 267
-rect 115 115 171 131
-rect 201 115 243 315
-rect 273 267 363 315
-rect 273 131 284 267
-rect 352 131 363 267
-rect 273 115 363 131
-rect 393 115 435 315
-rect 465 199 521 315
-rect 465 131 476 199
-rect 510 131 521 199
-rect 465 115 521 131
-rect 551 115 593 315
-rect 623 267 713 315
-rect 623 131 634 267
-rect 702 131 713 267
-rect 623 115 713 131
-rect 743 115 785 315
-rect 815 267 871 315
-rect 815 131 826 267
-rect 860 131 871 267
-rect 815 115 871 131
-rect 901 267 954 315
-rect 901 131 912 267
-rect 946 131 954 267
-rect 901 115 954 131
-rect 1008 267 1061 315
-rect 1008 131 1016 267
-rect 1050 131 1061 267
-rect 1008 115 1061 131
-rect 1091 267 1144 315
-rect 1091 131 1102 267
-rect 1136 131 1144 267
-rect 1091 115 1144 131
-rect 1198 199 1251 263
-rect 1198 131 1206 199
-rect 1240 131 1251 199
-rect 1198 115 1251 131
-rect 1281 199 1337 263
-rect 1281 131 1292 199
-rect 1326 131 1337 199
-rect 1281 115 1337 131
-rect 1367 199 1420 263
-rect 1367 131 1378 199
-rect 1412 131 1420 199
-rect 1367 115 1420 131
-<< pdiff >>
-rect 32 1201 85 1217
-rect 32 657 40 1201
-rect 74 657 85 1201
-rect 32 617 85 657
-rect 115 1201 171 1217
-rect 115 725 126 1201
-rect 160 725 171 1201
-rect 115 617 171 725
-rect 201 617 243 1217
-rect 273 1201 363 1217
-rect 273 657 284 1201
-rect 352 657 363 1201
-rect 273 617 363 657
-rect 393 617 435 1217
-rect 465 1201 521 1217
-rect 465 725 476 1201
-rect 510 725 521 1201
-rect 465 617 521 725
-rect 551 617 593 1217
-rect 623 1201 713 1217
-rect 623 725 634 1201
-rect 702 725 713 1201
-rect 623 617 713 725
-rect 743 617 785 1217
-rect 815 1201 871 1217
-rect 815 657 826 1201
-rect 860 657 871 1201
-rect 815 617 871 657
-rect 901 1201 954 1217
-rect 901 657 912 1201
-rect 946 657 954 1201
-rect 901 617 954 657
-rect 1008 1201 1061 1217
-rect 1008 725 1016 1201
-rect 1050 725 1061 1201
-rect 1008 617 1061 725
-rect 1091 1201 1144 1217
-rect 1091 657 1102 1201
-rect 1136 657 1144 1201
-rect 1198 1201 1251 1217
-rect 1198 929 1206 1201
-rect 1240 929 1251 1201
-rect 1198 817 1251 929
-rect 1281 1201 1337 1217
-rect 1281 929 1292 1201
-rect 1326 929 1337 1201
-rect 1281 817 1337 929
-rect 1367 1201 1420 1217
-rect 1367 929 1378 1201
-rect 1412 929 1420 1201
-rect 1367 817 1420 929
-rect 1091 617 1144 657
-<< ndiffc >>
-rect 40 131 74 267
-rect 126 131 160 267
-rect 284 131 352 267
-rect 476 131 510 199
-rect 634 131 702 267
-rect 826 131 860 267
-rect 912 131 946 267
-rect 1016 131 1050 267
-rect 1102 131 1136 267
-rect 1206 131 1240 199
-rect 1292 131 1326 199
-rect 1378 131 1412 199
-<< pdiffc >>
-rect 40 657 74 1201
-rect 126 725 160 1201
-rect 284 657 352 1201
-rect 476 725 510 1201
-rect 634 725 702 1201
-rect 826 657 860 1201
-rect 912 657 946 1201
-rect 1016 725 1050 1201
-rect 1102 657 1136 1201
-rect 1206 929 1240 1201
-rect 1292 929 1326 1201
-rect 1378 929 1412 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-rect 979 1271 1003 1305
-rect 1037 1271 1061 1305
-rect 1115 1271 1139 1305
-rect 1173 1271 1197 1305
-rect 1251 1271 1275 1305
-rect 1309 1271 1333 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-rect 1003 1271 1037 1305
-rect 1139 1271 1173 1305
-rect 1275 1271 1309 1305
-<< poly >>
-rect 85 1217 115 1243
-rect 171 1217 201 1243
-rect 243 1217 273 1243
-rect 363 1217 393 1243
-rect 435 1217 465 1243
-rect 521 1217 551 1243
-rect 593 1217 623 1243
-rect 713 1217 743 1243
-rect 785 1217 815 1243
-rect 871 1217 901 1243
-rect 1061 1217 1091 1243
-rect 1251 1217 1281 1243
-rect 1337 1217 1367 1243
-rect 85 586 115 617
-rect 75 570 129 586
-rect 75 536 85 570
-rect 119 536 129 570
-rect 75 520 129 536
-rect 75 374 105 520
-rect 171 477 201 617
-rect 243 586 273 617
-rect 243 570 297 586
-rect 243 536 253 570
-rect 287 536 297 570
-rect 243 520 297 536
-rect 171 461 225 477
-rect 363 475 393 617
-rect 435 580 465 617
-rect 521 580 551 617
-rect 435 570 551 580
-rect 435 536 467 570
-rect 501 536 551 570
-rect 435 526 551 536
-rect 593 475 623 617
-rect 713 586 743 617
-rect 689 570 743 586
-rect 689 536 699 570
-rect 733 536 743 570
-rect 689 520 743 536
-rect 171 427 181 461
-rect 215 427 225 461
-rect 171 411 225 427
-rect 267 445 719 475
-rect 75 344 115 374
-rect 85 315 115 344
-rect 171 315 201 411
-rect 267 367 297 445
-rect 689 403 719 445
-rect 785 471 815 617
-rect 871 586 901 617
-rect 871 570 942 586
-rect 871 556 898 570
-rect 882 536 898 556
-rect 932 536 942 570
-rect 882 520 942 536
-rect 785 455 839 471
-rect 785 421 795 455
-rect 829 421 839 455
-rect 785 405 839 421
-rect 243 337 297 367
-rect 339 387 393 403
-rect 339 353 349 387
-rect 383 353 393 387
-rect 339 337 393 353
-rect 243 315 273 337
-rect 363 315 393 337
-rect 435 387 551 397
-rect 435 353 467 387
-rect 501 353 551 387
-rect 435 343 551 353
-rect 435 315 465 343
-rect 521 315 551 343
-rect 593 387 647 403
-rect 593 353 603 387
-rect 637 353 647 387
-rect 593 337 647 353
-rect 689 387 743 403
-rect 689 353 699 387
-rect 733 353 743 387
-rect 689 337 743 353
-rect 593 315 623 337
-rect 713 315 743 337
-rect 785 315 815 405
-rect 882 367 912 520
-rect 1061 403 1091 617
-rect 1251 601 1281 817
-rect 1241 571 1281 601
-rect 1241 471 1271 571
-rect 1337 512 1367 817
-rect 1216 455 1271 471
-rect 1216 421 1226 455
-rect 1260 421 1271 455
-rect 1313 496 1367 512
-rect 1313 462 1323 496
-rect 1357 462 1367 496
-rect 1313 446 1367 462
-rect 1216 405 1271 421
-rect 871 337 912 367
-rect 1008 387 1091 403
-rect 1008 353 1018 387
-rect 1052 353 1091 387
-rect 1008 337 1091 353
-rect 871 315 901 337
-rect 1061 315 1091 337
-rect 1241 360 1271 405
-rect 1241 330 1281 360
-rect 1251 263 1281 330
-rect 1337 263 1367 446
-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 536 119 570
-rect 253 536 287 570
-rect 467 536 501 570
-rect 699 536 733 570
-rect 181 427 215 461
-rect 898 536 932 570
-rect 795 421 829 455
-rect 349 353 383 387
-rect 467 353 501 387
-rect 603 353 637 387
-rect 699 353 733 387
-rect 1226 421 1260 455
-rect 1323 462 1357 496
-rect 1018 353 1052 387
-<< locali >>
-rect 0 1311 1452 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 1003 1311
-rect 1037 1271 1139 1311
-rect 1173 1271 1275 1311
-rect 1309 1271 1452 1311
-rect 40 1201 74 1217
-rect 17 657 40 669
-rect 126 1201 160 1271
-rect 126 709 160 725
-rect 284 1201 352 1217
-rect 17 635 74 657
-rect 476 1201 510 1271
-rect 476 709 510 725
-rect 634 1201 702 1217
-rect 352 657 355 675
-rect 284 654 355 657
-rect 634 654 702 725
-rect 17 387 51 635
-rect 108 620 355 654
-rect 535 620 702 654
-rect 826 1201 860 1271
-rect 826 641 860 657
-rect 912 1201 946 1217
-rect 1016 1201 1050 1271
-rect 1016 709 1050 725
-rect 1102 1201 1136 1217
-rect 912 654 946 657
-rect 912 620 1000 654
-rect 108 586 142 620
-rect 85 570 142 586
-rect 119 536 142 570
-rect 85 520 142 536
-rect 17 353 40 387
-rect 17 332 74 353
-rect 108 370 142 520
-rect 253 570 287 586
-rect 253 535 287 536
-rect 467 570 501 586
-rect 287 501 383 535
-rect 181 461 215 477
-rect 181 411 215 427
-rect 349 387 383 501
-rect 467 387 501 536
-rect 108 336 315 370
-rect 349 337 383 353
-rect 467 337 501 353
-rect 535 387 569 620
-rect 699 570 733 586
-rect 699 535 733 536
-rect 40 267 74 332
-rect 281 283 315 336
-rect 535 303 569 353
-rect 603 501 699 535
-rect 898 570 932 586
-rect 898 535 932 536
-rect 603 387 637 501
-rect 966 455 1000 620
-rect 779 421 795 455
-rect 829 421 845 455
-rect 912 421 1000 455
-rect 1102 455 1136 657
-rect 1206 1201 1240 1217
-rect 1206 609 1240 929
-rect 1292 1201 1326 1271
-rect 1292 913 1326 929
-rect 1378 1201 1412 1217
-rect 1378 683 1412 929
-rect 1411 666 1412 683
-rect 1411 649 1435 666
-rect 1378 632 1435 649
-rect 1206 570 1240 575
-rect 1206 536 1357 570
-rect 1323 496 1357 536
-rect 1102 421 1226 455
-rect 1260 421 1276 455
-rect 912 387 946 421
-rect 683 353 699 387
-rect 733 353 946 387
-rect 1002 353 1018 387
-rect 1052 353 1068 387
-rect 603 337 637 353
-rect 40 115 74 131
-rect 126 267 160 283
-rect 281 267 352 283
-rect 535 269 702 303
-rect 281 249 284 267
-rect 126 61 160 131
-rect 634 267 702 269
-rect 284 115 352 131
-rect 476 199 510 215
-rect 476 61 510 131
-rect 634 115 702 131
-rect 826 267 860 283
-rect 826 61 860 131
-rect 912 267 946 353
-rect 912 115 946 131
-rect 1016 267 1050 283
-rect 1016 61 1050 131
-rect 1102 267 1136 421
-rect 1323 387 1357 462
-rect 1102 115 1136 131
-rect 1206 353 1357 387
-rect 1206 199 1240 353
-rect 1401 320 1435 632
-rect 1378 286 1435 320
-rect 1206 115 1240 131
-rect 1292 199 1326 215
-rect 1292 61 1326 131
-rect 1378 199 1412 286
-rect 1378 115 1412 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 1003 61
-rect 1037 21 1139 61
-rect 1173 21 1275 61
-rect 1309 21 1452 61
-rect 0 0 1452 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 1003 1305 1037 1311
-rect 1003 1277 1037 1305
-rect 1139 1305 1173 1311
-rect 1139 1277 1173 1305
-rect 1275 1305 1309 1311
-rect 1275 1277 1309 1305
-rect 40 353 74 387
-rect 253 501 287 535
-rect 181 427 215 461
-rect 449 353 467 387
-rect 467 353 483 387
-rect 535 353 569 387
-rect 699 501 733 535
-rect 898 501 932 535
-rect 795 421 829 455
-rect 1377 649 1411 683
-rect 1206 575 1240 609
-rect 1226 421 1260 455
-rect 1018 353 1052 387
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-rect 1003 27 1037 55
-rect 1003 21 1037 27
-rect 1139 27 1173 55
-rect 1139 21 1173 27
-rect 1275 27 1309 55
-rect 1275 21 1309 27
-<< metal1 >>
-rect 0 1311 1452 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 1003 1311
-rect 1037 1277 1139 1311
-rect 1173 1277 1275 1311
-rect 1309 1277 1452 1311
-rect 0 1271 1452 1277
-rect 1365 683 1423 689
-rect 1343 649 1377 683
-rect 1411 649 1423 683
-rect 1365 643 1423 649
-rect 1194 609 1252 615
-rect 1172 575 1206 609
-rect 1240 575 1252 609
-rect 1194 569 1252 575
-rect 241 535 299 541
-rect 687 535 745 541
-rect 886 535 944 541
-rect 241 501 253 535
-rect 287 501 699 535
-rect 733 501 898 535
-rect 932 501 944 535
-rect 241 495 299 501
-rect 687 495 745 501
-rect 886 495 944 501
-rect 169 461 227 467
-rect 169 427 181 461
-rect 215 427 249 461
-rect 783 455 841 461
-rect 1214 455 1272 461
-rect 169 421 227 427
-rect 783 421 795 455
-rect 829 421 1226 455
-rect 1260 421 1272 455
-rect 783 415 841 421
-rect 1214 415 1272 421
-rect 28 387 86 393
-rect 437 387 495 393
-rect 28 353 40 387
-rect 74 353 449 387
-rect 483 353 495 387
-rect 28 347 86 353
-rect 437 347 495 353
-rect 523 387 581 393
-rect 1006 387 1064 393
-rect 523 353 535 387
-rect 569 353 1018 387
-rect 1052 353 1064 387
-rect 523 347 581 353
-rect 1006 347 1064 353
-rect 0 55 1452 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 1003 55
-rect 1037 21 1139 55
-rect 1173 21 1275 55
-rect 1309 21 1452 55
-rect 0 0 1452 21
-<< labels >>
-rlabel metal1 198 444 198 444 1 D
-port 1 n
-rlabel metal1 1394 666 1394 666 1 Q
-port 2 n
-rlabel metal1 1224 592 1224 592 1 QN
-port 3 n
-rlabel metal1 915 518 915 518 1 CK
-port 4 n
-rlabel viali 68 49 68 49 1 gnd
-rlabel viali 68 1285 68 1285 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__dffr_1.mag b/18T_ms/sky130_osu_sc_18T_ms__dffr_1.mag
deleted file mode 100644
index 3c01a2d..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__dffr_1.mag
+++ /dev/null
@@ -1,807 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864603
-<< checkpaint >>
-rect -1210 -1243 3112 2575
-<< nwell >>
-rect -10 581 1917 1341
-<< nmos >>
-rect 80 115 110 315
-rect 270 115 300 263
-rect 356 115 386 263
-rect 546 115 576 315
-rect 618 115 648 315
-rect 738 115 768 315
-rect 810 115 840 315
-rect 896 115 926 315
-rect 968 115 998 315
-rect 1088 115 1118 315
-rect 1160 115 1190 315
-rect 1246 115 1276 315
-rect 1436 115 1466 263
-rect 1522 115 1552 263
-rect 1712 115 1742 315
-rect 1798 115 1828 315
-<< pmos >>
-rect 80 617 110 1217
-rect 270 817 300 1217
-rect 342 817 372 1217
-rect 546 617 576 1217
-rect 618 617 648 1217
-rect 738 617 768 1217
-rect 810 617 840 1217
-rect 896 617 926 1217
-rect 968 617 998 1217
-rect 1088 617 1118 1217
-rect 1160 617 1190 1217
-rect 1246 617 1276 1217
-rect 1436 817 1466 1217
-rect 1508 817 1538 1217
-rect 1712 617 1742 1217
-rect 1798 617 1828 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 493 267 546 315
-rect 110 115 163 131
-rect 217 199 270 263
-rect 217 131 225 199
-rect 259 131 270 199
-rect 217 115 270 131
-rect 300 199 356 263
-rect 300 131 311 199
-rect 345 131 356 199
-rect 300 115 356 131
-rect 386 199 439 263
-rect 386 131 397 199
-rect 431 131 439 199
-rect 386 115 439 131
-rect 493 131 501 267
-rect 535 131 546 267
-rect 493 115 546 131
-rect 576 115 618 315
-rect 648 267 738 315
-rect 648 131 659 267
-rect 727 131 738 267
-rect 648 115 738 131
-rect 768 115 810 315
-rect 840 199 896 315
-rect 840 131 851 199
-rect 885 131 896 199
-rect 840 115 896 131
-rect 926 115 968 315
-rect 998 267 1088 315
-rect 998 131 1009 267
-rect 1077 131 1088 267
-rect 998 115 1088 131
-rect 1118 115 1160 315
-rect 1190 267 1246 315
-rect 1190 131 1201 267
-rect 1235 131 1246 267
-rect 1190 115 1246 131
-rect 1276 267 1329 315
-rect 1276 131 1287 267
-rect 1321 131 1329 267
-rect 1276 115 1329 131
-rect 1383 199 1436 263
-rect 1383 131 1391 199
-rect 1425 131 1436 199
-rect 1383 115 1436 131
-rect 1466 199 1522 263
-rect 1466 131 1477 199
-rect 1511 131 1522 199
-rect 1466 115 1522 131
-rect 1552 199 1605 263
-rect 1552 131 1563 199
-rect 1597 131 1605 199
-rect 1552 115 1605 131
-rect 1659 199 1712 315
-rect 1659 131 1667 199
-rect 1701 131 1712 199
-rect 1659 115 1712 131
-rect 1742 199 1798 315
-rect 1742 131 1753 199
-rect 1787 131 1798 199
-rect 1742 115 1798 131
-rect 1828 199 1881 315
-rect 1828 131 1839 199
-rect 1873 131 1881 199
-rect 1828 115 1881 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 217 1201 270 1217
-rect 217 861 225 1201
-rect 259 861 270 1201
-rect 217 817 270 861
-rect 300 817 342 1217
-rect 372 1201 425 1217
-rect 372 861 383 1201
-rect 417 861 425 1201
-rect 372 817 425 861
-rect 493 1201 546 1217
-rect 110 617 163 657
-rect 493 725 501 1201
-rect 535 725 546 1201
-rect 493 617 546 725
-rect 576 617 618 1217
-rect 648 1201 738 1217
-rect 648 657 659 1201
-rect 727 657 738 1201
-rect 648 617 738 657
-rect 768 617 810 1217
-rect 840 1201 896 1217
-rect 840 725 851 1201
-rect 885 725 896 1201
-rect 840 617 896 725
-rect 926 617 968 1217
-rect 998 1201 1088 1217
-rect 998 725 1009 1201
-rect 1077 725 1088 1201
-rect 998 617 1088 725
-rect 1118 617 1160 1217
-rect 1190 1201 1246 1217
-rect 1190 657 1201 1201
-rect 1235 657 1246 1201
-rect 1190 617 1246 657
-rect 1276 1201 1329 1217
-rect 1276 657 1287 1201
-rect 1321 657 1329 1201
-rect 1383 1201 1436 1217
-rect 1383 861 1391 1201
-rect 1425 861 1436 1201
-rect 1383 817 1436 861
-rect 1466 817 1508 1217
-rect 1538 1201 1591 1217
-rect 1538 861 1549 1201
-rect 1583 861 1591 1201
-rect 1538 817 1591 861
-rect 1659 1201 1712 1217
-rect 1659 861 1667 1201
-rect 1701 861 1712 1201
-rect 1276 617 1329 657
-rect 1659 617 1712 861
-rect 1742 1201 1798 1217
-rect 1742 861 1753 1201
-rect 1787 861 1798 1201
-rect 1742 617 1798 861
-rect 1828 1201 1881 1217
-rect 1828 861 1839 1201
-rect 1873 861 1881 1201
-rect 1828 617 1881 861
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 225 131 259 199
-rect 311 131 345 199
-rect 397 131 431 199
-rect 501 131 535 267
-rect 659 131 727 267
-rect 851 131 885 199
-rect 1009 131 1077 267
-rect 1201 131 1235 267
-rect 1287 131 1321 267
-rect 1391 131 1425 199
-rect 1477 131 1511 199
-rect 1563 131 1597 199
-rect 1667 131 1701 199
-rect 1753 131 1787 199
-rect 1839 131 1873 199
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 225 861 259 1201
-rect 383 861 417 1201
-rect 501 725 535 1201
-rect 659 657 727 1201
-rect 851 725 885 1201
-rect 1009 725 1077 1201
-rect 1201 657 1235 1201
-rect 1287 657 1321 1201
-rect 1391 861 1425 1201
-rect 1549 861 1583 1201
-rect 1667 861 1701 1201
-rect 1753 861 1787 1201
-rect 1839 861 1873 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-rect 1658 1271 1682 1305
-rect 1716 1271 1740 1305
-rect 1794 1271 1818 1305
-rect 1852 1271 1876 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-rect 1682 1271 1716 1305
-rect 1818 1271 1852 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 270 1217 300 1243
-rect 342 1217 372 1243
-rect 546 1217 576 1243
-rect 618 1217 648 1243
-rect 738 1217 768 1243
-rect 810 1217 840 1243
-rect 896 1217 926 1243
-rect 968 1217 998 1243
-rect 1088 1217 1118 1243
-rect 1160 1217 1190 1243
-rect 1246 1217 1276 1243
-rect 1436 1217 1466 1243
-rect 1508 1217 1538 1243
-rect 1712 1217 1742 1243
-rect 1798 1217 1828 1243
-rect 80 494 110 617
-rect 79 478 133 494
-rect 79 444 89 478
-rect 123 444 133 478
-rect 79 428 133 444
-rect 79 427 110 428
-rect 80 315 110 427
-rect 270 351 300 817
-rect 342 584 372 817
-rect 342 568 415 584
-rect 342 534 371 568
-rect 405 534 415 568
-rect 342 518 415 534
-rect 219 335 300 351
-rect 219 301 229 335
-rect 263 301 300 335
-rect 219 285 300 301
-rect 270 263 300 285
-rect 356 263 386 518
-rect 546 477 576 617
-rect 618 586 648 617
-rect 618 570 672 586
-rect 618 536 628 570
-rect 662 536 672 570
-rect 618 520 672 536
-rect 546 461 600 477
-rect 738 475 768 617
-rect 810 580 840 617
-rect 896 580 926 617
-rect 810 570 926 580
-rect 810 536 842 570
-rect 876 536 926 570
-rect 810 526 926 536
-rect 968 475 998 617
-rect 1088 586 1118 617
-rect 1064 570 1118 586
-rect 1064 536 1074 570
-rect 1108 536 1118 570
-rect 1064 520 1118 536
-rect 546 427 556 461
-rect 590 427 600 461
-rect 546 411 600 427
-rect 642 445 1094 475
-rect 546 315 576 411
-rect 642 367 672 445
-rect 1064 403 1094 445
-rect 1160 471 1190 617
-rect 1246 586 1276 617
-rect 1246 570 1317 586
-rect 1246 556 1273 570
-rect 1257 536 1273 556
-rect 1307 536 1317 570
-rect 1257 520 1317 536
-rect 1160 455 1214 471
-rect 1160 421 1170 455
-rect 1204 421 1214 455
-rect 1160 405 1214 421
-rect 618 337 672 367
-rect 714 387 768 403
-rect 714 353 724 387
-rect 758 353 768 387
-rect 714 337 768 353
-rect 618 315 648 337
-rect 738 315 768 337
-rect 810 387 926 397
-rect 810 353 842 387
-rect 876 353 926 387
-rect 810 343 926 353
-rect 810 315 840 343
-rect 896 315 926 343
-rect 968 387 1022 403
-rect 968 353 978 387
-rect 1012 353 1022 387
-rect 968 337 1022 353
-rect 1064 387 1118 403
-rect 1064 353 1074 387
-rect 1108 353 1118 387
-rect 1064 337 1118 353
-rect 968 315 998 337
-rect 1088 315 1118 337
-rect 1160 315 1190 405
-rect 1257 367 1287 520
-rect 1436 403 1466 817
-rect 1246 337 1287 367
-rect 1399 387 1466 403
-rect 1399 353 1409 387
-rect 1443 353 1466 387
-rect 1399 337 1466 353
-rect 1246 315 1276 337
-rect 1423 336 1466 337
-rect 1436 263 1466 336
-rect 1508 351 1538 817
-rect 1712 601 1742 617
-rect 1702 571 1742 601
-rect 1702 471 1732 571
-rect 1798 512 1828 617
-rect 1677 455 1732 471
-rect 1677 421 1687 455
-rect 1721 421 1732 455
-rect 1774 496 1828 512
-rect 1774 462 1784 496
-rect 1818 462 1828 496
-rect 1774 446 1828 462
-rect 1677 405 1732 421
-rect 1702 360 1732 405
-rect 1508 335 1589 351
-rect 1508 301 1545 335
-rect 1579 301 1589 335
-rect 1702 330 1742 360
-rect 1712 315 1742 330
-rect 1798 315 1828 446
-rect 1508 285 1589 301
-rect 1522 263 1552 285
-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 444 123 478
-rect 371 534 405 568
-rect 229 301 263 335
-rect 628 536 662 570
-rect 842 536 876 570
-rect 1074 536 1108 570
-rect 556 427 590 461
-rect 1273 536 1307 570
-rect 1170 421 1204 455
-rect 724 353 758 387
-rect 842 353 876 387
-rect 978 353 1012 387
-rect 1074 353 1108 387
-rect 1409 353 1443 387
-rect 1687 421 1721 455
-rect 1784 462 1818 496
-rect 1545 301 1579 335
-<< locali >>
-rect 0 1311 1914 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1682 1311
-rect 1716 1271 1818 1311
-rect 1852 1271 1914 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 494 81 649
-rect 121 565 155 657
-rect 225 1201 259 1217
-rect 121 531 191 565
-rect 47 478 123 494
-rect 47 444 89 478
-rect 89 428 123 444
-rect 157 335 191 531
-rect 225 421 259 861
-rect 383 1201 417 1271
-rect 383 845 417 861
-rect 501 1201 535 1271
-rect 501 709 535 725
-rect 659 1201 727 1217
-rect 851 1201 885 1271
-rect 851 709 885 725
-rect 1009 1201 1077 1217
-rect 659 654 727 657
-rect 1009 654 1077 725
-rect 405 620 727 654
-rect 910 620 1077 654
-rect 1201 1201 1235 1271
-rect 1201 641 1235 657
-rect 1287 1201 1321 1217
-rect 1391 1201 1425 1217
-rect 1391 773 1425 861
-rect 1549 1201 1583 1271
-rect 1549 845 1583 861
-rect 1667 1201 1701 1217
-rect 1391 739 1511 773
-rect 1287 654 1321 657
-rect 1287 620 1377 654
-rect 405 584 439 620
-rect 371 568 439 584
-rect 405 534 439 568
-rect 371 518 439 534
-rect 225 387 345 421
-rect 229 335 263 351
-rect 121 301 229 335
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 301
-rect 121 115 155 131
-rect 225 199 259 215
-rect 225 61 259 131
-rect 311 199 345 353
-rect 405 370 439 518
-rect 628 570 662 586
-rect 628 535 662 536
-rect 842 570 876 586
-rect 662 501 758 535
-rect 556 461 590 477
-rect 556 411 590 427
-rect 724 387 758 501
-rect 842 387 876 536
-rect 405 336 690 370
-rect 724 337 758 353
-rect 842 337 876 353
-rect 910 387 944 620
-rect 1074 570 1108 586
-rect 1074 535 1108 536
-rect 656 283 690 336
-rect 910 303 944 353
-rect 978 501 1074 535
-rect 1273 570 1307 586
-rect 1273 535 1307 536
-rect 978 387 1012 501
-rect 1341 455 1377 620
-rect 1154 421 1170 455
-rect 1204 421 1220 455
-rect 1287 421 1377 455
-rect 1477 455 1511 739
-rect 1667 609 1701 861
-rect 1753 1201 1787 1271
-rect 1753 845 1787 861
-rect 1839 1201 1873 1217
-rect 1839 683 1873 861
-rect 1872 666 1873 683
-rect 1872 649 1896 666
-rect 1839 632 1896 649
-rect 1667 570 1701 575
-rect 1667 536 1818 570
-rect 1784 496 1818 536
-rect 1477 421 1687 455
-rect 1721 421 1737 455
-rect 1287 387 1321 421
-rect 1058 353 1074 387
-rect 1108 353 1321 387
-rect 978 337 1012 353
-rect 501 267 535 283
-rect 311 115 345 131
-rect 397 199 431 215
-rect 397 61 431 131
-rect 656 267 727 283
-rect 910 269 1077 303
-rect 656 249 659 267
-rect 501 61 535 131
-rect 1009 267 1077 269
-rect 659 115 727 131
-rect 851 199 885 215
-rect 851 61 885 131
-rect 1009 115 1077 131
-rect 1201 267 1235 283
-rect 1201 61 1235 131
-rect 1287 267 1321 353
-rect 1409 387 1443 403
-rect 1409 337 1443 353
-rect 1287 115 1321 131
-rect 1391 199 1425 215
-rect 1391 61 1425 131
-rect 1477 199 1511 421
-rect 1784 387 1818 462
-rect 1667 353 1818 387
-rect 1545 335 1579 351
-rect 1477 115 1511 131
-rect 1563 199 1597 215
-rect 1563 61 1597 131
-rect 1667 199 1701 353
-rect 1862 320 1896 632
-rect 1839 286 1896 320
-rect 1667 115 1701 131
-rect 1753 199 1787 215
-rect 1753 61 1787 131
-rect 1839 199 1873 286
-rect 1839 115 1873 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 1682 1305 1716 1311
-rect 1682 1277 1716 1305
-rect 1818 1305 1852 1311
-rect 1818 1277 1852 1305
-rect 47 649 81 683
-rect 311 353 345 387
-rect 229 301 263 313
-rect 229 279 263 301
-rect 628 501 662 535
-rect 556 427 590 461
-rect 824 353 842 387
-rect 842 353 858 387
-rect 910 353 944 387
-rect 1074 501 1108 535
-rect 1273 501 1307 535
-rect 1170 421 1204 455
-rect 1838 649 1872 683
-rect 1667 575 1701 609
-rect 1687 421 1721 455
-rect 1409 353 1443 387
-rect 1545 301 1579 313
-rect 1545 279 1579 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 1311 1914 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1682 1311
-rect 1716 1277 1818 1311
-rect 1852 1277 1914 1311
-rect 0 1271 1914 1277
-rect 35 683 93 689
-rect 1826 683 1884 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 1804 649 1838 683
-rect 1872 649 1884 683
-rect 35 643 93 649
-rect 1826 643 1884 649
-rect 1655 609 1713 615
-rect 1632 575 1667 609
-rect 1701 575 1713 609
-rect 1655 569 1713 575
-rect 616 535 674 541
-rect 1062 535 1120 541
-rect 1261 535 1319 541
-rect 616 501 628 535
-rect 662 501 1074 535
-rect 1108 501 1273 535
-rect 1307 501 1319 535
-rect 616 495 674 501
-rect 1062 495 1120 501
-rect 1261 495 1319 501
-rect 544 461 602 467
-rect 544 427 556 461
-rect 590 427 624 461
-rect 1158 455 1216 461
-rect 1675 455 1733 461
-rect 544 421 602 427
-rect 1158 421 1170 455
-rect 1204 421 1687 455
-rect 1721 421 1733 455
-rect 1158 415 1216 421
-rect 1675 415 1733 421
-rect 299 387 357 393
-rect 812 387 870 393
-rect 299 353 311 387
-rect 345 353 824 387
-rect 858 353 870 387
-rect 299 347 357 353
-rect 812 347 870 353
-rect 898 387 956 393
-rect 1397 387 1455 393
-rect 898 353 910 387
-rect 944 353 1409 387
-rect 1443 353 1455 387
-rect 898 347 956 353
-rect 1397 347 1455 353
-rect 217 313 275 319
-rect 1533 313 1591 319
-rect 217 279 229 313
-rect 263 279 1545 313
-rect 1579 279 1591 313
-rect 217 273 275 279
-rect 1533 273 1591 279
-rect 0 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel metal1 65 666 65 666 1 RN
-port 1 n
-rlabel metal1 573 444 573 444 1 D
-port 2 n
-rlabel metal1 1290 518 1290 518 1 CK
-port 3 n
-rlabel metal1 1855 666 1855 666 1 Q
-port 4 n
-rlabel metal1 1685 592 1685 592 1 QN
-port 5 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__dffr_l.mag b/18T_ms/sky130_osu_sc_18T_ms__dffr_l.mag
deleted file mode 100644
index faa52fc..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__dffr_l.mag
+++ /dev/null
@@ -1,807 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864603
-<< checkpaint >>
-rect -1210 -1243 3112 2575
-<< nwell >>
-rect -10 581 1917 1341
-<< nmos >>
-rect 80 115 110 315
-rect 270 115 300 263
-rect 356 115 386 263
-rect 546 115 576 315
-rect 618 115 648 315
-rect 738 115 768 315
-rect 810 115 840 315
-rect 896 115 926 315
-rect 968 115 998 315
-rect 1088 115 1118 315
-rect 1160 115 1190 315
-rect 1246 115 1276 315
-rect 1436 115 1466 263
-rect 1522 115 1552 263
-rect 1712 115 1742 263
-rect 1798 115 1828 263
-<< pmos >>
-rect 80 617 110 1217
-rect 270 817 300 1217
-rect 342 817 372 1217
-rect 546 617 576 1217
-rect 618 617 648 1217
-rect 738 617 768 1217
-rect 810 617 840 1217
-rect 896 617 926 1217
-rect 968 617 998 1217
-rect 1088 617 1118 1217
-rect 1160 617 1190 1217
-rect 1246 617 1276 1217
-rect 1436 817 1466 1217
-rect 1508 817 1538 1217
-rect 1712 817 1742 1217
-rect 1798 817 1828 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 493 267 546 315
-rect 110 115 163 131
-rect 217 199 270 263
-rect 217 131 225 199
-rect 259 131 270 199
-rect 217 115 270 131
-rect 300 199 356 263
-rect 300 131 311 199
-rect 345 131 356 199
-rect 300 115 356 131
-rect 386 199 439 263
-rect 386 131 397 199
-rect 431 131 439 199
-rect 386 115 439 131
-rect 493 131 501 267
-rect 535 131 546 267
-rect 493 115 546 131
-rect 576 115 618 315
-rect 648 267 738 315
-rect 648 131 659 267
-rect 727 131 738 267
-rect 648 115 738 131
-rect 768 115 810 315
-rect 840 199 896 315
-rect 840 131 851 199
-rect 885 131 896 199
-rect 840 115 896 131
-rect 926 115 968 315
-rect 998 267 1088 315
-rect 998 131 1009 267
-rect 1077 131 1088 267
-rect 998 115 1088 131
-rect 1118 115 1160 315
-rect 1190 267 1246 315
-rect 1190 131 1201 267
-rect 1235 131 1246 267
-rect 1190 115 1246 131
-rect 1276 267 1329 315
-rect 1276 131 1287 267
-rect 1321 131 1329 267
-rect 1276 115 1329 131
-rect 1383 199 1436 263
-rect 1383 131 1391 199
-rect 1425 131 1436 199
-rect 1383 115 1436 131
-rect 1466 199 1522 263
-rect 1466 131 1477 199
-rect 1511 131 1522 199
-rect 1466 115 1522 131
-rect 1552 199 1605 263
-rect 1552 131 1563 199
-rect 1597 131 1605 199
-rect 1552 115 1605 131
-rect 1659 199 1712 263
-rect 1659 131 1667 199
-rect 1701 131 1712 199
-rect 1659 115 1712 131
-rect 1742 199 1798 263
-rect 1742 131 1753 199
-rect 1787 131 1798 199
-rect 1742 115 1798 131
-rect 1828 199 1881 263
-rect 1828 131 1839 199
-rect 1873 131 1881 199
-rect 1828 115 1881 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 217 1201 270 1217
-rect 217 861 225 1201
-rect 259 861 270 1201
-rect 217 817 270 861
-rect 300 817 342 1217
-rect 372 1201 425 1217
-rect 372 861 383 1201
-rect 417 861 425 1201
-rect 372 817 425 861
-rect 493 1201 546 1217
-rect 110 617 163 657
-rect 493 725 501 1201
-rect 535 725 546 1201
-rect 493 617 546 725
-rect 576 617 618 1217
-rect 648 1201 738 1217
-rect 648 657 659 1201
-rect 727 657 738 1201
-rect 648 617 738 657
-rect 768 617 810 1217
-rect 840 1201 896 1217
-rect 840 725 851 1201
-rect 885 725 896 1201
-rect 840 617 896 725
-rect 926 617 968 1217
-rect 998 1201 1088 1217
-rect 998 725 1009 1201
-rect 1077 725 1088 1201
-rect 998 617 1088 725
-rect 1118 617 1160 1217
-rect 1190 1201 1246 1217
-rect 1190 657 1201 1201
-rect 1235 657 1246 1201
-rect 1190 617 1246 657
-rect 1276 1201 1329 1217
-rect 1276 657 1287 1201
-rect 1321 657 1329 1201
-rect 1383 1201 1436 1217
-rect 1383 861 1391 1201
-rect 1425 861 1436 1201
-rect 1383 817 1436 861
-rect 1466 817 1508 1217
-rect 1538 1201 1591 1217
-rect 1538 861 1549 1201
-rect 1583 861 1591 1201
-rect 1538 817 1591 861
-rect 1659 1201 1712 1217
-rect 1659 861 1667 1201
-rect 1701 861 1712 1201
-rect 1659 817 1712 861
-rect 1742 1201 1798 1217
-rect 1742 861 1753 1201
-rect 1787 861 1798 1201
-rect 1742 817 1798 861
-rect 1828 1201 1881 1217
-rect 1828 861 1839 1201
-rect 1873 861 1881 1201
-rect 1828 817 1881 861
-rect 1276 617 1329 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 225 131 259 199
-rect 311 131 345 199
-rect 397 131 431 199
-rect 501 131 535 267
-rect 659 131 727 267
-rect 851 131 885 199
-rect 1009 131 1077 267
-rect 1201 131 1235 267
-rect 1287 131 1321 267
-rect 1391 131 1425 199
-rect 1477 131 1511 199
-rect 1563 131 1597 199
-rect 1667 131 1701 199
-rect 1753 131 1787 199
-rect 1839 131 1873 199
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 225 861 259 1201
-rect 383 861 417 1201
-rect 501 725 535 1201
-rect 659 657 727 1201
-rect 851 725 885 1201
-rect 1009 725 1077 1201
-rect 1201 657 1235 1201
-rect 1287 657 1321 1201
-rect 1391 861 1425 1201
-rect 1549 861 1583 1201
-rect 1667 861 1701 1201
-rect 1753 861 1787 1201
-rect 1839 861 1873 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-rect 1658 1271 1682 1305
-rect 1716 1271 1740 1305
-rect 1794 1271 1818 1305
-rect 1852 1271 1876 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-rect 1682 1271 1716 1305
-rect 1818 1271 1852 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 270 1217 300 1243
-rect 342 1217 372 1243
-rect 546 1217 576 1243
-rect 618 1217 648 1243
-rect 738 1217 768 1243
-rect 810 1217 840 1243
-rect 896 1217 926 1243
-rect 968 1217 998 1243
-rect 1088 1217 1118 1243
-rect 1160 1217 1190 1243
-rect 1246 1217 1276 1243
-rect 1436 1217 1466 1243
-rect 1508 1217 1538 1243
-rect 1712 1217 1742 1243
-rect 1798 1217 1828 1243
-rect 80 494 110 617
-rect 79 478 133 494
-rect 79 444 89 478
-rect 123 444 133 478
-rect 79 428 133 444
-rect 79 427 110 428
-rect 80 315 110 427
-rect 270 351 300 817
-rect 342 584 372 817
-rect 342 568 415 584
-rect 342 534 371 568
-rect 405 534 415 568
-rect 342 518 415 534
-rect 219 335 300 351
-rect 219 301 229 335
-rect 263 301 300 335
-rect 219 285 300 301
-rect 270 263 300 285
-rect 356 263 386 518
-rect 546 477 576 617
-rect 618 586 648 617
-rect 618 570 672 586
-rect 618 536 628 570
-rect 662 536 672 570
-rect 618 520 672 536
-rect 546 461 600 477
-rect 738 475 768 617
-rect 810 580 840 617
-rect 896 580 926 617
-rect 810 570 926 580
-rect 810 536 842 570
-rect 876 536 926 570
-rect 810 526 926 536
-rect 968 475 998 617
-rect 1088 586 1118 617
-rect 1064 570 1118 586
-rect 1064 536 1074 570
-rect 1108 536 1118 570
-rect 1064 520 1118 536
-rect 546 427 556 461
-rect 590 427 600 461
-rect 546 411 600 427
-rect 642 445 1094 475
-rect 546 315 576 411
-rect 642 367 672 445
-rect 1064 403 1094 445
-rect 1160 471 1190 617
-rect 1246 586 1276 617
-rect 1246 570 1317 586
-rect 1246 556 1273 570
-rect 1257 536 1273 556
-rect 1307 536 1317 570
-rect 1257 520 1317 536
-rect 1160 455 1214 471
-rect 1160 421 1170 455
-rect 1204 421 1214 455
-rect 1160 405 1214 421
-rect 618 337 672 367
-rect 714 387 768 403
-rect 714 353 724 387
-rect 758 353 768 387
-rect 714 337 768 353
-rect 618 315 648 337
-rect 738 315 768 337
-rect 810 387 926 397
-rect 810 353 842 387
-rect 876 353 926 387
-rect 810 343 926 353
-rect 810 315 840 343
-rect 896 315 926 343
-rect 968 387 1022 403
-rect 968 353 978 387
-rect 1012 353 1022 387
-rect 968 337 1022 353
-rect 1064 387 1118 403
-rect 1064 353 1074 387
-rect 1108 353 1118 387
-rect 1064 337 1118 353
-rect 968 315 998 337
-rect 1088 315 1118 337
-rect 1160 315 1190 405
-rect 1257 367 1287 520
-rect 1436 403 1466 817
-rect 1246 337 1287 367
-rect 1399 387 1466 403
-rect 1399 353 1409 387
-rect 1443 353 1466 387
-rect 1399 337 1466 353
-rect 1246 315 1276 337
-rect 1423 336 1466 337
-rect 1436 263 1466 336
-rect 1508 351 1538 817
-rect 1712 601 1742 817
-rect 1702 571 1742 601
-rect 1702 471 1732 571
-rect 1798 512 1828 817
-rect 1677 455 1732 471
-rect 1677 421 1687 455
-rect 1721 421 1732 455
-rect 1774 496 1828 512
-rect 1774 462 1784 496
-rect 1818 462 1828 496
-rect 1774 446 1828 462
-rect 1677 405 1732 421
-rect 1702 360 1732 405
-rect 1508 335 1589 351
-rect 1508 301 1545 335
-rect 1579 301 1589 335
-rect 1702 330 1742 360
-rect 1508 285 1589 301
-rect 1522 263 1552 285
-rect 1712 263 1742 330
-rect 1798 263 1828 446
-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 444 123 478
-rect 371 534 405 568
-rect 229 301 263 335
-rect 628 536 662 570
-rect 842 536 876 570
-rect 1074 536 1108 570
-rect 556 427 590 461
-rect 1273 536 1307 570
-rect 1170 421 1204 455
-rect 724 353 758 387
-rect 842 353 876 387
-rect 978 353 1012 387
-rect 1074 353 1108 387
-rect 1409 353 1443 387
-rect 1687 421 1721 455
-rect 1784 462 1818 496
-rect 1545 301 1579 335
-<< locali >>
-rect 0 1311 1914 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1682 1311
-rect 1716 1271 1818 1311
-rect 1852 1271 1914 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 494 81 649
-rect 121 565 155 657
-rect 225 1201 259 1217
-rect 121 531 191 565
-rect 47 478 123 494
-rect 47 444 89 478
-rect 89 428 123 444
-rect 157 335 191 531
-rect 225 421 259 861
-rect 383 1201 417 1271
-rect 383 845 417 861
-rect 501 1201 535 1271
-rect 501 709 535 725
-rect 659 1201 727 1217
-rect 851 1201 885 1271
-rect 851 709 885 725
-rect 1009 1201 1077 1217
-rect 659 654 727 657
-rect 1009 654 1077 725
-rect 405 620 727 654
-rect 910 620 1077 654
-rect 1201 1201 1235 1271
-rect 1201 641 1235 657
-rect 1287 1201 1321 1217
-rect 1391 1201 1425 1217
-rect 1391 773 1425 861
-rect 1549 1201 1583 1271
-rect 1549 845 1583 861
-rect 1667 1201 1701 1217
-rect 1391 739 1511 773
-rect 1287 654 1321 657
-rect 1287 620 1377 654
-rect 405 584 439 620
-rect 371 568 439 584
-rect 405 534 439 568
-rect 371 518 439 534
-rect 225 387 345 421
-rect 229 335 263 351
-rect 121 301 229 335
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 301
-rect 121 115 155 131
-rect 225 199 259 215
-rect 225 61 259 131
-rect 311 199 345 353
-rect 405 370 439 518
-rect 628 570 662 586
-rect 628 535 662 536
-rect 842 570 876 586
-rect 662 501 758 535
-rect 556 461 590 477
-rect 556 411 590 427
-rect 724 387 758 501
-rect 842 387 876 536
-rect 405 336 690 370
-rect 724 337 758 353
-rect 842 337 876 353
-rect 910 387 944 620
-rect 1074 570 1108 586
-rect 1074 535 1108 536
-rect 656 283 690 336
-rect 910 303 944 353
-rect 978 501 1074 535
-rect 1273 570 1307 586
-rect 1273 535 1307 536
-rect 978 387 1012 501
-rect 1341 455 1377 620
-rect 1154 421 1170 455
-rect 1204 421 1220 455
-rect 1287 421 1377 455
-rect 1477 455 1511 739
-rect 1667 609 1701 861
-rect 1753 1201 1787 1271
-rect 1753 845 1787 861
-rect 1839 1201 1873 1217
-rect 1839 683 1873 861
-rect 1872 666 1873 683
-rect 1872 649 1896 666
-rect 1839 632 1896 649
-rect 1667 570 1701 575
-rect 1667 536 1818 570
-rect 1784 496 1818 536
-rect 1477 421 1687 455
-rect 1721 421 1737 455
-rect 1287 387 1321 421
-rect 1058 353 1074 387
-rect 1108 353 1321 387
-rect 978 337 1012 353
-rect 501 267 535 283
-rect 311 115 345 131
-rect 397 199 431 215
-rect 397 61 431 131
-rect 656 267 727 283
-rect 910 269 1077 303
-rect 656 249 659 267
-rect 501 61 535 131
-rect 1009 267 1077 269
-rect 659 115 727 131
-rect 851 199 885 215
-rect 851 61 885 131
-rect 1009 115 1077 131
-rect 1201 267 1235 283
-rect 1201 61 1235 131
-rect 1287 267 1321 353
-rect 1409 387 1443 403
-rect 1409 337 1443 353
-rect 1287 115 1321 131
-rect 1391 199 1425 215
-rect 1391 61 1425 131
-rect 1477 199 1511 421
-rect 1784 387 1818 462
-rect 1667 353 1818 387
-rect 1545 335 1579 351
-rect 1477 115 1511 131
-rect 1563 199 1597 215
-rect 1563 61 1597 131
-rect 1667 199 1701 353
-rect 1862 320 1896 632
-rect 1839 286 1896 320
-rect 1667 115 1701 131
-rect 1753 199 1787 215
-rect 1753 61 1787 131
-rect 1839 199 1873 286
-rect 1839 115 1873 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1914 61
-rect 0 0 1914 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 1682 1305 1716 1311
-rect 1682 1277 1716 1305
-rect 1818 1305 1852 1311
-rect 1818 1277 1852 1305
-rect 47 649 81 683
-rect 311 353 345 387
-rect 229 301 263 313
-rect 229 279 263 301
-rect 628 501 662 535
-rect 556 427 590 461
-rect 824 353 842 387
-rect 842 353 858 387
-rect 910 353 944 387
-rect 1074 501 1108 535
-rect 1273 501 1307 535
-rect 1170 421 1204 455
-rect 1838 649 1872 683
-rect 1667 575 1701 609
-rect 1687 421 1721 455
-rect 1409 353 1443 387
-rect 1545 301 1579 313
-rect 1545 279 1579 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-<< metal1 >>
-rect 0 1311 1914 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1682 1311
-rect 1716 1277 1818 1311
-rect 1852 1277 1914 1311
-rect 0 1271 1914 1277
-rect 35 683 93 689
-rect 1826 683 1884 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 1804 649 1838 683
-rect 1872 649 1884 683
-rect 35 643 93 649
-rect 1826 643 1884 649
-rect 1655 609 1713 615
-rect 1632 575 1667 609
-rect 1701 575 1713 609
-rect 1655 569 1713 575
-rect 616 535 674 541
-rect 1062 535 1120 541
-rect 1261 535 1319 541
-rect 616 501 628 535
-rect 662 501 1074 535
-rect 1108 501 1273 535
-rect 1307 501 1319 535
-rect 616 495 674 501
-rect 1062 495 1120 501
-rect 1261 495 1319 501
-rect 544 461 602 467
-rect 544 427 556 461
-rect 590 427 624 461
-rect 1158 455 1216 461
-rect 1675 455 1733 461
-rect 544 421 602 427
-rect 1158 421 1170 455
-rect 1204 421 1687 455
-rect 1721 421 1733 455
-rect 1158 415 1216 421
-rect 1675 415 1733 421
-rect 299 387 357 393
-rect 812 387 870 393
-rect 299 353 311 387
-rect 345 353 824 387
-rect 858 353 870 387
-rect 299 347 357 353
-rect 812 347 870 353
-rect 898 387 956 393
-rect 1397 387 1455 393
-rect 898 353 910 387
-rect 944 353 1409 387
-rect 1443 353 1455 387
-rect 898 347 956 353
-rect 1397 347 1455 353
-rect 217 313 275 319
-rect 1533 313 1591 319
-rect 217 279 229 313
-rect 263 279 1545 313
-rect 1579 279 1591 313
-rect 217 273 275 279
-rect 1533 273 1591 279
-rect 0 55 1914 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1914 55
-rect 0 0 1914 21
-<< labels >>
-rlabel metal1 65 666 65 666 1 RN
-port 1 n
-rlabel metal1 573 444 573 444 1 D
-port 2 n
-rlabel metal1 1290 518 1290 518 1 CK
-port 3 n
-rlabel metal1 1855 666 1855 666 1 Q
-port 4 n
-rlabel metal1 1685 592 1685 592 1 QN
-port 5 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__dffs_1.mag b/18T_ms/sky130_osu_sc_18T_ms__dffs_1.mag
deleted file mode 100644
index bcfa75b..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__dffs_1.mag
+++ /dev/null
@@ -1,721 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864603
-<< checkpaint >>
-rect -1210 -1243 2840 2575
-<< nwell >>
-rect -10 581 1741 1341
-<< nmos >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 356 115 386 315
-rect 428 115 458 315
-rect 548 115 578 315
-rect 620 115 650 315
-rect 706 115 736 315
-rect 778 115 808 315
-rect 898 115 928 315
-rect 970 115 1000 315
-rect 1056 115 1086 315
-rect 1246 115 1276 263
-rect 1318 115 1348 263
-rect 1522 115 1552 315
-rect 1608 115 1638 315
-<< pmos >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 356 617 386 1217
-rect 428 617 458 1217
-rect 548 617 578 1217
-rect 620 617 650 1217
-rect 706 617 736 1217
-rect 778 617 808 1217
-rect 898 617 928 1217
-rect 970 617 1000 1217
-rect 1056 617 1086 1217
-rect 1246 817 1276 1217
-rect 1332 817 1362 1217
-rect 1522 617 1552 1217
-rect 1608 617 1638 1217
-<< ndiff >>
-rect 303 267 356 315
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 115 152 263
-rect 182 199 235 263
-rect 182 131 193 199
-rect 227 131 235 199
-rect 182 115 235 131
-rect 303 131 311 267
-rect 345 131 356 267
-rect 303 115 356 131
-rect 386 115 428 315
-rect 458 267 548 315
-rect 458 131 469 267
-rect 537 131 548 267
-rect 458 115 548 131
-rect 578 115 620 315
-rect 650 199 706 315
-rect 650 131 661 199
-rect 695 131 706 199
-rect 650 115 706 131
-rect 736 115 778 315
-rect 808 267 898 315
-rect 808 131 819 267
-rect 887 131 898 267
-rect 808 115 898 131
-rect 928 115 970 315
-rect 1000 267 1056 315
-rect 1000 131 1011 267
-rect 1045 131 1056 267
-rect 1000 115 1056 131
-rect 1086 267 1139 315
-rect 1086 131 1097 267
-rect 1131 131 1139 267
-rect 1086 115 1139 131
-rect 1193 199 1246 263
-rect 1193 131 1201 199
-rect 1235 131 1246 199
-rect 1193 115 1246 131
-rect 1276 115 1318 263
-rect 1348 199 1401 263
-rect 1348 131 1359 199
-rect 1393 131 1401 199
-rect 1348 115 1401 131
-rect 1469 199 1522 315
-rect 1469 131 1477 199
-rect 1511 131 1522 199
-rect 1469 115 1522 131
-rect 1552 199 1608 315
-rect 1552 131 1563 199
-rect 1597 131 1608 199
-rect 1552 115 1608 131
-rect 1638 199 1691 315
-rect 1638 131 1649 199
-rect 1683 131 1691 199
-rect 1638 115 1691 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 817 80 929
-rect 110 1201 166 1217
-rect 110 929 121 1201
-rect 155 929 166 1201
-rect 110 817 166 929
-rect 196 1201 249 1217
-rect 196 929 207 1201
-rect 241 929 249 1201
-rect 196 817 249 929
-rect 303 1201 356 1217
-rect 303 725 311 1201
-rect 345 725 356 1201
-rect 303 617 356 725
-rect 386 617 428 1217
-rect 458 1201 548 1217
-rect 458 657 469 1201
-rect 537 657 548 1201
-rect 458 617 548 657
-rect 578 617 620 1217
-rect 650 1201 706 1217
-rect 650 725 661 1201
-rect 695 725 706 1201
-rect 650 617 706 725
-rect 736 617 778 1217
-rect 808 1201 898 1217
-rect 808 725 819 1201
-rect 887 725 898 1201
-rect 808 617 898 725
-rect 928 617 970 1217
-rect 1000 1201 1056 1217
-rect 1000 657 1011 1201
-rect 1045 657 1056 1201
-rect 1000 617 1056 657
-rect 1086 1201 1139 1217
-rect 1086 657 1097 1201
-rect 1131 657 1139 1201
-rect 1193 1201 1246 1217
-rect 1193 929 1201 1201
-rect 1235 929 1246 1201
-rect 1193 817 1246 929
-rect 1276 1201 1332 1217
-rect 1276 929 1287 1201
-rect 1321 929 1332 1201
-rect 1276 817 1332 929
-rect 1362 1201 1415 1217
-rect 1362 929 1373 1201
-rect 1407 929 1415 1201
-rect 1362 817 1415 929
-rect 1469 1201 1522 1217
-rect 1469 861 1477 1201
-rect 1511 861 1522 1201
-rect 1086 617 1139 657
-rect 1469 617 1522 861
-rect 1552 1201 1608 1217
-rect 1552 861 1563 1201
-rect 1597 861 1608 1201
-rect 1552 617 1608 861
-rect 1638 1201 1691 1217
-rect 1638 861 1649 1201
-rect 1683 861 1691 1201
-rect 1638 617 1691 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 193 131 227 199
-rect 311 131 345 267
-rect 469 131 537 267
-rect 661 131 695 199
-rect 819 131 887 267
-rect 1011 131 1045 267
-rect 1097 131 1131 267
-rect 1201 131 1235 199
-rect 1359 131 1393 199
-rect 1477 131 1511 199
-rect 1563 131 1597 199
-rect 1649 131 1683 199
-<< pdiffc >>
-rect 35 929 69 1201
-rect 121 929 155 1201
-rect 207 929 241 1201
-rect 311 725 345 1201
-rect 469 657 537 1201
-rect 661 725 695 1201
-rect 819 725 887 1201
-rect 1011 657 1045 1201
-rect 1097 657 1131 1201
-rect 1201 929 1235 1201
-rect 1287 929 1321 1201
-rect 1373 929 1407 1201
-rect 1477 861 1511 1201
-rect 1563 861 1597 1201
-rect 1649 861 1683 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 356 1217 386 1243
-rect 428 1217 458 1243
-rect 548 1217 578 1243
-rect 620 1217 650 1243
-rect 706 1217 736 1243
-rect 778 1217 808 1243
-rect 898 1217 928 1243
-rect 970 1217 1000 1243
-rect 1056 1217 1086 1243
-rect 1246 1217 1276 1243
-rect 1332 1217 1362 1243
-rect 1522 1217 1552 1243
-rect 1608 1217 1638 1243
-rect 80 403 110 817
-rect 166 494 196 817
-rect 37 387 110 403
-rect 37 353 47 387
-rect 81 353 110 387
-rect 37 337 110 353
-rect 80 263 110 337
-rect 152 478 233 494
-rect 152 444 189 478
-rect 223 444 233 478
-rect 152 428 233 444
-rect 356 477 386 617
-rect 428 586 458 617
-rect 428 570 482 586
-rect 428 536 438 570
-rect 472 536 482 570
-rect 428 520 482 536
-rect 356 461 410 477
-rect 548 475 578 617
-rect 620 580 650 617
-rect 706 580 736 617
-rect 620 570 736 580
-rect 620 536 652 570
-rect 686 536 736 570
-rect 620 526 736 536
-rect 778 475 808 617
-rect 898 586 928 617
-rect 874 570 928 586
-rect 874 536 884 570
-rect 918 536 928 570
-rect 874 520 928 536
-rect 152 263 182 428
-rect 356 427 366 461
-rect 400 427 410 461
-rect 356 411 410 427
-rect 452 445 904 475
-rect 356 315 386 411
-rect 452 367 482 445
-rect 874 403 904 445
-rect 970 471 1000 617
-rect 1056 586 1086 617
-rect 1056 570 1127 586
-rect 1056 556 1083 570
-rect 1067 536 1083 556
-rect 1117 536 1127 570
-rect 1067 520 1127 536
-rect 970 455 1024 471
-rect 970 421 980 455
-rect 1014 421 1024 455
-rect 970 405 1024 421
-rect 428 337 482 367
-rect 524 387 578 403
-rect 524 353 534 387
-rect 568 353 578 387
-rect 524 337 578 353
-rect 428 315 458 337
-rect 548 315 578 337
-rect 620 387 736 397
-rect 620 353 652 387
-rect 686 353 736 387
-rect 620 343 736 353
-rect 620 315 650 343
-rect 706 315 736 343
-rect 778 387 832 403
-rect 778 353 788 387
-rect 822 353 832 387
-rect 778 337 832 353
-rect 874 387 928 403
-rect 874 353 884 387
-rect 918 353 928 387
-rect 874 337 928 353
-rect 778 315 808 337
-rect 898 315 928 337
-rect 970 315 1000 405
-rect 1067 367 1097 520
-rect 1246 403 1276 817
-rect 1056 337 1097 367
-rect 1193 387 1276 403
-rect 1193 353 1203 387
-rect 1237 353 1276 387
-rect 1193 337 1276 353
-rect 1056 315 1086 337
-rect 1246 263 1276 337
-rect 1332 351 1362 817
-rect 1522 601 1552 617
-rect 1512 571 1552 601
-rect 1512 471 1542 571
-rect 1608 512 1638 617
-rect 1487 455 1542 471
-rect 1487 421 1497 455
-rect 1531 421 1542 455
-rect 1584 496 1638 512
-rect 1584 462 1594 496
-rect 1628 462 1638 496
-rect 1584 446 1638 462
-rect 1487 405 1542 421
-rect 1512 360 1542 405
-rect 1332 335 1399 351
-rect 1318 301 1355 335
-rect 1389 301 1399 335
-rect 1512 330 1552 360
-rect 1522 315 1552 330
-rect 1608 315 1638 446
-rect 1318 285 1399 301
-rect 1318 263 1348 285
-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 353 81 387
-rect 189 444 223 478
-rect 438 536 472 570
-rect 652 536 686 570
-rect 884 536 918 570
-rect 366 427 400 461
-rect 1083 536 1117 570
-rect 980 421 1014 455
-rect 534 353 568 387
-rect 652 353 686 387
-rect 788 353 822 387
-rect 884 353 918 387
-rect 1203 353 1237 387
-rect 1497 421 1531 455
-rect 1594 462 1628 496
-rect 1355 301 1389 335
-<< locali >>
-rect 0 1311 1738 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1738 1311
-rect 35 1201 69 1271
-rect 35 913 69 929
-rect 121 1201 155 1217
-rect 47 387 81 403
-rect 47 313 81 353
-rect 121 387 155 929
-rect 207 1201 241 1271
-rect 207 913 241 929
-rect 311 1201 345 1271
-rect 311 709 345 725
-rect 469 1201 537 1217
-rect 661 1201 695 1271
-rect 661 709 695 725
-rect 819 1201 887 1217
-rect 469 654 537 657
-rect 819 654 887 725
-rect 121 233 155 353
-rect 189 620 537 654
-rect 720 620 887 654
-rect 1011 1201 1045 1271
-rect 1011 641 1045 657
-rect 1097 1201 1131 1217
-rect 1201 1201 1235 1271
-rect 1201 913 1235 929
-rect 1287 1201 1321 1217
-rect 1097 654 1131 657
-rect 1097 620 1187 654
-rect 189 478 223 620
-rect 438 570 472 586
-rect 438 535 472 536
-rect 652 570 686 586
-rect 472 501 568 535
-rect 189 370 223 444
-rect 366 461 400 477
-rect 366 411 400 427
-rect 534 387 568 501
-rect 652 387 686 536
-rect 189 336 500 370
-rect 534 337 568 353
-rect 652 337 686 353
-rect 720 387 754 620
-rect 884 570 918 586
-rect 884 535 918 536
-rect 466 283 500 336
-rect 720 303 754 353
-rect 788 501 884 535
-rect 1083 570 1117 586
-rect 1083 535 1117 536
-rect 788 387 822 501
-rect 1151 467 1187 620
-rect 964 421 980 455
-rect 1014 421 1030 455
-rect 1097 433 1187 467
-rect 1287 455 1321 929
-rect 1373 1201 1407 1271
-rect 1373 913 1407 929
-rect 1477 1201 1511 1217
-rect 1477 609 1511 861
-rect 1563 1201 1597 1271
-rect 1563 845 1597 861
-rect 1649 1201 1683 1217
-rect 1649 683 1683 861
-rect 1682 666 1683 683
-rect 1682 649 1706 666
-rect 1649 632 1706 649
-rect 1477 570 1511 575
-rect 1477 536 1628 570
-rect 1594 496 1628 536
-rect 1097 387 1131 433
-rect 1287 421 1497 455
-rect 1531 421 1547 455
-rect 868 353 884 387
-rect 918 353 1131 387
-rect 1187 353 1203 387
-rect 1237 353 1253 387
-rect 788 337 822 353
-rect 35 199 155 233
-rect 311 267 345 283
-rect 193 199 227 215
-rect 35 115 69 131
-rect 193 61 227 131
-rect 466 267 537 283
-rect 720 269 887 303
-rect 466 249 469 267
-rect 311 61 345 131
-rect 819 267 887 269
-rect 469 115 537 131
-rect 661 199 695 215
-rect 661 61 695 131
-rect 819 115 887 131
-rect 1011 267 1045 283
-rect 1011 61 1045 131
-rect 1097 267 1131 353
-rect 1287 233 1321 421
-rect 1594 387 1628 462
-rect 1477 353 1628 387
-rect 1355 335 1389 351
-rect 1097 115 1131 131
-rect 1201 199 1321 233
-rect 1359 199 1393 215
-rect 1201 115 1235 131
-rect 1359 61 1393 131
-rect 1477 199 1511 353
-rect 1672 320 1706 632
-rect 1649 286 1706 320
-rect 1477 115 1511 131
-rect 1563 199 1597 215
-rect 1563 61 1597 131
-rect 1649 199 1683 286
-rect 1649 115 1683 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 47 279 81 313
-rect 121 353 155 387
-rect 438 501 472 535
-rect 366 427 400 461
-rect 634 353 652 387
-rect 652 353 668 387
-rect 720 353 754 387
-rect 884 501 918 535
-rect 1083 501 1117 535
-rect 980 421 1014 455
-rect 1648 649 1682 683
-rect 1477 575 1511 609
-rect 1497 421 1531 455
-rect 1203 353 1237 387
-rect 1355 301 1389 313
-rect 1355 279 1389 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 1311 1738 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1738 1311
-rect 0 1271 1738 1277
-rect 1636 683 1694 689
-rect 1614 649 1648 683
-rect 1682 649 1694 683
-rect 1636 643 1694 649
-rect 1465 609 1523 615
-rect 1442 575 1477 609
-rect 1511 575 1523 609
-rect 1465 569 1523 575
-rect 426 535 484 541
-rect 872 535 930 541
-rect 1071 535 1129 541
-rect 426 501 438 535
-rect 472 501 884 535
-rect 918 501 1083 535
-rect 1117 501 1129 535
-rect 426 495 484 501
-rect 872 495 930 501
-rect 1071 495 1129 501
-rect 354 461 412 467
-rect 354 427 366 461
-rect 400 427 434 461
-rect 968 455 1026 461
-rect 1485 455 1543 461
-rect 354 421 412 427
-rect 968 421 980 455
-rect 1014 421 1497 455
-rect 1531 421 1543 455
-rect 968 415 1026 421
-rect 1485 415 1543 421
-rect 109 387 167 393
-rect 622 387 680 393
-rect 109 353 121 387
-rect 155 353 634 387
-rect 668 353 680 387
-rect 109 347 167 353
-rect 622 347 680 353
-rect 708 387 766 393
-rect 1191 387 1249 393
-rect 708 353 720 387
-rect 754 353 1203 387
-rect 1237 353 1249 387
-rect 708 347 766 353
-rect 1191 347 1249 353
-rect 35 313 93 319
-rect 1343 313 1401 319
-rect 35 279 47 313
-rect 81 279 1355 313
-rect 1389 279 1401 313
-rect 35 273 93 279
-rect 1343 273 1401 279
-rect 0 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 444 383 444 1 D
-port 1 n
-rlabel viali 1100 518 1100 518 1 CK
-port 2 n
-rlabel viali 1665 666 1665 666 1 Q
-port 4 n
-rlabel viali 1495 592 1495 592 1 QN
-port 3 n
-rlabel viali 64 296 64 296 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__dffs_l.mag b/18T_ms/sky130_osu_sc_18T_ms__dffs_l.mag
deleted file mode 100644
index 9584d34..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__dffs_l.mag
+++ /dev/null
@@ -1,721 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864604
-<< checkpaint >>
-rect -1210 -1243 2840 2575
-<< nwell >>
-rect -10 581 1741 1341
-<< nmos >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 356 115 386 315
-rect 428 115 458 315
-rect 548 115 578 315
-rect 620 115 650 315
-rect 706 115 736 315
-rect 778 115 808 315
-rect 898 115 928 315
-rect 970 115 1000 315
-rect 1056 115 1086 315
-rect 1246 115 1276 263
-rect 1318 115 1348 263
-rect 1522 115 1552 263
-rect 1608 115 1638 263
-<< pmos >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 356 617 386 1217
-rect 428 617 458 1217
-rect 548 617 578 1217
-rect 620 617 650 1217
-rect 706 617 736 1217
-rect 778 617 808 1217
-rect 898 617 928 1217
-rect 970 617 1000 1217
-rect 1056 617 1086 1217
-rect 1246 817 1276 1217
-rect 1332 817 1362 1217
-rect 1522 817 1552 1217
-rect 1608 817 1638 1217
-<< ndiff >>
-rect 303 267 356 315
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 115 152 263
-rect 182 199 235 263
-rect 182 131 193 199
-rect 227 131 235 199
-rect 182 115 235 131
-rect 303 131 311 267
-rect 345 131 356 267
-rect 303 115 356 131
-rect 386 115 428 315
-rect 458 267 548 315
-rect 458 131 469 267
-rect 537 131 548 267
-rect 458 115 548 131
-rect 578 115 620 315
-rect 650 199 706 315
-rect 650 131 661 199
-rect 695 131 706 199
-rect 650 115 706 131
-rect 736 115 778 315
-rect 808 267 898 315
-rect 808 131 819 267
-rect 887 131 898 267
-rect 808 115 898 131
-rect 928 115 970 315
-rect 1000 267 1056 315
-rect 1000 131 1011 267
-rect 1045 131 1056 267
-rect 1000 115 1056 131
-rect 1086 267 1139 315
-rect 1086 131 1097 267
-rect 1131 131 1139 267
-rect 1086 115 1139 131
-rect 1193 199 1246 263
-rect 1193 131 1201 199
-rect 1235 131 1246 199
-rect 1193 115 1246 131
-rect 1276 115 1318 263
-rect 1348 199 1401 263
-rect 1348 131 1359 199
-rect 1393 131 1401 199
-rect 1348 115 1401 131
-rect 1469 199 1522 263
-rect 1469 131 1477 199
-rect 1511 131 1522 199
-rect 1469 115 1522 131
-rect 1552 199 1608 263
-rect 1552 131 1563 199
-rect 1597 131 1608 199
-rect 1552 115 1608 131
-rect 1638 199 1691 263
-rect 1638 131 1649 199
-rect 1683 131 1691 199
-rect 1638 115 1691 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 817 80 929
-rect 110 1201 166 1217
-rect 110 929 121 1201
-rect 155 929 166 1201
-rect 110 817 166 929
-rect 196 1201 249 1217
-rect 196 929 207 1201
-rect 241 929 249 1201
-rect 196 817 249 929
-rect 303 1201 356 1217
-rect 303 725 311 1201
-rect 345 725 356 1201
-rect 303 617 356 725
-rect 386 617 428 1217
-rect 458 1201 548 1217
-rect 458 657 469 1201
-rect 537 657 548 1201
-rect 458 617 548 657
-rect 578 617 620 1217
-rect 650 1201 706 1217
-rect 650 725 661 1201
-rect 695 725 706 1201
-rect 650 617 706 725
-rect 736 617 778 1217
-rect 808 1201 898 1217
-rect 808 725 819 1201
-rect 887 725 898 1201
-rect 808 617 898 725
-rect 928 617 970 1217
-rect 1000 1201 1056 1217
-rect 1000 657 1011 1201
-rect 1045 657 1056 1201
-rect 1000 617 1056 657
-rect 1086 1201 1139 1217
-rect 1086 657 1097 1201
-rect 1131 657 1139 1201
-rect 1193 1201 1246 1217
-rect 1193 929 1201 1201
-rect 1235 929 1246 1201
-rect 1193 817 1246 929
-rect 1276 1201 1332 1217
-rect 1276 929 1287 1201
-rect 1321 929 1332 1201
-rect 1276 817 1332 929
-rect 1362 1201 1415 1217
-rect 1362 929 1373 1201
-rect 1407 929 1415 1201
-rect 1362 817 1415 929
-rect 1469 1201 1522 1217
-rect 1469 861 1477 1201
-rect 1511 861 1522 1201
-rect 1469 817 1522 861
-rect 1552 1201 1608 1217
-rect 1552 861 1563 1201
-rect 1597 861 1608 1201
-rect 1552 817 1608 861
-rect 1638 1201 1691 1217
-rect 1638 861 1649 1201
-rect 1683 861 1691 1201
-rect 1638 817 1691 861
-rect 1086 617 1139 657
-<< ndiffc >>
-rect 35 131 69 199
-rect 193 131 227 199
-rect 311 131 345 267
-rect 469 131 537 267
-rect 661 131 695 199
-rect 819 131 887 267
-rect 1011 131 1045 267
-rect 1097 131 1131 267
-rect 1201 131 1235 199
-rect 1359 131 1393 199
-rect 1477 131 1511 199
-rect 1563 131 1597 199
-rect 1649 131 1683 199
-<< pdiffc >>
-rect 35 929 69 1201
-rect 121 929 155 1201
-rect 207 929 241 1201
-rect 311 725 345 1201
-rect 469 657 537 1201
-rect 661 725 695 1201
-rect 819 725 887 1201
-rect 1011 657 1045 1201
-rect 1097 657 1131 1201
-rect 1201 929 1235 1201
-rect 1287 929 1321 1201
-rect 1373 929 1407 1201
-rect 1477 861 1511 1201
-rect 1563 861 1597 1201
-rect 1649 861 1683 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 356 1217 386 1243
-rect 428 1217 458 1243
-rect 548 1217 578 1243
-rect 620 1217 650 1243
-rect 706 1217 736 1243
-rect 778 1217 808 1243
-rect 898 1217 928 1243
-rect 970 1217 1000 1243
-rect 1056 1217 1086 1243
-rect 1246 1217 1276 1243
-rect 1332 1217 1362 1243
-rect 1522 1217 1552 1243
-rect 1608 1217 1638 1243
-rect 80 403 110 817
-rect 166 494 196 817
-rect 37 387 110 403
-rect 37 353 47 387
-rect 81 353 110 387
-rect 37 337 110 353
-rect 80 263 110 337
-rect 152 478 233 494
-rect 152 444 189 478
-rect 223 444 233 478
-rect 152 428 233 444
-rect 356 477 386 617
-rect 428 586 458 617
-rect 428 570 482 586
-rect 428 536 438 570
-rect 472 536 482 570
-rect 428 520 482 536
-rect 356 461 410 477
-rect 548 475 578 617
-rect 620 580 650 617
-rect 706 580 736 617
-rect 620 570 736 580
-rect 620 536 652 570
-rect 686 536 736 570
-rect 620 526 736 536
-rect 778 475 808 617
-rect 898 586 928 617
-rect 874 570 928 586
-rect 874 536 884 570
-rect 918 536 928 570
-rect 874 520 928 536
-rect 152 263 182 428
-rect 356 427 366 461
-rect 400 427 410 461
-rect 356 411 410 427
-rect 452 445 904 475
-rect 356 315 386 411
-rect 452 367 482 445
-rect 874 403 904 445
-rect 970 471 1000 617
-rect 1056 586 1086 617
-rect 1056 570 1127 586
-rect 1056 556 1083 570
-rect 1067 536 1083 556
-rect 1117 536 1127 570
-rect 1067 520 1127 536
-rect 970 455 1024 471
-rect 970 421 980 455
-rect 1014 421 1024 455
-rect 970 405 1024 421
-rect 428 337 482 367
-rect 524 387 578 403
-rect 524 353 534 387
-rect 568 353 578 387
-rect 524 337 578 353
-rect 428 315 458 337
-rect 548 315 578 337
-rect 620 387 736 397
-rect 620 353 652 387
-rect 686 353 736 387
-rect 620 343 736 353
-rect 620 315 650 343
-rect 706 315 736 343
-rect 778 387 832 403
-rect 778 353 788 387
-rect 822 353 832 387
-rect 778 337 832 353
-rect 874 387 928 403
-rect 874 353 884 387
-rect 918 353 928 387
-rect 874 337 928 353
-rect 778 315 808 337
-rect 898 315 928 337
-rect 970 315 1000 405
-rect 1067 367 1097 520
-rect 1246 403 1276 817
-rect 1056 337 1097 367
-rect 1193 387 1276 403
-rect 1193 353 1203 387
-rect 1237 353 1276 387
-rect 1193 337 1276 353
-rect 1056 315 1086 337
-rect 1246 263 1276 337
-rect 1332 351 1362 817
-rect 1522 601 1552 817
-rect 1512 571 1552 601
-rect 1512 471 1542 571
-rect 1608 512 1638 817
-rect 1487 455 1542 471
-rect 1487 421 1497 455
-rect 1531 421 1542 455
-rect 1584 496 1638 512
-rect 1584 462 1594 496
-rect 1628 462 1638 496
-rect 1584 446 1638 462
-rect 1487 405 1542 421
-rect 1512 360 1542 405
-rect 1332 335 1399 351
-rect 1318 301 1355 335
-rect 1389 301 1399 335
-rect 1512 330 1552 360
-rect 1318 285 1399 301
-rect 1318 263 1348 285
-rect 1522 263 1552 330
-rect 1608 263 1638 446
-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 353 81 387
-rect 189 444 223 478
-rect 438 536 472 570
-rect 652 536 686 570
-rect 884 536 918 570
-rect 366 427 400 461
-rect 1083 536 1117 570
-rect 980 421 1014 455
-rect 534 353 568 387
-rect 652 353 686 387
-rect 788 353 822 387
-rect 884 353 918 387
-rect 1203 353 1237 387
-rect 1497 421 1531 455
-rect 1594 462 1628 496
-rect 1355 301 1389 335
-<< locali >>
-rect 0 1311 1738 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1738 1311
-rect 35 1201 69 1271
-rect 35 913 69 929
-rect 121 1201 155 1217
-rect 47 387 81 403
-rect 47 313 81 353
-rect 121 387 155 929
-rect 207 1201 241 1271
-rect 207 913 241 929
-rect 311 1201 345 1271
-rect 311 709 345 725
-rect 469 1201 537 1217
-rect 661 1201 695 1271
-rect 661 709 695 725
-rect 819 1201 887 1217
-rect 469 654 537 657
-rect 819 654 887 725
-rect 121 233 155 353
-rect 189 620 537 654
-rect 720 620 887 654
-rect 1011 1201 1045 1271
-rect 1011 641 1045 657
-rect 1097 1201 1131 1217
-rect 1201 1201 1235 1271
-rect 1201 913 1235 929
-rect 1287 1201 1321 1217
-rect 1097 654 1131 657
-rect 1097 620 1187 654
-rect 189 478 223 620
-rect 438 570 472 586
-rect 438 535 472 536
-rect 652 570 686 586
-rect 472 501 568 535
-rect 189 370 223 444
-rect 366 461 400 477
-rect 366 411 400 427
-rect 534 387 568 501
-rect 652 387 686 536
-rect 189 336 500 370
-rect 534 337 568 353
-rect 652 337 686 353
-rect 720 387 754 620
-rect 884 570 918 586
-rect 884 535 918 536
-rect 466 283 500 336
-rect 720 303 754 353
-rect 788 501 884 535
-rect 1083 570 1117 586
-rect 1083 535 1117 536
-rect 788 387 822 501
-rect 1151 467 1187 620
-rect 964 421 980 455
-rect 1014 421 1030 455
-rect 1097 433 1187 467
-rect 1287 455 1321 929
-rect 1373 1201 1407 1271
-rect 1373 913 1407 929
-rect 1477 1201 1511 1217
-rect 1477 609 1511 861
-rect 1563 1201 1597 1271
-rect 1563 845 1597 861
-rect 1649 1201 1683 1217
-rect 1649 683 1683 861
-rect 1682 666 1683 683
-rect 1682 649 1706 666
-rect 1649 632 1706 649
-rect 1477 570 1511 575
-rect 1477 536 1628 570
-rect 1594 496 1628 536
-rect 1097 387 1131 433
-rect 1287 421 1497 455
-rect 1531 421 1547 455
-rect 868 353 884 387
-rect 918 353 1131 387
-rect 1187 353 1203 387
-rect 1237 353 1253 387
-rect 788 337 822 353
-rect 35 199 155 233
-rect 311 267 345 283
-rect 193 199 227 215
-rect 35 115 69 131
-rect 193 61 227 131
-rect 466 267 537 283
-rect 720 269 887 303
-rect 466 249 469 267
-rect 311 61 345 131
-rect 819 267 887 269
-rect 469 115 537 131
-rect 661 199 695 215
-rect 661 61 695 131
-rect 819 115 887 131
-rect 1011 267 1045 283
-rect 1011 61 1045 131
-rect 1097 267 1131 353
-rect 1287 233 1321 421
-rect 1594 387 1628 462
-rect 1477 353 1628 387
-rect 1355 335 1389 351
-rect 1097 115 1131 131
-rect 1201 199 1321 233
-rect 1359 199 1393 215
-rect 1201 115 1235 131
-rect 1359 61 1393 131
-rect 1477 199 1511 353
-rect 1672 320 1706 632
-rect 1649 286 1706 320
-rect 1477 115 1511 131
-rect 1563 199 1597 215
-rect 1563 61 1597 131
-rect 1649 199 1683 286
-rect 1649 115 1683 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1738 61
-rect 0 0 1738 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 47 279 81 313
-rect 121 353 155 387
-rect 438 501 472 535
-rect 366 427 400 461
-rect 634 353 652 387
-rect 652 353 668 387
-rect 720 353 754 387
-rect 884 501 918 535
-rect 1083 501 1117 535
-rect 980 421 1014 455
-rect 1648 649 1682 683
-rect 1477 575 1511 609
-rect 1497 421 1531 455
-rect 1203 353 1237 387
-rect 1355 301 1389 313
-rect 1355 279 1389 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-<< metal1 >>
-rect 0 1311 1738 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1738 1311
-rect 0 1271 1738 1277
-rect 1636 683 1694 689
-rect 1614 649 1648 683
-rect 1682 649 1694 683
-rect 1636 643 1694 649
-rect 1465 609 1523 615
-rect 1442 575 1477 609
-rect 1511 575 1523 609
-rect 1465 569 1523 575
-rect 426 535 484 541
-rect 872 535 930 541
-rect 1071 535 1129 541
-rect 426 501 438 535
-rect 472 501 884 535
-rect 918 501 1083 535
-rect 1117 501 1129 535
-rect 426 495 484 501
-rect 872 495 930 501
-rect 1071 495 1129 501
-rect 354 461 412 467
-rect 354 427 366 461
-rect 400 427 434 461
-rect 968 455 1026 461
-rect 1485 455 1543 461
-rect 354 421 412 427
-rect 968 421 980 455
-rect 1014 421 1497 455
-rect 1531 421 1543 455
-rect 968 415 1026 421
-rect 1485 415 1543 421
-rect 109 387 167 393
-rect 622 387 680 393
-rect 109 353 121 387
-rect 155 353 634 387
-rect 668 353 680 387
-rect 109 347 167 353
-rect 622 347 680 353
-rect 708 387 766 393
-rect 1191 387 1249 393
-rect 708 353 720 387
-rect 754 353 1203 387
-rect 1237 353 1249 387
-rect 708 347 766 353
-rect 1191 347 1249 353
-rect 35 313 93 319
-rect 1343 313 1401 319
-rect 35 279 47 313
-rect 81 279 1355 313
-rect 1389 279 1401 313
-rect 35 273 93 279
-rect 1343 273 1401 279
-rect 0 55 1738 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1738 55
-rect 0 0 1738 21
-<< labels >>
-rlabel viali 383 444 383 444 1 D
-port 1 n
-rlabel viali 1100 518 1100 518 1 CK
-port 2 n
-rlabel viali 1665 666 1665 666 1 Q
-port 4 n
-rlabel viali 1495 592 1495 592 1 QN
-port 3 n
-rlabel viali 64 296 64 296 1 SN
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__dffsr_1.mag b/18T_ms/sky130_osu_sc_18T_ms__dffsr_1.mag
deleted file mode 100644
index 72769ea..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__dffsr_1.mag
+++ /dev/null
@@ -1,900 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864604
-<< checkpaint >>
-rect -1210 -1243 3248 2575
-<< nwell >>
-rect -10 581 2090 1341
-<< nmos >>
-rect 80 115 110 315
-rect 272 115 302 263
-rect 370 115 400 315
-rect 442 115 472 315
-rect 632 115 662 315
-rect 704 115 734 315
-rect 824 115 854 315
-rect 896 115 926 315
-rect 982 115 1012 315
-rect 1054 115 1084 315
-rect 1174 115 1204 315
-rect 1246 115 1276 315
-rect 1332 115 1362 315
-rect 1522 115 1552 315
-rect 1594 115 1624 315
-rect 1692 115 1722 263
-rect 1884 115 1914 315
-rect 1970 115 2000 315
-<< pmos >>
-rect 80 617 110 1217
-rect 270 617 300 1217
-rect 356 617 386 1217
-rect 442 617 472 1217
-rect 632 617 662 1217
-rect 704 617 734 1217
-rect 824 617 854 1217
-rect 896 617 926 1217
-rect 982 617 1012 1217
-rect 1054 617 1084 1217
-rect 1174 617 1204 1217
-rect 1246 617 1276 1217
-rect 1332 617 1362 1217
-rect 1522 617 1552 1217
-rect 1608 617 1638 1217
-rect 1694 617 1724 1217
-rect 1884 617 1914 1217
-rect 1970 617 2000 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 317 267 370 315
-rect 317 263 325 267
-rect 110 115 163 131
-rect 219 199 272 263
-rect 219 131 227 199
-rect 261 131 272 199
-rect 219 115 272 131
-rect 302 131 325 263
-rect 359 131 370 267
-rect 302 115 370 131
-rect 400 115 442 315
-rect 472 267 525 315
-rect 472 131 483 267
-rect 517 131 525 267
-rect 472 115 525 131
-rect 579 267 632 315
-rect 579 131 587 267
-rect 621 131 632 267
-rect 579 115 632 131
-rect 662 115 704 315
-rect 734 267 824 315
-rect 734 131 745 267
-rect 813 131 824 267
-rect 734 115 824 131
-rect 854 115 896 315
-rect 926 199 982 315
-rect 926 131 937 199
-rect 971 131 982 199
-rect 926 115 982 131
-rect 1012 115 1054 315
-rect 1084 267 1174 315
-rect 1084 131 1095 267
-rect 1163 131 1174 267
-rect 1084 115 1174 131
-rect 1204 115 1246 315
-rect 1276 267 1332 315
-rect 1276 131 1287 267
-rect 1321 131 1332 267
-rect 1276 115 1332 131
-rect 1362 267 1415 315
-rect 1362 131 1373 267
-rect 1407 131 1415 267
-rect 1362 115 1415 131
-rect 1469 267 1522 315
-rect 1469 131 1477 267
-rect 1511 131 1522 267
-rect 1469 115 1522 131
-rect 1552 115 1594 315
-rect 1624 267 1677 315
-rect 1624 131 1635 267
-rect 1669 263 1677 267
-rect 1831 267 1884 315
-rect 1669 131 1692 263
-rect 1624 115 1692 131
-rect 1722 199 1775 263
-rect 1722 131 1733 199
-rect 1767 131 1775 199
-rect 1722 115 1775 131
-rect 1831 131 1839 267
-rect 1873 131 1884 267
-rect 1831 115 1884 131
-rect 1914 267 1970 315
-rect 1914 131 1925 267
-rect 1959 131 1970 267
-rect 1914 115 1970 131
-rect 2000 267 2053 315
-rect 2000 131 2011 267
-rect 2045 131 2053 267
-rect 2000 115 2053 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-rect 217 1201 270 1217
-rect 217 725 225 1201
-rect 259 725 270 1201
-rect 217 617 270 725
-rect 300 1201 356 1217
-rect 300 725 311 1201
-rect 345 725 356 1201
-rect 300 617 356 725
-rect 386 1201 442 1217
-rect 386 793 397 1201
-rect 431 793 442 1201
-rect 386 617 442 793
-rect 472 1201 525 1217
-rect 472 725 483 1201
-rect 517 725 525 1201
-rect 472 617 525 725
-rect 579 1201 632 1217
-rect 579 725 587 1201
-rect 621 725 632 1201
-rect 579 617 632 725
-rect 662 617 704 1217
-rect 734 1201 824 1217
-rect 734 657 745 1201
-rect 813 657 824 1201
-rect 734 617 824 657
-rect 854 617 896 1217
-rect 926 1201 982 1217
-rect 926 725 937 1201
-rect 971 725 982 1201
-rect 926 617 982 725
-rect 1012 617 1054 1217
-rect 1084 1201 1174 1217
-rect 1084 725 1095 1201
-rect 1163 725 1174 1201
-rect 1084 617 1174 725
-rect 1204 617 1246 1217
-rect 1276 1201 1332 1217
-rect 1276 657 1287 1201
-rect 1321 657 1332 1201
-rect 1276 617 1332 657
-rect 1362 1201 1415 1217
-rect 1362 657 1373 1201
-rect 1407 657 1415 1201
-rect 1362 617 1415 657
-rect 1469 1201 1522 1217
-rect 1469 725 1477 1201
-rect 1511 725 1522 1201
-rect 1469 617 1522 725
-rect 1552 1201 1608 1217
-rect 1552 793 1563 1201
-rect 1597 793 1608 1201
-rect 1552 617 1608 793
-rect 1638 1201 1694 1217
-rect 1638 725 1649 1201
-rect 1683 725 1694 1201
-rect 1638 617 1694 725
-rect 1724 1201 1777 1217
-rect 1724 725 1735 1201
-rect 1769 725 1777 1201
-rect 1724 617 1777 725
-rect 1831 1201 1884 1217
-rect 1831 657 1839 1201
-rect 1873 657 1884 1201
-rect 1831 617 1884 657
-rect 1914 1201 1970 1217
-rect 1914 657 1925 1201
-rect 1959 657 1970 1201
-rect 1914 617 1970 657
-rect 2000 1201 2053 1217
-rect 2000 657 2011 1201
-rect 2045 657 2053 1201
-rect 2000 617 2053 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 227 131 261 199
-rect 325 131 359 267
-rect 483 131 517 267
-rect 587 131 621 267
-rect 745 131 813 267
-rect 937 131 971 199
-rect 1095 131 1163 267
-rect 1287 131 1321 267
-rect 1373 131 1407 267
-rect 1477 131 1511 267
-rect 1635 131 1669 267
-rect 1733 131 1767 199
-rect 1839 131 1873 267
-rect 1925 131 1959 267
-rect 2011 131 2045 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 225 725 259 1201
-rect 311 725 345 1201
-rect 397 793 431 1201
-rect 483 725 517 1201
-rect 587 725 621 1201
-rect 745 657 813 1201
-rect 937 725 971 1201
-rect 1095 725 1163 1201
-rect 1287 657 1321 1201
-rect 1373 657 1407 1201
-rect 1477 725 1511 1201
-rect 1563 793 1597 1201
-rect 1649 725 1683 1201
-rect 1735 725 1769 1201
-rect 1839 657 1873 1201
-rect 1925 657 1959 1201
-rect 2011 657 2045 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-rect 1658 1271 1682 1305
-rect 1716 1271 1740 1305
-rect 1794 1271 1818 1305
-rect 1852 1271 1876 1305
-rect 1930 1271 1954 1305
-rect 1988 1271 2012 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-rect 1682 1271 1716 1305
-rect 1818 1271 1852 1305
-rect 1954 1271 1988 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 270 1217 300 1243
-rect 356 1217 386 1243
-rect 442 1217 472 1243
-rect 632 1217 662 1243
-rect 704 1217 734 1243
-rect 824 1217 854 1243
-rect 896 1217 926 1243
-rect 982 1217 1012 1243
-rect 1054 1217 1084 1243
-rect 1174 1217 1204 1243
-rect 1246 1217 1276 1243
-rect 1332 1217 1362 1243
-rect 1522 1217 1552 1243
-rect 1608 1217 1638 1243
-rect 1694 1217 1724 1243
-rect 1884 1217 1914 1243
-rect 1970 1217 2000 1243
-rect 80 494 110 617
-rect 270 579 300 617
-rect 243 549 300 579
-rect 79 478 133 494
-rect 79 444 89 478
-rect 123 444 133 478
-rect 79 428 133 444
-rect 79 427 110 428
-rect 80 315 110 427
-rect 243 351 273 549
-rect 356 507 386 617
-rect 442 586 472 617
-rect 432 570 486 586
-rect 432 536 442 570
-rect 476 536 486 570
-rect 432 520 486 536
-rect 315 491 386 507
-rect 315 457 325 491
-rect 359 477 386 491
-rect 359 457 400 477
-rect 315 441 400 457
-rect 356 355 400 441
-rect 219 335 273 351
-rect 219 301 229 335
-rect 263 317 273 335
-rect 263 301 302 317
-rect 370 315 400 355
-rect 442 315 472 520
-rect 632 477 662 617
-rect 704 586 734 617
-rect 704 570 758 586
-rect 704 536 714 570
-rect 748 536 758 570
-rect 704 520 758 536
-rect 632 461 686 477
-rect 824 475 854 617
-rect 896 580 926 617
-rect 982 580 1012 617
-rect 896 570 1012 580
-rect 896 536 928 570
-rect 962 536 1012 570
-rect 896 526 1012 536
-rect 1054 475 1084 617
-rect 1174 586 1204 617
-rect 1150 570 1204 586
-rect 1150 536 1160 570
-rect 1194 536 1204 570
-rect 1150 520 1204 536
-rect 632 427 642 461
-rect 676 427 686 461
-rect 632 411 686 427
-rect 728 445 1180 475
-rect 632 315 662 411
-rect 728 367 758 445
-rect 1150 403 1180 445
-rect 1246 471 1276 617
-rect 1332 586 1362 617
-rect 1332 570 1403 586
-rect 1522 580 1552 617
-rect 1332 556 1359 570
-rect 1343 536 1359 556
-rect 1393 536 1403 570
-rect 1343 520 1403 536
-rect 1486 570 1552 580
-rect 1486 536 1502 570
-rect 1536 536 1552 570
-rect 1486 526 1552 536
-rect 1246 455 1300 471
-rect 1246 421 1256 455
-rect 1290 421 1300 455
-rect 1246 405 1300 421
-rect 704 337 758 367
-rect 800 387 854 403
-rect 800 353 810 387
-rect 844 353 854 387
-rect 800 337 854 353
-rect 704 315 734 337
-rect 824 315 854 337
-rect 896 387 1012 397
-rect 896 353 928 387
-rect 962 353 1012 387
-rect 896 343 1012 353
-rect 896 315 926 343
-rect 982 315 1012 343
-rect 1054 387 1108 403
-rect 1054 353 1064 387
-rect 1098 353 1108 387
-rect 1054 337 1108 353
-rect 1150 387 1204 403
-rect 1150 353 1160 387
-rect 1194 353 1204 387
-rect 1150 337 1204 353
-rect 1054 315 1084 337
-rect 1174 315 1204 337
-rect 1246 315 1276 405
-rect 1343 367 1373 520
-rect 1332 337 1373 367
-rect 1486 370 1516 526
-rect 1608 484 1638 617
-rect 1694 579 1724 617
-rect 1884 601 1914 617
-rect 1694 553 1751 579
-rect 1874 571 1914 601
-rect 1694 549 1775 553
-rect 1721 521 1775 549
-rect 1576 468 1638 484
-rect 1576 434 1588 468
-rect 1622 434 1638 468
-rect 1576 418 1638 434
-rect 1486 338 1552 370
-rect 1332 315 1362 337
-rect 1522 315 1552 338
-rect 1594 315 1624 418
-rect 1745 351 1775 521
-rect 1874 471 1904 571
-rect 1970 512 2000 617
-rect 1849 455 1904 471
-rect 1849 421 1859 455
-rect 1893 421 1904 455
-rect 1946 496 2000 512
-rect 1946 462 1956 496
-rect 1990 462 2000 496
-rect 1946 446 2000 462
-rect 1849 405 1904 421
-rect 1874 360 1904 405
-rect 1745 335 1799 351
-rect 1745 315 1755 335
-rect 219 285 302 301
-rect 272 263 302 285
-rect 1692 301 1755 315
-rect 1789 301 1799 335
-rect 1874 330 1914 360
-rect 1884 315 1914 330
-rect 1970 315 2000 446
-rect 1692 285 1799 301
-rect 1692 263 1722 285
-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 444 123 478
-rect 442 536 476 570
-rect 325 457 359 491
-rect 229 301 263 335
-rect 714 536 748 570
-rect 928 536 962 570
-rect 1160 536 1194 570
-rect 642 427 676 461
-rect 1359 536 1393 570
-rect 1502 536 1536 570
-rect 1256 421 1290 455
-rect 810 353 844 387
-rect 928 353 962 387
-rect 1064 353 1098 387
-rect 1160 353 1194 387
-rect 1588 434 1622 468
-rect 1859 421 1893 455
-rect 1956 462 1990 496
-rect 1755 301 1789 335
-<< locali >>
-rect 0 1311 2090 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1682 1311
-rect 1716 1271 1818 1311
-rect 1852 1271 1954 1311
-rect 1988 1271 2090 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 494 81 649
-rect 121 565 155 657
-rect 225 1201 259 1217
-rect 121 531 191 565
-rect 47 478 123 494
-rect 47 444 89 478
-rect 89 428 123 444
-rect 157 335 191 531
-rect 225 421 259 725
-rect 311 1201 345 1217
-rect 397 1201 431 1271
-rect 397 777 431 793
-rect 483 1201 517 1217
-rect 345 725 483 743
-rect 311 709 517 725
-rect 587 1201 621 1271
-rect 587 709 621 725
-rect 745 1201 813 1217
-rect 937 1201 971 1271
-rect 937 709 971 725
-rect 1095 1201 1163 1217
-rect 813 657 816 675
-rect 745 654 816 657
-rect 1095 654 1163 725
-rect 442 620 816 654
-rect 996 620 1163 654
-rect 1287 1201 1321 1271
-rect 1287 641 1321 657
-rect 1373 1201 1407 1217
-rect 1477 1201 1511 1217
-rect 1563 1201 1597 1271
-rect 1563 777 1597 793
-rect 1649 1201 1683 1217
-rect 1511 725 1649 743
-rect 1477 709 1683 725
-rect 1735 1201 1769 1217
-rect 1373 654 1407 657
-rect 1373 620 1461 654
-rect 325 491 359 575
-rect 442 570 476 620
-rect 309 457 325 491
-rect 359 457 375 491
-rect 225 387 359 421
-rect 121 301 229 335
-rect 263 301 279 335
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 301
-rect 325 267 359 353
-rect 442 370 476 536
-rect 714 570 748 586
-rect 714 535 748 536
-rect 928 570 962 586
-rect 748 501 844 535
-rect 642 461 676 477
-rect 642 411 676 427
-rect 810 387 844 501
-rect 928 387 962 536
-rect 442 336 776 370
-rect 810 337 844 353
-rect 928 337 962 353
-rect 996 387 1030 620
-rect 1160 570 1194 586
-rect 1160 535 1194 536
-rect 742 283 776 336
-rect 996 303 1030 353
-rect 1064 501 1160 535
-rect 1359 570 1393 586
-rect 1359 535 1393 536
-rect 1064 387 1098 501
-rect 1427 455 1461 620
-rect 1240 421 1256 455
-rect 1290 421 1306 455
-rect 1373 421 1461 455
-rect 1502 570 1536 586
-rect 1373 387 1407 421
-rect 1144 353 1160 387
-rect 1194 353 1407 387
-rect 1502 387 1536 536
-rect 1570 484 1604 575
-rect 1570 468 1638 484
-rect 1570 434 1588 468
-rect 1622 434 1638 468
-rect 1735 455 1769 725
-rect 1839 1201 1873 1217
-rect 1839 609 1873 657
-rect 1925 1201 1959 1271
-rect 1925 641 1959 657
-rect 2011 1201 2045 1217
-rect 2011 635 2045 649
-rect 2011 601 2068 635
-rect 1839 570 1873 575
-rect 1839 536 1990 570
-rect 1956 496 1990 536
-rect 1672 421 1859 455
-rect 1893 421 1909 455
-rect 1672 399 1706 421
-rect 1635 365 1706 399
-rect 1956 387 1990 462
-rect 1064 337 1098 353
-rect 121 115 155 131
-rect 227 199 261 215
-rect 227 61 261 131
-rect 325 115 359 131
-rect 483 267 517 283
-rect 483 61 517 131
-rect 587 267 621 283
-rect 742 267 813 283
-rect 996 269 1163 303
-rect 742 249 745 267
-rect 587 61 621 131
-rect 1095 267 1163 269
-rect 745 115 813 131
-rect 937 199 971 215
-rect 937 61 971 131
-rect 1095 115 1163 131
-rect 1287 267 1321 283
-rect 1287 61 1321 131
-rect 1373 267 1407 353
-rect 1373 115 1407 131
-rect 1477 267 1511 283
-rect 1477 61 1511 131
-rect 1635 267 1669 365
-rect 1839 353 1990 387
-rect 1739 301 1755 335
-rect 1789 301 1805 335
-rect 1839 267 1873 353
-rect 2034 320 2068 601
-rect 2011 286 2068 320
-rect 1635 115 1669 131
-rect 1733 199 1767 215
-rect 1733 61 1767 131
-rect 1839 115 1873 131
-rect 1925 267 1959 283
-rect 1925 61 1959 131
-rect 2011 267 2045 286
-rect 2011 115 2045 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 1682 1305 1716 1311
-rect 1682 1277 1716 1305
-rect 1818 1305 1852 1311
-rect 1818 1277 1852 1305
-rect 1954 1305 1988 1311
-rect 1954 1277 1988 1305
-rect 47 649 81 683
-rect 325 575 359 609
-rect 325 353 359 387
-rect 229 301 263 313
-rect 229 279 263 301
-rect 714 501 748 535
-rect 642 427 676 461
-rect 910 353 928 387
-rect 928 353 944 387
-rect 996 353 1030 387
-rect 1160 501 1194 535
-rect 1359 501 1393 535
-rect 1256 421 1290 455
-rect 1570 575 1604 609
-rect 2011 657 2045 683
-rect 2011 649 2045 657
-rect 1839 575 1873 609
-rect 1859 421 1893 455
-rect 1502 353 1536 387
-rect 1755 301 1789 313
-rect 1755 279 1789 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 1311 2090 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1682 1311
-rect 1716 1277 1818 1311
-rect 1852 1277 1954 1311
-rect 1988 1277 2090 1311
-rect 0 1271 2090 1277
-rect 35 683 93 689
-rect 1999 683 2057 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 1977 649 2011 683
-rect 2045 649 2057 683
-rect 35 643 93 649
-rect 1999 643 2057 649
-rect 313 609 371 615
-rect 1558 609 1616 615
-rect 1827 609 1885 615
-rect 313 575 325 609
-rect 359 575 1570 609
-rect 1604 575 1616 609
-rect 1804 575 1839 609
-rect 1873 575 1885 609
-rect 313 569 371 575
-rect 1558 569 1616 575
-rect 1827 569 1885 575
-rect 702 535 760 541
-rect 1148 535 1206 541
-rect 1347 535 1405 541
-rect 702 501 714 535
-rect 748 501 1160 535
-rect 1194 501 1359 535
-rect 1393 501 1405 535
-rect 702 495 760 501
-rect 1148 495 1206 501
-rect 1347 495 1405 501
-rect 630 461 688 467
-rect 630 427 642 461
-rect 676 427 710 461
-rect 1244 455 1302 461
-rect 1847 455 1905 461
-rect 630 421 688 427
-rect 1244 421 1256 455
-rect 1290 421 1859 455
-rect 1893 421 1905 455
-rect 1244 415 1302 421
-rect 1847 415 1905 421
-rect 313 387 371 393
-rect 898 387 956 393
-rect 313 353 325 387
-rect 359 353 910 387
-rect 944 353 956 387
-rect 313 347 371 353
-rect 898 347 956 353
-rect 984 387 1042 393
-rect 1490 387 1548 393
-rect 984 353 996 387
-rect 1030 353 1502 387
-rect 1536 353 1548 387
-rect 984 347 1042 353
-rect 1490 347 1548 353
-rect 217 313 275 319
-rect 1743 313 1801 319
-rect 217 279 229 313
-rect 263 279 1755 313
-rect 1789 279 1801 313
-rect 217 273 275 279
-rect 1743 273 1801 279
-rect 0 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel metal1 659 444 659 444 1 D
-port 1 n
-rlabel metal1 1376 518 1376 518 1 CK
-port 2 n
-rlabel metal1 1857 592 1857 592 1 QN
-port 3 n
-rlabel metal1 1587 592 1587 592 1 SN
-port 4 n
-rlabel metal1 65 666 65 666 1 RN
-port 5 n
-rlabel metal1 2028 666 2028 666 1 Q
-port 6 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__dffsr_l.mag b/18T_ms/sky130_osu_sc_18T_ms__dffsr_l.mag
deleted file mode 100644
index 23191c0..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__dffsr_l.mag
+++ /dev/null
@@ -1,899 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864604
-<< checkpaint >>
-rect -1210 -1243 3248 2575
-<< nwell >>
-rect -10 581 2090 1341
-<< nmos >>
-rect 80 115 110 315
-rect 272 115 302 263
-rect 370 115 400 315
-rect 442 115 472 315
-rect 632 115 662 315
-rect 704 115 734 315
-rect 824 115 854 315
-rect 896 115 926 315
-rect 982 115 1012 315
-rect 1054 115 1084 315
-rect 1174 115 1204 315
-rect 1246 115 1276 315
-rect 1332 115 1362 315
-rect 1522 115 1552 315
-rect 1594 115 1624 315
-rect 1692 115 1722 263
-rect 1884 115 1914 263
-rect 1970 115 2000 263
-<< pmos >>
-rect 80 617 110 1217
-rect 270 617 300 1217
-rect 356 617 386 1217
-rect 442 617 472 1217
-rect 632 617 662 1217
-rect 704 617 734 1217
-rect 824 617 854 1217
-rect 896 617 926 1217
-rect 982 617 1012 1217
-rect 1054 617 1084 1217
-rect 1174 617 1204 1217
-rect 1246 617 1276 1217
-rect 1332 617 1362 1217
-rect 1522 617 1552 1217
-rect 1608 617 1638 1217
-rect 1694 617 1724 1217
-rect 1884 817 1914 1217
-rect 1970 817 2000 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 317 267 370 315
-rect 317 263 325 267
-rect 110 115 163 131
-rect 219 199 272 263
-rect 219 131 227 199
-rect 261 131 272 199
-rect 219 115 272 131
-rect 302 131 325 263
-rect 359 131 370 267
-rect 302 115 370 131
-rect 400 115 442 315
-rect 472 267 525 315
-rect 472 131 483 267
-rect 517 131 525 267
-rect 472 115 525 131
-rect 579 267 632 315
-rect 579 131 587 267
-rect 621 131 632 267
-rect 579 115 632 131
-rect 662 115 704 315
-rect 734 267 824 315
-rect 734 131 745 267
-rect 813 131 824 267
-rect 734 115 824 131
-rect 854 115 896 315
-rect 926 199 982 315
-rect 926 131 937 199
-rect 971 131 982 199
-rect 926 115 982 131
-rect 1012 115 1054 315
-rect 1084 267 1174 315
-rect 1084 131 1095 267
-rect 1163 131 1174 267
-rect 1084 115 1174 131
-rect 1204 115 1246 315
-rect 1276 267 1332 315
-rect 1276 131 1287 267
-rect 1321 131 1332 267
-rect 1276 115 1332 131
-rect 1362 267 1415 315
-rect 1362 131 1373 267
-rect 1407 131 1415 267
-rect 1362 115 1415 131
-rect 1469 267 1522 315
-rect 1469 131 1477 267
-rect 1511 131 1522 267
-rect 1469 115 1522 131
-rect 1552 115 1594 315
-rect 1624 267 1677 315
-rect 1624 131 1635 267
-rect 1669 263 1677 267
-rect 1669 131 1692 263
-rect 1624 115 1692 131
-rect 1722 199 1775 263
-rect 1722 131 1733 199
-rect 1767 131 1775 199
-rect 1722 115 1775 131
-rect 1831 199 1884 263
-rect 1831 131 1839 199
-rect 1873 131 1884 199
-rect 1831 115 1884 131
-rect 1914 199 1970 263
-rect 1914 131 1925 199
-rect 1959 131 1970 199
-rect 1914 115 1970 131
-rect 2000 199 2053 263
-rect 2000 131 2011 199
-rect 2045 131 2053 199
-rect 2000 115 2053 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-rect 217 1201 270 1217
-rect 217 725 225 1201
-rect 259 725 270 1201
-rect 217 617 270 725
-rect 300 1201 356 1217
-rect 300 725 311 1201
-rect 345 725 356 1201
-rect 300 617 356 725
-rect 386 1201 442 1217
-rect 386 793 397 1201
-rect 431 793 442 1201
-rect 386 617 442 793
-rect 472 1201 525 1217
-rect 472 725 483 1201
-rect 517 725 525 1201
-rect 472 617 525 725
-rect 579 1201 632 1217
-rect 579 725 587 1201
-rect 621 725 632 1201
-rect 579 617 632 725
-rect 662 617 704 1217
-rect 734 1201 824 1217
-rect 734 657 745 1201
-rect 813 657 824 1201
-rect 734 617 824 657
-rect 854 617 896 1217
-rect 926 1201 982 1217
-rect 926 725 937 1201
-rect 971 725 982 1201
-rect 926 617 982 725
-rect 1012 617 1054 1217
-rect 1084 1201 1174 1217
-rect 1084 725 1095 1201
-rect 1163 725 1174 1201
-rect 1084 617 1174 725
-rect 1204 617 1246 1217
-rect 1276 1201 1332 1217
-rect 1276 657 1287 1201
-rect 1321 657 1332 1201
-rect 1276 617 1332 657
-rect 1362 1201 1415 1217
-rect 1362 657 1373 1201
-rect 1407 657 1415 1201
-rect 1362 617 1415 657
-rect 1469 1201 1522 1217
-rect 1469 725 1477 1201
-rect 1511 725 1522 1201
-rect 1469 617 1522 725
-rect 1552 1201 1608 1217
-rect 1552 793 1563 1201
-rect 1597 793 1608 1201
-rect 1552 617 1608 793
-rect 1638 1201 1694 1217
-rect 1638 725 1649 1201
-rect 1683 725 1694 1201
-rect 1638 617 1694 725
-rect 1724 1201 1777 1217
-rect 1724 725 1735 1201
-rect 1769 725 1777 1201
-rect 1831 1201 1884 1217
-rect 1831 861 1839 1201
-rect 1873 861 1884 1201
-rect 1831 817 1884 861
-rect 1914 1201 1970 1217
-rect 1914 861 1925 1201
-rect 1959 861 1970 1201
-rect 1914 817 1970 861
-rect 2000 1201 2053 1217
-rect 2000 861 2011 1201
-rect 2045 861 2053 1201
-rect 2000 817 2053 861
-rect 1724 617 1777 725
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 227 131 261 199
-rect 325 131 359 267
-rect 483 131 517 267
-rect 587 131 621 267
-rect 745 131 813 267
-rect 937 131 971 199
-rect 1095 131 1163 267
-rect 1287 131 1321 267
-rect 1373 131 1407 267
-rect 1477 131 1511 267
-rect 1635 131 1669 267
-rect 1733 131 1767 199
-rect 1839 131 1873 199
-rect 1925 131 1959 199
-rect 2011 131 2045 199
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 225 725 259 1201
-rect 311 725 345 1201
-rect 397 793 431 1201
-rect 483 725 517 1201
-rect 587 725 621 1201
-rect 745 657 813 1201
-rect 937 725 971 1201
-rect 1095 725 1163 1201
-rect 1287 657 1321 1201
-rect 1373 657 1407 1201
-rect 1477 725 1511 1201
-rect 1563 793 1597 1201
-rect 1649 725 1683 1201
-rect 1735 725 1769 1201
-rect 1839 861 1873 1201
-rect 1925 861 1959 1201
-rect 2011 861 2045 1201
-<< 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 1271 50 1305
-rect 84 1271 108 1305
-rect 162 1271 186 1305
-rect 220 1271 244 1305
-rect 298 1271 322 1305
-rect 356 1271 380 1305
-rect 434 1271 458 1305
-rect 492 1271 516 1305
-rect 570 1271 594 1305
-rect 628 1271 652 1305
-rect 706 1271 730 1305
-rect 764 1271 788 1305
-rect 842 1271 866 1305
-rect 900 1271 924 1305
-rect 978 1271 1002 1305
-rect 1036 1271 1060 1305
-rect 1114 1271 1138 1305
-rect 1172 1271 1196 1305
-rect 1250 1271 1274 1305
-rect 1308 1271 1332 1305
-rect 1386 1271 1410 1305
-rect 1444 1271 1468 1305
-rect 1522 1271 1546 1305
-rect 1580 1271 1604 1305
-rect 1658 1271 1682 1305
-rect 1716 1271 1740 1305
-rect 1794 1271 1818 1305
-rect 1852 1271 1876 1305
-rect 1930 1271 1954 1305
-rect 1988 1271 2012 1305
-<< 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 1271 84 1305
-rect 186 1271 220 1305
-rect 322 1271 356 1305
-rect 458 1271 492 1305
-rect 594 1271 628 1305
-rect 730 1271 764 1305
-rect 866 1271 900 1305
-rect 1002 1271 1036 1305
-rect 1138 1271 1172 1305
-rect 1274 1271 1308 1305
-rect 1410 1271 1444 1305
-rect 1546 1271 1580 1305
-rect 1682 1271 1716 1305
-rect 1818 1271 1852 1305
-rect 1954 1271 1988 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 270 1217 300 1243
-rect 356 1217 386 1243
-rect 442 1217 472 1243
-rect 632 1217 662 1243
-rect 704 1217 734 1243
-rect 824 1217 854 1243
-rect 896 1217 926 1243
-rect 982 1217 1012 1243
-rect 1054 1217 1084 1243
-rect 1174 1217 1204 1243
-rect 1246 1217 1276 1243
-rect 1332 1217 1362 1243
-rect 1522 1217 1552 1243
-rect 1608 1217 1638 1243
-rect 1694 1217 1724 1243
-rect 1884 1217 1914 1243
-rect 1970 1217 2000 1243
-rect 80 494 110 617
-rect 270 579 300 617
-rect 243 549 300 579
-rect 79 478 133 494
-rect 79 444 89 478
-rect 123 444 133 478
-rect 79 428 133 444
-rect 79 427 110 428
-rect 80 315 110 427
-rect 243 351 273 549
-rect 356 507 386 617
-rect 442 586 472 617
-rect 432 570 486 586
-rect 432 536 442 570
-rect 476 536 486 570
-rect 432 520 486 536
-rect 315 491 386 507
-rect 315 457 325 491
-rect 359 457 386 491
-rect 315 441 386 457
-rect 356 385 386 441
-rect 356 355 400 385
-rect 219 335 273 351
-rect 219 301 229 335
-rect 263 317 273 335
-rect 263 301 302 317
-rect 370 315 400 355
-rect 442 315 472 520
-rect 632 477 662 617
-rect 704 586 734 617
-rect 704 570 758 586
-rect 704 536 714 570
-rect 748 536 758 570
-rect 704 520 758 536
-rect 632 461 686 477
-rect 824 475 854 617
-rect 896 580 926 617
-rect 982 580 1012 617
-rect 896 570 1012 580
-rect 896 536 928 570
-rect 962 536 1012 570
-rect 896 526 1012 536
-rect 1054 475 1084 617
-rect 1174 586 1204 617
-rect 1150 570 1204 586
-rect 1150 536 1160 570
-rect 1194 536 1204 570
-rect 1150 520 1204 536
-rect 632 427 642 461
-rect 676 427 686 461
-rect 632 411 686 427
-rect 728 445 1180 475
-rect 632 315 662 411
-rect 728 367 758 445
-rect 1150 403 1180 445
-rect 1246 471 1276 617
-rect 1332 586 1362 617
-rect 1332 570 1403 586
-rect 1522 580 1552 617
-rect 1332 556 1359 570
-rect 1343 536 1359 556
-rect 1393 536 1403 570
-rect 1343 520 1403 536
-rect 1486 570 1552 580
-rect 1486 536 1502 570
-rect 1536 536 1552 570
-rect 1486 526 1552 536
-rect 1246 455 1300 471
-rect 1246 421 1256 455
-rect 1290 421 1300 455
-rect 1246 405 1300 421
-rect 704 337 758 367
-rect 800 387 854 403
-rect 800 353 810 387
-rect 844 353 854 387
-rect 800 337 854 353
-rect 704 315 734 337
-rect 824 315 854 337
-rect 896 387 1012 397
-rect 896 353 928 387
-rect 962 353 1012 387
-rect 896 343 1012 353
-rect 896 315 926 343
-rect 982 315 1012 343
-rect 1054 387 1108 403
-rect 1054 353 1064 387
-rect 1098 353 1108 387
-rect 1054 337 1108 353
-rect 1150 387 1204 403
-rect 1150 353 1160 387
-rect 1194 353 1204 387
-rect 1150 337 1204 353
-rect 1054 315 1084 337
-rect 1174 315 1204 337
-rect 1246 315 1276 405
-rect 1343 367 1373 520
-rect 1332 337 1373 367
-rect 1486 370 1516 526
-rect 1608 484 1638 617
-rect 1694 579 1724 617
-rect 1884 601 1914 817
-rect 1694 549 1775 579
-rect 1576 468 1638 484
-rect 1576 434 1588 468
-rect 1622 434 1638 468
-rect 1576 418 1638 434
-rect 1486 338 1552 370
-rect 1332 315 1362 337
-rect 1522 315 1552 338
-rect 1594 315 1624 418
-rect 1745 351 1775 549
-rect 1874 571 1914 601
-rect 1874 471 1904 571
-rect 1970 512 2000 817
-rect 1849 455 1904 471
-rect 1849 421 1859 455
-rect 1893 421 1904 455
-rect 1946 496 2000 512
-rect 1946 462 1956 496
-rect 1990 462 2000 496
-rect 1946 446 2000 462
-rect 1849 405 1904 421
-rect 1874 360 1904 405
-rect 1745 335 1799 351
-rect 1745 315 1755 335
-rect 219 285 302 301
-rect 272 263 302 285
-rect 1692 301 1755 315
-rect 1789 301 1799 335
-rect 1874 330 1914 360
-rect 1692 285 1799 301
-rect 1692 263 1722 285
-rect 1884 263 1914 330
-rect 1970 263 2000 446
-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 444 123 478
-rect 442 536 476 570
-rect 325 457 359 491
-rect 229 301 263 335
-rect 714 536 748 570
-rect 928 536 962 570
-rect 1160 536 1194 570
-rect 642 427 676 461
-rect 1359 536 1393 570
-rect 1502 536 1536 570
-rect 1256 421 1290 455
-rect 810 353 844 387
-rect 928 353 962 387
-rect 1064 353 1098 387
-rect 1160 353 1194 387
-rect 1588 434 1622 468
-rect 1859 421 1893 455
-rect 1956 462 1990 496
-rect 1755 301 1789 335
-<< locali >>
-rect 0 1311 2090 1332
-rect 0 1271 50 1311
-rect 84 1271 186 1311
-rect 220 1271 322 1311
-rect 356 1271 458 1311
-rect 492 1271 594 1311
-rect 628 1271 730 1311
-rect 764 1271 866 1311
-rect 900 1271 1002 1311
-rect 1036 1271 1138 1311
-rect 1172 1271 1274 1311
-rect 1308 1271 1410 1311
-rect 1444 1271 1546 1311
-rect 1580 1271 1682 1311
-rect 1716 1271 1818 1311
-rect 1852 1271 1954 1311
-rect 1988 1271 2090 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 494 81 649
-rect 121 565 155 657
-rect 225 1201 259 1217
-rect 121 531 191 565
-rect 47 478 123 494
-rect 47 444 89 478
-rect 89 428 123 444
-rect 157 335 191 531
-rect 225 421 259 725
-rect 311 1201 345 1217
-rect 397 1201 431 1271
-rect 397 777 431 793
-rect 483 1201 517 1217
-rect 345 725 483 743
-rect 311 709 517 725
-rect 587 1201 621 1271
-rect 587 709 621 725
-rect 745 1201 813 1217
-rect 937 1201 971 1271
-rect 937 709 971 725
-rect 1095 1201 1163 1217
-rect 813 657 816 675
-rect 745 654 816 657
-rect 1095 654 1163 725
-rect 442 620 816 654
-rect 996 620 1163 654
-rect 1287 1201 1321 1271
-rect 1287 641 1321 657
-rect 1373 1201 1407 1217
-rect 1477 1201 1511 1217
-rect 1563 1201 1597 1271
-rect 1563 777 1597 793
-rect 1649 1201 1683 1217
-rect 1511 725 1649 743
-rect 1477 709 1683 725
-rect 1735 1201 1769 1217
-rect 1373 654 1407 657
-rect 1373 620 1461 654
-rect 325 491 359 575
-rect 442 570 476 620
-rect 309 457 325 491
-rect 359 457 375 491
-rect 225 387 359 421
-rect 121 301 229 335
-rect 263 301 279 335
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 301
-rect 325 267 359 353
-rect 442 370 476 536
-rect 714 570 748 586
-rect 714 535 748 536
-rect 928 570 962 586
-rect 748 501 844 535
-rect 642 461 676 477
-rect 642 411 676 427
-rect 810 387 844 501
-rect 928 387 962 536
-rect 442 336 776 370
-rect 810 337 844 353
-rect 928 337 962 353
-rect 996 387 1030 620
-rect 1160 570 1194 586
-rect 1160 535 1194 536
-rect 742 283 776 336
-rect 996 303 1030 353
-rect 1064 501 1160 535
-rect 1359 570 1393 586
-rect 1359 535 1393 536
-rect 1064 387 1098 501
-rect 1427 455 1461 620
-rect 1240 421 1256 455
-rect 1290 421 1306 455
-rect 1373 421 1461 455
-rect 1502 570 1536 586
-rect 1373 387 1407 421
-rect 1144 353 1160 387
-rect 1194 353 1407 387
-rect 1502 387 1536 536
-rect 1570 484 1604 575
-rect 1570 468 1638 484
-rect 1570 434 1588 468
-rect 1622 434 1638 468
-rect 1735 455 1769 725
-rect 1839 1201 1873 1217
-rect 1839 609 1873 861
-rect 1925 1201 1959 1271
-rect 1925 845 1959 861
-rect 2011 1201 2045 1217
-rect 2011 683 2045 861
-rect 2044 666 2045 683
-rect 2044 649 2068 666
-rect 2011 632 2068 649
-rect 1839 570 1873 575
-rect 1839 536 1990 570
-rect 1956 496 1990 536
-rect 1672 421 1859 455
-rect 1893 421 1909 455
-rect 1672 399 1706 421
-rect 1635 365 1706 399
-rect 1956 387 1990 462
-rect 1064 337 1098 353
-rect 121 115 155 131
-rect 227 199 261 215
-rect 227 61 261 131
-rect 325 115 359 131
-rect 483 267 517 283
-rect 483 61 517 131
-rect 587 267 621 283
-rect 742 267 813 283
-rect 996 269 1163 303
-rect 742 249 745 267
-rect 587 61 621 131
-rect 1095 267 1163 269
-rect 745 115 813 131
-rect 937 199 971 215
-rect 937 61 971 131
-rect 1095 115 1163 131
-rect 1287 267 1321 283
-rect 1287 61 1321 131
-rect 1373 267 1407 353
-rect 1373 115 1407 131
-rect 1477 267 1511 283
-rect 1477 61 1511 131
-rect 1635 267 1669 365
-rect 1839 353 1990 387
-rect 1739 301 1755 335
-rect 1789 301 1805 335
-rect 1635 115 1669 131
-rect 1733 199 1767 215
-rect 1733 61 1767 131
-rect 1839 199 1873 353
-rect 2034 320 2068 632
-rect 2011 286 2068 320
-rect 1839 115 1873 131
-rect 1925 199 1959 215
-rect 1925 61 1959 131
-rect 2011 199 2045 286
-rect 2011 115 2045 131
-rect 0 21 50 61
-rect 84 21 186 61
-rect 220 21 322 61
-rect 356 21 458 61
-rect 492 21 594 61
-rect 628 21 730 61
-rect 764 21 866 61
-rect 900 21 1002 61
-rect 1036 21 1138 61
-rect 1172 21 1274 61
-rect 1308 21 1410 61
-rect 1444 21 1546 61
-rect 1580 21 1682 61
-rect 1716 21 1818 61
-rect 1852 21 1954 61
-rect 1988 21 2090 61
-rect 0 0 2090 21
-<< viali >>
-rect 50 1305 84 1311
-rect 50 1277 84 1305
-rect 186 1305 220 1311
-rect 186 1277 220 1305
-rect 322 1305 356 1311
-rect 322 1277 356 1305
-rect 458 1305 492 1311
-rect 458 1277 492 1305
-rect 594 1305 628 1311
-rect 594 1277 628 1305
-rect 730 1305 764 1311
-rect 730 1277 764 1305
-rect 866 1305 900 1311
-rect 866 1277 900 1305
-rect 1002 1305 1036 1311
-rect 1002 1277 1036 1305
-rect 1138 1305 1172 1311
-rect 1138 1277 1172 1305
-rect 1274 1305 1308 1311
-rect 1274 1277 1308 1305
-rect 1410 1305 1444 1311
-rect 1410 1277 1444 1305
-rect 1546 1305 1580 1311
-rect 1546 1277 1580 1305
-rect 1682 1305 1716 1311
-rect 1682 1277 1716 1305
-rect 1818 1305 1852 1311
-rect 1818 1277 1852 1305
-rect 1954 1305 1988 1311
-rect 1954 1277 1988 1305
-rect 47 649 81 683
-rect 325 575 359 609
-rect 325 353 359 387
-rect 229 301 263 313
-rect 229 279 263 301
-rect 714 501 748 535
-rect 642 427 676 461
-rect 910 353 928 387
-rect 928 353 944 387
-rect 996 353 1030 387
-rect 1160 501 1194 535
-rect 1359 501 1393 535
-rect 1256 421 1290 455
-rect 1570 575 1604 609
-rect 2010 649 2044 683
-rect 1839 575 1873 609
-rect 1859 421 1893 455
-rect 1502 353 1536 387
-rect 1755 301 1789 313
-rect 1755 279 1789 301
-rect 50 27 84 55
-rect 50 21 84 27
-rect 186 27 220 55
-rect 186 21 220 27
-rect 322 27 356 55
-rect 322 21 356 27
-rect 458 27 492 55
-rect 458 21 492 27
-rect 594 27 628 55
-rect 594 21 628 27
-rect 730 27 764 55
-rect 730 21 764 27
-rect 866 27 900 55
-rect 866 21 900 27
-rect 1002 27 1036 55
-rect 1002 21 1036 27
-rect 1138 27 1172 55
-rect 1138 21 1172 27
-rect 1274 27 1308 55
-rect 1274 21 1308 27
-rect 1410 27 1444 55
-rect 1410 21 1444 27
-rect 1546 27 1580 55
-rect 1546 21 1580 27
-rect 1682 27 1716 55
-rect 1682 21 1716 27
-rect 1818 27 1852 55
-rect 1818 21 1852 27
-rect 1954 27 1988 55
-rect 1954 21 1988 27
-<< metal1 >>
-rect 0 1311 2090 1332
-rect 0 1277 50 1311
-rect 84 1277 186 1311
-rect 220 1277 322 1311
-rect 356 1277 458 1311
-rect 492 1277 594 1311
-rect 628 1277 730 1311
-rect 764 1277 866 1311
-rect 900 1277 1002 1311
-rect 1036 1277 1138 1311
-rect 1172 1277 1274 1311
-rect 1308 1277 1410 1311
-rect 1444 1277 1546 1311
-rect 1580 1277 1682 1311
-rect 1716 1277 1818 1311
-rect 1852 1277 1954 1311
-rect 1988 1277 2090 1311
-rect 0 1271 2090 1277
-rect 35 683 93 689
-rect 1998 683 2056 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 1976 649 2010 683
-rect 2044 649 2056 683
-rect 35 643 93 649
-rect 1998 643 2056 649
-rect 313 609 371 615
-rect 1558 609 1616 615
-rect 1827 609 1885 615
-rect 313 575 325 609
-rect 359 575 1570 609
-rect 1604 575 1616 609
-rect 1804 575 1839 609
-rect 1873 575 1885 609
-rect 313 569 371 575
-rect 1558 569 1616 575
-rect 1827 569 1885 575
-rect 702 535 760 541
-rect 1148 535 1206 541
-rect 1347 535 1405 541
-rect 702 501 714 535
-rect 748 501 1160 535
-rect 1194 501 1359 535
-rect 1393 501 1405 535
-rect 702 495 760 501
-rect 1148 495 1206 501
-rect 1347 495 1405 501
-rect 630 461 688 467
-rect 630 427 642 461
-rect 676 427 710 461
-rect 1244 455 1302 461
-rect 1847 455 1905 461
-rect 630 421 688 427
-rect 1244 421 1256 455
-rect 1290 421 1859 455
-rect 1893 421 1905 455
-rect 1244 415 1302 421
-rect 1847 415 1905 421
-rect 313 387 371 393
-rect 898 387 956 393
-rect 313 353 325 387
-rect 359 353 910 387
-rect 944 353 956 387
-rect 313 347 371 353
-rect 898 347 956 353
-rect 984 387 1042 393
-rect 1490 387 1548 393
-rect 984 353 996 387
-rect 1030 353 1502 387
-rect 1536 353 1548 387
-rect 984 347 1042 353
-rect 1490 347 1548 353
-rect 217 313 275 319
-rect 1743 313 1801 319
-rect 217 279 229 313
-rect 263 279 1755 313
-rect 1789 279 1801 313
-rect 217 273 275 279
-rect 1743 273 1801 279
-rect 0 55 2090 61
-rect 0 21 50 55
-rect 84 21 186 55
-rect 220 21 322 55
-rect 356 21 458 55
-rect 492 21 594 55
-rect 628 21 730 55
-rect 764 21 866 55
-rect 900 21 1002 55
-rect 1036 21 1138 55
-rect 1172 21 1274 55
-rect 1308 21 1410 55
-rect 1444 21 1546 55
-rect 1580 21 1682 55
-rect 1716 21 1818 55
-rect 1852 21 1954 55
-rect 1988 21 2090 55
-rect 0 0 2090 21
-<< labels >>
-rlabel metal1 659 444 659 444 1 D
-port 1 n
-rlabel metal1 1376 518 1376 518 1 CK
-port 2 n
-rlabel metal1 1857 592 1857 592 1 QN
-port 3 n
-rlabel metal1 2027 666 2027 666 1 Q
-port 4 n
-rlabel metal1 1587 592 1587 592 1 SN
-port 5 n
-rlabel metal1 65 666 65 666 1 RN
-port 6 n
-rlabel viali 67 48 67 48 1 gnd
-rlabel viali 67 1284 67 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__fill_1.mag b/18T_ms/sky130_osu_sc_18T_ms__fill_1.mag
deleted file mode 100644
index 8d5ce0c..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__fill_1.mag
+++ /dev/null
@@ -1,22 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548551
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< error_p >>
-rect 0 1271 34 1332
-rect 41 581 154 1341
-rect 0 0 34 61
-<< nwell >>
-rect -14 581 41 1341
-<< locali >>
-rect 0 1271 22 1332
-rect 0 0 22 61
-<< metal1 >>
-rect 0 1271 22 1332
-rect 0 0 22 61
-<< labels >>
-rlabel metal1 11 28 11 28 1 gnd
-rlabel metal1 11 1299 11 1299 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__fill_16.mag b/18T_ms/sky130_osu_sc_18T_ms__fill_16.mag
deleted file mode 100644
index 877376a..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__fill_16.mag
+++ /dev/null
@@ -1,18 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548584
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 581 355 1341
-<< locali >>
-rect 0 1271 352 1332
-rect 0 0 352 61
-<< metal1 >>
-rect 0 1271 352 1332
-rect 0 0 352 61
-<< labels >>
-rlabel metal1 196 30 196 30 1 gnd
-rlabel metal1 199 1300 199 1300 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__fill_2.mag b/18T_ms/sky130_osu_sc_18T_ms__fill_2.mag
deleted file mode 100644
index 65e2cf3..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__fill_2.mag
+++ /dev/null
@@ -1,22 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548559
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< error_p >>
-rect 0 1271 44 1332
-rect 50 581 161 1341
-rect 0 0 44 61
-<< nwell >>
-rect -7 581 50 1341
-<< locali >>
-rect 0 1271 44 1332
-rect 0 0 44 61
-<< metal1 >>
-rect 0 1271 44 1332
-rect 0 0 44 61
-<< labels >>
-rlabel metal1 23 28 23 28 1 gnd
-rlabel metal1 22 1300 22 1300 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__fill_32.mag b/18T_ms/sky130_osu_sc_18T_ms__fill_32.mag
deleted file mode 100644
index bcb8614..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__fill_32.mag
+++ /dev/null
@@ -1,18 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548594
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 581 707 1341
-<< locali >>
-rect 0 1271 704 1332
-rect 0 0 704 61
-<< metal1 >>
-rect 0 1271 704 1332
-rect 0 0 704 61
-<< labels >>
-rlabel metal1 363 26 363 26 1 gnd
-rlabel metal1 374 1298 374 1298 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__fill_4.mag b/18T_ms/sky130_osu_sc_18T_ms__fill_4.mag
deleted file mode 100644
index b47e23b..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__fill_4.mag
+++ /dev/null
@@ -1,20 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548567
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< error_p >>
-rect 96 581 159 1341
-<< nwell >>
-rect -9 581 96 1341
-<< locali >>
-rect 0 1271 88 1332
-rect 0 0 88 61
-<< metal1 >>
-rect 0 1271 88 1332
-rect 0 0 88 61
-<< labels >>
-rlabel metal1 71 28 71 28 1 gnd
-rlabel metal1 72 1301 72 1301 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__fill_8.mag b/18T_ms/sky130_osu_sc_18T_ms__fill_8.mag
deleted file mode 100644
index 024779e..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__fill_8.mag
+++ /dev/null
@@ -1,18 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1598548573
-<< checkpaint >>
-rect -1260 -1260 1261 1261
-<< nwell >>
-rect -9 581 179 1341
-<< locali >>
-rect 0 1271 176 1332
-rect 0 0 176 61
-<< metal1 >>
-rect 0 1271 176 1332
-rect 0 0 176 61
-<< labels >>
-rlabel metal1 112 28 112 28 1 gnd
-rlabel metal1 111 1303 111 1303 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__inv_1.mag b/18T_ms/sky130_osu_sc_18T_ms__inv_1.mag
deleted file mode 100644
index 4e2adfa..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__inv_1.mag
+++ /dev/null
@@ -1,113 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864605
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< nmos >>
-rect 80 115 110 315
-<< pmos >>
-rect 80 617 110 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 494 110 617
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 315 110 428
-rect 80 89 110 115
-<< polycont >>
-rect 90 444 124 478
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 121 279 155 313
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 109 575 121 609
-rect 155 575 167 609
-rect 109 569 167 575
-rect 121 319 155 569
-rect 109 313 167 319
-rect 109 279 121 313
-rect 155 279 167 313
-rect 109 273 167 279
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 151 441 151 441 1 Y
-port 1 n
-rlabel metal1 64 666 64 666 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__inv_10.mag b/18T_ms/sky130_osu_sc_18T_ms__inv_10.mag
deleted file mode 100644
index 1fbcb2d..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__inv_10.mag
+++ /dev/null
@@ -1,418 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864605
-<< checkpaint >>
-rect -1209 -1243 2161 2575
-<< nwell >>
-rect -9 581 990 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-rect 768 115 798 315
-rect 854 115 884 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-rect 768 617 798 1217
-rect 854 617 884 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 768 315
-rect 712 131 723 267
-rect 757 131 768 267
-rect 712 115 768 131
-rect 798 267 854 315
-rect 798 131 809 267
-rect 843 131 854 267
-rect 798 115 854 131
-rect 884 267 937 315
-rect 884 131 895 267
-rect 929 131 937 267
-rect 884 115 937 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 768 1217
-rect 712 657 723 1201
-rect 757 657 768 1201
-rect 712 617 768 657
-rect 798 1201 854 1217
-rect 798 657 809 1201
-rect 843 657 854 1201
-rect 798 617 854 657
-rect 884 1201 937 1217
-rect 884 657 895 1201
-rect 929 657 937 1201
-rect 884 617 937 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-rect 809 131 843 267
-rect 895 131 929 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-rect 809 657 843 1201
-rect 895 657 929 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 768 1217 798 1243
-rect 854 1217 884 1243
-rect 80 592 110 617
-rect 166 592 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 596 592 626 617
-rect 682 592 712 617
-rect 768 592 798 617
-rect 854 592 884 617
-rect 80 562 884 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 424 370 454 562
-rect 80 340 884 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 252 315 282 340
-rect 338 315 368 340
-rect 424 315 454 340
-rect 510 315 540 340
-rect 596 315 626 340
-rect 682 315 712 340
-rect 768 315 798 340
-rect 854 315 884 340
-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 444 124 478
-<< locali >>
-rect 0 1311 990 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 990 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 293 1201 327 1217
-rect 293 609 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 609 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 637 1201 671 1217
-rect 637 609 671 657
-rect 723 1201 757 1271
-rect 723 641 757 657
-rect 809 1201 843 1217
-rect 809 609 843 657
-rect 895 1201 929 1271
-rect 895 641 929 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 637 267 671 279
-rect 637 115 671 131
-rect 723 267 757 283
-rect 723 61 757 131
-rect 809 267 843 279
-rect 809 115 843 131
-rect 895 267 929 283
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 293 575 327 609
-rect 465 575 499 609
-rect 637 575 671 609
-rect 809 575 843 609
-rect 121 279 155 313
-rect 293 279 327 313
-rect 465 279 499 313
-rect 637 279 671 313
-rect 809 279 843 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1311 990 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 990 1311
-rect 0 1271 990 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 281 609 339 615
-rect 453 609 511 615
-rect 625 609 683 615
-rect 797 609 855 615
-rect 109 575 121 609
-rect 155 575 293 609
-rect 327 575 465 609
-rect 499 575 637 609
-rect 671 575 809 609
-rect 843 575 855 609
-rect 109 569 167 575
-rect 281 569 339 575
-rect 453 569 511 575
-rect 625 569 683 575
-rect 797 569 855 575
-rect 121 319 155 569
-rect 293 319 327 569
-rect 465 319 499 569
-rect 637 319 671 569
-rect 809 319 843 569
-rect 109 313 167 319
-rect 281 313 339 319
-rect 453 313 511 319
-rect 625 313 683 319
-rect 797 313 855 319
-rect 109 279 121 313
-rect 155 279 293 313
-rect 327 279 465 313
-rect 499 279 637 313
-rect 671 279 809 313
-rect 843 279 855 313
-rect 109 273 167 279
-rect 281 273 339 279
-rect 453 273 511 279
-rect 625 273 683 279
-rect 797 273 855 279
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 152 440 152 440 1 Y
-port 1 n
-rlabel metal1 64 665 64 665 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__inv_2.mag b/18T_ms/sky130_osu_sc_18T_ms__inv_2.mag
deleted file mode 100644
index c82b2db..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__inv_2.mag
+++ /dev/null
@@ -1,151 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864606
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 287 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 249 315
-rect 196 131 207 267
-rect 241 131 249 267
-rect 196 115 249 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 249 1217
-rect 196 657 207 1201
-rect 241 657 249 1201
-rect 196 617 249 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1244
-rect 80 592 110 617
-rect 166 592 196 617
-rect 80 562 196 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 80 340 196 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 90 444 124 478
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 121 279 155 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 109 575 121 609
-rect 155 575 167 609
-rect 109 569 167 575
-rect 121 319 155 569
-rect 109 313 167 319
-rect 109 279 121 313
-rect 155 279 167 313
-rect 109 273 167 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 152 440 152 440 1 Y
-port 1 n
-rlabel metal1 64 665 64 665 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__inv_3.mag b/18T_ms/sky130_osu_sc_18T_ms__inv_3.mag
deleted file mode 100644
index cf5f3a1..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__inv_3.mag
+++ /dev/null
@@ -1,180 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864606
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 375 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 335 315
-rect 282 131 293 267
-rect 327 131 335 267
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 335 1217
-rect 282 657 293 1201
-rect 327 657 335 1201
-rect 282 617 335 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 592 110 617
-rect 166 592 196 617
-rect 252 592 282 617
-rect 80 562 282 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 80 340 282 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 252 315 282 340
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 90 444 124 478
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 293 1201 327 1217
-rect 293 609 327 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 293 575 327 609
-rect 121 279 155 313
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 281 609 339 615
-rect 109 575 121 609
-rect 155 575 293 609
-rect 327 575 339 609
-rect 109 569 167 575
-rect 281 569 339 575
-rect 121 319 155 569
-rect 293 319 327 569
-rect 109 313 167 319
-rect 281 313 339 319
-rect 109 279 121 313
-rect 155 279 293 313
-rect 327 279 339 313
-rect 109 273 167 279
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 152 440 152 440 1 Y
-port 1 n
-rlabel metal1 64 665 64 665 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__inv_4.mag b/18T_ms/sky130_osu_sc_18T_ms__inv_4.mag
deleted file mode 100644
index 78ebd31..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__inv_4.mag
+++ /dev/null
@@ -1,214 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864606
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 463 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 421 315
-rect 368 131 379 267
-rect 413 131 421 267
-rect 368 115 421 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 421 1217
-rect 368 657 379 1201
-rect 413 657 421 1201
-rect 368 617 421 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1243
-rect 80 592 110 617
-rect 166 592 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 80 562 368 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 80 340 368 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 252 315 282 340
-rect 338 315 368 340
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 90 444 124 478
-<< locali >>
-rect 0 1311 462 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 462 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 293 1201 327 1217
-rect 293 609 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 293 575 327 609
-rect 121 279 155 313
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 462 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 462 1311
-rect 0 1271 462 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 281 609 339 615
-rect 109 575 121 609
-rect 155 575 293 609
-rect 327 575 339 609
-rect 109 569 167 575
-rect 281 569 339 575
-rect 121 319 155 569
-rect 293 319 327 569
-rect 109 313 167 319
-rect 281 313 339 319
-rect 109 279 121 313
-rect 155 279 293 313
-rect 327 279 339 313
-rect 109 273 167 279
-rect 281 273 339 279
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 64 665 64 665 1 A
-port 1 n
-rlabel metal1 152 440 152 440 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__inv_6.mag b/18T_ms/sky130_osu_sc_18T_ms__inv_6.mag
deleted file mode 100644
index 7ae23c2..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__inv_6.mag
+++ /dev/null
@@ -1,278 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864606
-<< checkpaint >>
-rect -1209 -1243 1753 2575
-<< nwell >>
-rect -9 581 639 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 593 315
-rect 540 131 551 267
-rect 585 131 593 267
-rect 540 115 593 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 593 1217
-rect 540 657 551 1201
-rect 585 657 593 1201
-rect 540 617 593 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 80 592 110 617
-rect 166 592 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 80 562 540 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 424 370 454 562
-rect 80 340 540 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 252 315 282 340
-rect 338 315 368 340
-rect 424 315 454 340
-rect 510 315 540 340
-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 444 124 478
-<< locali >>
-rect 0 1311 638 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 638 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 293 1201 327 1217
-rect 293 609 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 609 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 293 575 327 609
-rect 465 575 499 609
-rect 121 279 155 313
-rect 293 279 327 313
-rect 465 279 499 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 638 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 638 1311
-rect 0 1271 638 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 281 609 339 615
-rect 453 609 511 615
-rect 109 575 121 609
-rect 155 575 293 609
-rect 327 575 465 609
-rect 499 575 511 609
-rect 109 569 167 575
-rect 281 569 339 575
-rect 453 569 511 575
-rect 121 319 155 569
-rect 293 319 327 569
-rect 465 319 499 569
-rect 109 313 167 319
-rect 281 313 339 319
-rect 453 313 511 319
-rect 109 279 121 313
-rect 155 279 293 313
-rect 327 279 465 313
-rect 499 279 511 313
-rect 109 273 167 279
-rect 281 273 339 279
-rect 453 273 511 279
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 64 665 64 665 1 A
-port 1 n
-rlabel metal1 152 440 152 440 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__inv_8.mag b/18T_ms/sky130_osu_sc_18T_ms__inv_8.mag
deleted file mode 100644
index 8c4fc78..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__inv_8.mag
+++ /dev/null
@@ -1,341 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864606
-<< checkpaint >>
-rect -1209 -1243 1889 2575
-<< nwell >>
-rect -9 581 814 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 765 315
-rect 712 131 723 267
-rect 757 131 765 267
-rect 712 115 765 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 252 1217
-rect 196 657 207 1201
-rect 241 657 252 1201
-rect 196 617 252 657
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 765 1217
-rect 712 657 723 1201
-rect 757 657 765 1201
-rect 712 617 765 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 657 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1243
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 80 592 110 617
-rect 166 592 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 596 592 626 617
-rect 682 592 712 617
-rect 80 562 712 592
-rect 80 494 110 562
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 370 110 428
-rect 424 370 454 562
-rect 80 340 712 370
-rect 80 315 110 340
-rect 166 315 196 340
-rect 252 315 282 340
-rect 338 315 368 340
-rect 424 315 454 340
-rect 510 315 540 340
-rect 596 315 626 340
-rect 682 315 712 340
-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 444 124 478
-<< locali >>
-rect 0 1311 814 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 814 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 657
-rect 207 1201 241 1271
-rect 207 641 241 657
-rect 293 1201 327 1217
-rect 293 609 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 609 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 637 1201 671 1217
-rect 637 609 671 657
-rect 723 1201 757 1271
-rect 723 641 757 657
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 637 267 671 279
-rect 637 115 671 131
-rect 723 267 757 283
-rect 723 61 757 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 814 61
-rect 0 0 814 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 293 575 327 609
-rect 465 575 499 609
-rect 637 575 671 609
-rect 121 279 155 313
-rect 293 279 327 313
-rect 465 279 499 313
-rect 637 279 671 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-<< metal1 >>
-rect 0 1311 814 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 814 1311
-rect 0 1271 814 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 281 609 339 615
-rect 453 609 511 615
-rect 625 609 683 615
-rect 109 575 121 609
-rect 155 575 293 609
-rect 327 575 465 609
-rect 499 575 637 609
-rect 671 575 683 609
-rect 109 569 167 575
-rect 281 569 339 575
-rect 453 569 511 575
-rect 625 569 683 575
-rect 121 319 155 569
-rect 293 319 327 569
-rect 465 319 499 569
-rect 637 319 671 569
-rect 109 313 167 319
-rect 281 313 339 319
-rect 453 313 511 319
-rect 625 313 683 319
-rect 109 279 121 313
-rect 155 279 293 313
-rect 327 279 465 313
-rect 499 279 637 313
-rect 671 279 683 313
-rect 109 273 167 279
-rect 281 273 339 279
-rect 453 273 511 279
-rect 625 273 683 279
-rect 0 55 814 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 814 55
-rect 0 0 814 21
-<< labels >>
-rlabel metal1 152 440 152 440 1 Y
-port 1 n
-rlabel metal1 64 665 64 665 1 A
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__inv_l.mag b/18T_ms/sky130_osu_sc_18T_ms__inv_l.mag
deleted file mode 100644
index 83f90f4..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__inv_l.mag
+++ /dev/null
@@ -1,113 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864607
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< nmos >>
-rect 80 115 110 263
-<< pmos >>
-rect 80 817 110 1217
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 163 263
-rect 110 131 121 199
-rect 155 131 163 199
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 817 80 929
-rect 110 1201 163 1217
-rect 110 929 121 1201
-rect 155 929 163 1201
-rect 110 817 163 929
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-<< pdiffc >>
-rect 35 929 69 1201
-rect 121 929 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 494 110 817
-rect 80 478 134 494
-rect 80 444 90 478
-rect 124 444 134 478
-rect 80 428 134 444
-rect 80 263 110 428
-rect 80 89 110 115
-<< polycont >>
-rect 90 444 124 478
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 913 69 929
-rect 121 1201 155 1217
-rect 47 478 81 649
-rect 121 609 155 929
-rect 47 444 90 478
-rect 124 444 140 478
-rect 35 199 69 215
-rect 35 61 69 131
-rect 121 199 155 279
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 47 649 81 683
-rect 121 575 155 609
-rect 121 279 155 313
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 127 683
-rect 35 643 93 649
-rect 109 609 167 615
-rect 109 575 121 609
-rect 155 575 167 609
-rect 109 569 167 575
-rect 121 319 155 569
-rect 109 313 167 319
-rect 109 279 121 313
-rect 155 279 167 313
-rect 109 273 167 279
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 64 666 64 666 1 A
-port 1 n
-rlabel metal1 151 441 151 441 1 Y
-port 2 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__mux2_1.mag b/18T_ms/sky130_osu_sc_18T_ms__mux2_1.mag
deleted file mode 100644
index a991f77..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__mux2_1.mag
+++ /dev/null
@@ -1,226 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864607
-<< checkpaint >>
-rect -801 1315 1753 2575
-rect -1209 -1243 1753 1315
-<< nwell >>
-rect -9 581 553 1341
-<< nmos >>
-rect 80 115 110 315
-rect 270 115 300 315
-rect 356 115 386 315
-<< pmos >>
-rect 80 617 110 1217
-rect 270 617 300 1217
-rect 356 617 386 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-rect 217 267 270 315
-rect 217 131 225 267
-rect 259 131 270 267
-rect 217 115 270 131
-rect 300 267 356 315
-rect 300 131 311 267
-rect 345 131 356 267
-rect 300 115 356 131
-rect 386 267 439 315
-rect 386 131 397 267
-rect 431 131 439 267
-rect 386 115 439 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-rect 217 1201 270 1217
-rect 217 657 225 1201
-rect 259 657 270 1201
-rect 217 617 270 657
-rect 300 1201 356 1217
-rect 300 657 311 1201
-rect 345 657 356 1201
-rect 300 617 356 657
-rect 386 1201 439 1217
-rect 386 657 397 1201
-rect 431 657 439 1201
-rect 386 617 439 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 225 131 259 267
-rect 311 131 345 267
-rect 397 131 431 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 225 657 259 1201
-rect 311 657 345 1201
-rect 397 657 431 1201
-<< 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 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1232 300 1262
-rect 80 1217 110 1232
-rect 270 1217 300 1232
-rect 356 1217 386 1243
-rect 80 494 110 617
-rect 270 591 300 617
-rect 152 555 218 565
-rect 152 521 168 555
-rect 202 541 218 555
-rect 356 541 386 617
-rect 202 521 386 541
-rect 152 511 386 521
-rect 27 478 110 494
-rect 27 444 37 478
-rect 71 469 110 478
-rect 71 444 386 469
-rect 27 439 386 444
-rect 27 428 110 439
-rect 80 315 110 428
-rect 152 387 218 397
-rect 152 353 168 387
-rect 202 373 218 387
-rect 202 353 300 373
-rect 152 343 300 353
-rect 270 315 300 343
-rect 356 315 386 439
-rect 80 89 110 115
-rect 270 89 300 115
-rect 356 89 386 115
-<< polycont >>
-rect 168 521 202 555
-rect 37 444 71 478
-rect 168 353 202 387
-<< locali >>
-rect 0 1311 550 1332
-rect 0 1271 459 1311
-rect 493 1271 550 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 37 478 71 649
-rect 37 428 71 444
-rect 121 571 155 657
-rect 225 1201 259 1217
-rect 311 1201 345 1217
-rect 225 623 270 657
-rect 236 609 270 623
-rect 121 555 202 571
-rect 121 521 168 555
-rect 121 505 202 521
-rect 121 403 155 505
-rect 121 387 202 403
-rect 121 353 168 387
-rect 121 337 202 353
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 337
-rect 236 301 270 575
-rect 311 461 345 657
-rect 397 1201 431 1217
-rect 397 535 431 657
-rect 121 115 155 131
-rect 225 267 270 301
-rect 311 267 345 279
-rect 225 115 259 131
-rect 311 115 345 131
-rect 397 267 431 501
-rect 397 115 431 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 550 61
-rect 0 0 550 21
-<< viali >>
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 37 649 71 683
-rect 236 575 270 609
-rect 311 427 345 461
-rect 397 501 431 535
-rect 311 279 345 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 550 1332
-rect 0 1277 459 1311
-rect 493 1277 550 1311
-rect 0 1271 550 1277
-rect 25 683 83 689
-rect 25 649 37 683
-rect 71 649 117 683
-rect 25 643 83 649
-rect 224 609 282 615
-rect 190 575 236 609
-rect 270 575 282 609
-rect 224 569 282 575
-rect 385 535 443 541
-rect 351 501 397 535
-rect 431 501 443 535
-rect 385 495 443 501
-rect 299 461 357 467
-rect 299 427 311 461
-rect 345 427 357 461
-rect 299 421 357 427
-rect 311 319 345 421
-rect 299 313 357 319
-rect 299 279 311 313
-rect 345 279 357 313
-rect 299 273 357 279
-rect 0 55 550 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 550 55
-rect 0 0 550 21
-<< labels >>
-rlabel metal1 54 666 54 666 1 S0
-port 1 n
-rlabel metal1 328 444 328 444 1 Y
-port 2 n
-rlabel metal1 253 592 253 592 1 A0
-port 3 n
-rlabel metal1 414 518 414 518 1 A1
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 476 1284 476 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__nand2_1.mag b/18T_ms/sky130_osu_sc_18T_ms__nand2_1.mag
deleted file mode 100644
index 819d971..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__nand2_1.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864607
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 286 1341
-<< nmos >>
-rect 80 115 110 315
-rect 152 115 182 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 115 152 315
-rect 182 267 235 315
-rect 182 131 193 267
-rect 227 131 235 267
-rect 182 115 235 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 1201 249 1217
-rect 196 725 207 1201
-rect 241 725 249 1201
-rect 196 617 249 725
-<< ndiffc >>
-rect 35 131 69 267
-rect 193 131 227 267
-<< pdiffc >>
-rect 35 793 69 1201
-rect 121 657 155 1201
-rect 207 725 241 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 80 570 110 617
-rect 37 554 110 570
-rect 37 520 47 554
-rect 81 520 110 554
-rect 37 504 110 520
-rect 80 315 110 504
-rect 166 477 196 617
-rect 152 461 210 477
-rect 152 427 166 461
-rect 200 427 210 461
-rect 152 411 210 427
-rect 152 315 182 411
-rect 80 89 110 115
-rect 152 89 182 115
-<< polycont >>
-rect 47 520 81 554
-rect 166 427 200 461
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 121 1201 155 1217
-rect 47 554 81 649
-rect 47 504 81 520
-rect 207 1201 241 1271
-rect 207 709 241 725
-rect 121 535 155 657
-rect 195 461 229 575
-rect 150 427 166 461
-rect 200 427 229 461
-rect 35 267 69 279
-rect 35 115 69 131
-rect 193 267 227 283
-rect 193 61 227 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 47 649 81 683
-rect 121 501 155 535
-rect 195 575 229 609
-rect 35 279 69 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 115 683
-rect 35 643 93 649
-rect 183 609 241 615
-rect 161 575 195 609
-rect 229 575 241 609
-rect 183 569 241 575
-rect 109 535 167 541
-rect 109 501 121 535
-rect 155 501 167 535
-rect 109 495 167 501
-rect 23 313 81 319
-rect 121 313 155 495
-rect 23 279 35 313
-rect 69 279 155 313
-rect 23 273 81 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 470 136 470 1 Y
-port 1 n
-rlabel metal1 64 666 64 666 1 A
-port 2 n
-rlabel metal1 212 592 212 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__nand2_l.mag b/18T_ms/sky130_osu_sc_18T_ms__nand2_l.mag
deleted file mode 100644
index 2a21a15..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__nand2_l.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864607
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 286 1341
-<< nmos >>
-rect 80 115 110 263
-rect 152 115 182 263
-<< pmos >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 115 152 263
-rect 182 199 235 263
-rect 182 131 193 199
-rect 227 131 235 199
-rect 182 115 235 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 817 80 929
-rect 110 1201 166 1217
-rect 110 929 121 1201
-rect 155 929 166 1201
-rect 110 817 166 929
-rect 196 1201 249 1217
-rect 196 929 207 1201
-rect 241 929 249 1201
-rect 196 817 249 929
-<< ndiffc >>
-rect 35 131 69 199
-rect 193 131 227 199
-<< pdiffc >>
-rect 35 929 69 1201
-rect 121 929 155 1201
-rect 207 929 241 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 80 570 110 817
-rect 37 554 110 570
-rect 37 520 47 554
-rect 81 520 110 554
-rect 37 504 110 520
-rect 80 263 110 504
-rect 166 420 196 817
-rect 152 404 210 420
-rect 152 370 166 404
-rect 200 370 210 404
-rect 152 354 210 370
-rect 152 263 182 354
-rect 80 89 110 115
-rect 152 89 182 115
-<< polycont >>
-rect 47 520 81 554
-rect 166 370 200 404
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1271
-rect 35 913 69 929
-rect 121 1201 155 1217
-rect 47 554 81 649
-rect 47 504 81 520
-rect 121 535 155 929
-rect 207 1201 241 1271
-rect 207 913 241 929
-rect 195 404 229 575
-rect 150 370 166 404
-rect 200 370 229 404
-rect 35 199 69 279
-rect 35 115 69 131
-rect 193 199 227 215
-rect 193 61 227 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 47 649 81 683
-rect 121 501 155 535
-rect 195 575 229 609
-rect 35 279 69 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 35 683 93 689
-rect 35 649 47 683
-rect 81 649 115 683
-rect 35 643 93 649
-rect 183 609 241 615
-rect 161 575 195 609
-rect 229 575 241 609
-rect 183 569 241 575
-rect 109 535 167 541
-rect 109 501 121 535
-rect 155 501 167 535
-rect 109 495 167 501
-rect 23 313 81 319
-rect 121 313 155 495
-rect 23 279 35 313
-rect 69 279 155 313
-rect 23 273 81 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 136 470 136 470 1 Y
-port 1 n
-rlabel metal1 212 592 212 592 1 B
-port 2 n
-rlabel metal1 64 666 64 666 1 A
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__nor2_1.mag b/18T_ms/sky130_osu_sc_18T_ms__nor2_1.mag
deleted file mode 100644
index f8ee8b3..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__nor2_1.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864607
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 286 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-<< pmos >>
-rect 80 617 110 1217
-rect 152 617 182 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 249 315
-rect 196 131 207 267
-rect 241 131 249 267
-rect 196 115 249 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 617 152 1217
-rect 182 1201 235 1217
-rect 182 793 193 1201
-rect 227 793 235 1201
-rect 182 617 235 793
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 193 793 227 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 152 1217 182 1243
-rect 80 451 110 617
-rect 152 584 182 617
-rect 152 568 225 584
-rect 152 534 181 568
-rect 215 534 225 568
-rect 152 518 225 534
-rect 56 435 110 451
-rect 56 401 66 435
-rect 100 401 110 435
-rect 56 385 110 401
-rect 80 315 110 385
-rect 166 315 196 518
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 181 534 215 568
-rect 66 401 100 435
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1217
-rect 193 1201 227 1271
-rect 193 777 227 793
-rect 35 535 69 657
-rect 113 435 147 575
-rect 181 568 215 649
-rect 181 518 215 534
-rect 50 401 66 435
-rect 100 401 147 435
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 279
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 181 649 215 683
-rect 35 501 69 535
-rect 113 575 147 609
-rect 121 279 155 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 169 683 227 689
-rect 148 649 181 683
-rect 215 649 227 683
-rect 169 643 227 649
-rect 101 609 159 615
-rect 79 575 113 609
-rect 147 575 159 609
-rect 101 569 159 575
-rect 23 535 81 541
-rect 23 501 35 535
-rect 69 501 155 535
-rect 23 495 81 501
-rect 121 319 155 501
-rect 109 313 167 319
-rect 109 279 121 313
-rect 155 279 167 313
-rect 109 273 167 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 137 393 137 393 1 Y
-port 1 n
-rlabel metal1 130 592 130 592 1 B
-port 2 n
-rlabel metal1 198 666 198 666 1 A
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__nor2_l.mag b/18T_ms/sky130_osu_sc_18T_ms__nor2_l.mag
deleted file mode 100644
index b56c522..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__nor2_l.mag
+++ /dev/null
@@ -1,155 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864607
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 286 1341
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-<< pmos >>
-rect 80 817 110 1217
-rect 152 817 182 1217
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 166 263
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 199 249 263
-rect 196 131 207 199
-rect 241 131 249 199
-rect 196 115 249 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 817 152 1217
-rect 182 1201 235 1217
-rect 182 861 193 1201
-rect 227 861 235 1201
-rect 182 817 235 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-rect 207 131 241 199
-<< pdiffc >>
-rect 35 861 69 1201
-rect 193 861 227 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 152 1217 182 1243
-rect 80 451 110 817
-rect 152 584 182 817
-rect 152 568 225 584
-rect 152 534 181 568
-rect 215 534 225 568
-rect 152 518 225 534
-rect 56 435 110 451
-rect 56 401 66 435
-rect 100 401 110 435
-rect 56 385 110 401
-rect 80 263 110 385
-rect 166 263 196 518
-rect 80 89 110 115
-rect 166 89 196 115
-<< polycont >>
-rect 181 534 215 568
-rect 66 401 100 435
-<< locali >>
-rect 0 1311 286 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 286 1311
-rect 35 1201 69 1217
-rect 35 535 69 861
-rect 193 1201 227 1271
-rect 193 845 227 861
-rect 113 435 147 575
-rect 181 568 215 649
-rect 181 518 215 534
-rect 50 401 66 435
-rect 100 401 147 435
-rect 35 199 69 215
-rect 35 61 69 131
-rect 121 199 155 279
-rect 121 115 155 131
-rect 207 199 241 215
-rect 207 61 241 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 286 61
-rect 0 0 286 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 181 649 215 683
-rect 35 501 69 535
-rect 113 575 147 609
-rect 121 279 155 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 286 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 286 1311
-rect 0 1271 286 1277
-rect 169 683 227 689
-rect 148 649 181 683
-rect 215 649 227 683
-rect 169 643 227 649
-rect 101 609 159 615
-rect 79 575 113 609
-rect 147 575 159 609
-rect 101 569 159 575
-rect 23 535 81 541
-rect 23 501 35 535
-rect 69 501 155 535
-rect 23 495 81 501
-rect 121 319 155 501
-rect 109 313 167 319
-rect 109 279 121 313
-rect 155 279 167 313
-rect 109 273 167 279
-rect 0 55 286 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 286 55
-rect 0 0 286 21
-<< labels >>
-rlabel metal1 137 393 137 393 1 Y
-port 1 n
-rlabel metal1 198 666 198 666 1 A
-port 2 n
-rlabel metal1 130 592 130 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__oai21_l.mag b/18T_ms/sky130_osu_sc_18T_ms__oai21_l.mag
deleted file mode 100644
index ab0cc55..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__oai21_l.mag
+++ /dev/null
@@ -1,194 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864608
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-<< pmos >>
-rect 80 617 110 1217
-rect 152 617 182 1217
-rect 250 817 280 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 199 166 315
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 266 335 315
-rect 282 131 293 266
-rect 327 131 335 266
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 617 152 1217
-rect 182 1201 250 1217
-rect 182 861 193 1201
-rect 227 861 250 1201
-rect 182 817 250 861
-rect 280 1201 333 1217
-rect 280 861 291 1201
-rect 325 861 333 1201
-rect 280 817 333 861
-rect 182 617 235 817
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 199
-rect 207 131 241 267
-rect 293 131 327 266
-<< pdiffc >>
-rect 35 793 69 1201
-rect 193 861 227 1201
-rect 291 861 325 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 152 1217 182 1243
-rect 250 1217 280 1243
-rect 80 585 110 617
-rect 56 569 110 585
-rect 56 535 66 569
-rect 100 535 110 569
-rect 56 519 110 535
-rect 56 370 86 519
-rect 152 471 182 617
-rect 136 461 202 471
-rect 136 427 152 461
-rect 186 427 202 461
-rect 136 417 202 427
-rect 56 340 110 370
-rect 80 315 110 340
-rect 166 315 196 417
-rect 250 409 280 817
-rect 250 393 306 409
-rect 252 359 262 393
-rect 296 359 306 393
-rect 252 343 306 359
-rect 252 315 282 343
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 66 535 100 569
-rect 152 427 186 461
-rect 262 359 296 393
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 193 1201 227 1271
-rect 193 845 227 861
-rect 291 1201 325 1217
-rect 35 751 69 793
-rect 291 751 325 861
-rect 35 717 325 751
-rect 66 569 100 649
-rect 66 519 100 535
-rect 152 575 162 609
-rect 152 461 186 575
-rect 152 411 186 427
-rect 223 393 257 501
-rect 291 461 325 717
-rect 223 359 262 393
-rect 296 359 312 393
-rect 35 267 241 301
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 207 115 241 131
-rect 293 266 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 66 649 100 683
-rect 162 575 196 609
-rect 223 501 257 535
-rect 291 427 325 461
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 54 683 112 689
-rect 54 649 66 683
-rect 100 649 134 683
-rect 54 643 112 649
-rect 150 609 208 615
-rect 150 575 162 609
-rect 196 575 230 609
-rect 150 569 208 575
-rect 211 535 269 541
-rect 189 501 223 535
-rect 257 501 269 535
-rect 211 495 269 501
-rect 279 461 337 467
-rect 279 427 291 461
-rect 325 427 337 461
-rect 279 421 337 427
-rect 293 319 327 421
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 83 666 83 666 1 A0
-port 1 n
-rlabel metal1 179 592 179 592 1 A1
-port 2 n
-rlabel metal1 308 444 308 444 1 Y
-port 3 n
-rlabel metal1 240 518 240 518 1 B0
-port 4 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__oai22_l.mag b/18T_ms/sky130_osu_sc_18T_ms__oai22_l.mag
deleted file mode 100644
index 650efc1..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__oai22_l.mag
+++ /dev/null
@@ -1,239 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864608
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 462 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-<< pmos >>
-rect 80 617 110 1217
-rect 152 617 182 1217
-rect 252 617 282 1217
-rect 324 617 354 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 199 166 315
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 199 293 267
-rect 327 199 338 267
-rect 282 115 338 199
-rect 368 199 421 315
-rect 368 131 379 199
-rect 413 131 421 199
-rect 368 115 421 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 793 35 1201
-rect 69 793 80 1201
-rect 27 617 80 793
-rect 110 617 152 1217
-rect 182 1201 252 1217
-rect 182 725 200 1201
-rect 234 725 252 1201
-rect 182 617 252 725
-rect 282 617 324 1217
-rect 354 1201 407 1217
-rect 354 793 365 1201
-rect 399 793 407 1201
-rect 354 617 407 793
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 199
-rect 207 131 241 267
-rect 293 199 327 267
-rect 379 131 413 199
-<< pdiffc >>
-rect 35 793 69 1201
-rect 200 725 234 1201
-rect 365 793 399 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 152 1217 182 1243
-rect 252 1217 282 1243
-rect 324 1217 354 1243
-rect 80 585 110 617
-rect 56 569 110 585
-rect 56 535 66 569
-rect 100 535 110 569
-rect 56 519 110 535
-rect 56 370 86 519
-rect 152 471 182 617
-rect 130 461 196 471
-rect 130 427 146 461
-rect 180 427 196 461
-rect 130 417 196 427
-rect 56 340 110 370
-rect 80 315 110 340
-rect 166 315 196 417
-rect 252 409 282 617
-rect 324 592 354 617
-rect 324 562 368 592
-rect 338 478 368 562
-rect 338 462 430 478
-rect 338 428 384 462
-rect 418 428 430 462
-rect 338 412 430 428
-rect 238 393 292 409
-rect 238 359 248 393
-rect 282 359 292 393
-rect 238 343 292 359
-rect 252 315 282 343
-rect 338 315 368 412
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 66 535 100 569
-rect 146 427 180 461
-rect 384 428 418 462
-rect 248 359 282 393
-<< locali >>
-rect 0 1311 462 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 462 1311
-rect 35 1201 69 1271
-rect 35 777 69 793
-rect 200 1201 234 1217
-rect 365 1201 399 1271
-rect 365 777 399 793
-rect 200 700 234 725
-rect 200 666 350 700
-rect 66 569 100 649
-rect 66 519 100 535
-rect 146 575 162 609
-rect 146 461 180 575
-rect 146 411 180 427
-rect 223 409 257 501
-rect 223 393 282 409
-rect 223 359 248 393
-rect 223 343 282 359
-rect 316 387 350 666
-rect 384 462 418 478
-rect 384 412 418 428
-rect 35 267 241 301
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 293 279 316 283
-rect 293 267 350 279
-rect 327 249 350 267
-rect 293 183 327 199
-rect 379 199 413 215
-rect 241 131 379 149
-rect 207 115 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 66 649 100 683
-rect 162 575 196 609
-rect 223 501 257 535
-rect 384 428 418 462
-rect 316 353 350 387
-rect 316 279 350 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 462 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 462 1311
-rect 0 1271 462 1277
-rect 54 683 112 689
-rect 54 649 66 683
-rect 100 649 134 683
-rect 54 643 112 649
-rect 150 609 208 615
-rect 150 575 162 609
-rect 196 575 230 609
-rect 150 569 208 575
-rect 211 535 269 541
-rect 189 501 223 535
-rect 257 501 269 535
-rect 211 495 269 501
-rect 372 462 430 468
-rect 350 428 384 462
-rect 418 428 430 462
-rect 372 422 430 428
-rect 304 387 362 393
-rect 304 353 316 387
-rect 350 353 362 387
-rect 304 347 362 353
-rect 316 319 350 347
-rect 304 313 362 319
-rect 304 279 316 313
-rect 350 279 362 313
-rect 304 273 362 279
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 240 518 240 518 1 B0
-port 4 n
-rlabel viali 179 592 179 592 1 A1
-port 2 n
-rlabel viali 83 666 83 666 1 A0
-port 1 n
-rlabel viali 333 370 333 370 1 Y
-port 3 n
-rlabel viali 401 445 401 445 1 B1
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__or2_1.mag b/18T_ms/sky130_osu_sc_18T_ms__or2_1.mag
deleted file mode 100644
index e6d1621..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__or2_1.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864608
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 335 315
-rect 282 131 293 267
-rect 327 131 335 267
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 617 166 1217
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1201 335 1217
-rect 282 657 293 1201
-rect 327 657 335 1201
-rect 282 617 335 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-<< pdiffc >>
-rect 35 725 69 1201
-rect 207 793 241 1201
-rect 293 657 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 568 110 617
-rect 27 552 110 568
-rect 27 518 37 552
-rect 71 518 110 552
-rect 27 502 110 518
-rect 166 510 196 617
-rect 252 592 282 617
-rect 252 562 289 592
-rect 80 315 110 502
-rect 163 494 217 510
-rect 163 460 173 494
-rect 207 460 217 494
-rect 163 444 217 460
-rect 166 315 196 444
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 370 313 404
-rect 252 354 313 370
-rect 252 315 282 354
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 518 71 552
-rect 173 460 207 494
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 207 1201 241 1271
-rect 207 777 241 793
-rect 293 1201 327 1217
-rect 69 725 139 743
-rect 35 709 139 725
-rect 37 552 71 575
-rect 37 502 71 518
-rect 105 404 139 709
-rect 173 494 207 649
-rect 293 535 327 657
-rect 173 444 207 460
-rect 105 370 269 404
-rect 303 370 319 404
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 370
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 37 575 71 609
-rect 173 649 207 683
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 161 683 219 689
-rect 140 649 173 683
-rect 207 649 219 683
-rect 161 643 219 649
-rect 25 609 83 615
-rect 25 575 37 609
-rect 71 575 105 609
-rect 25 569 83 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 190 666 190 666 1 A
-port 2 n
-rlabel metal1 54 592 54 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__or2_2.mag b/18T_ms/sky130_osu_sc_18T_ms__or2_2.mag
deleted file mode 100644
index 689b7e1..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__or2_2.mag
+++ /dev/null
@@ -1,221 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864608
-<< checkpaint >>
-rect -1209 -1243 1617 2575
-<< nwell >>
-rect -9 581 462 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 421 315
-rect 368 131 379 267
-rect 413 131 421 267
-rect 368 115 421 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 617 166 1217
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 421 1217
-rect 368 657 379 1201
-rect 413 657 421 1201
-rect 368 617 421 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-<< pdiffc >>
-rect 35 725 69 1201
-rect 207 793 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 80 568 110 617
-rect 27 552 110 568
-rect 27 518 37 552
-rect 71 518 110 552
-rect 27 502 110 518
-rect 166 510 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 252 562 368 592
-rect 80 315 110 502
-rect 163 494 217 510
-rect 163 460 173 494
-rect 207 460 217 494
-rect 163 444 217 460
-rect 166 315 196 444
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 303 370 368 384
-rect 252 354 368 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-rect 338 89 368 115
-<< polycont >>
-rect 37 518 71 552
-rect 173 460 207 494
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 462 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 462 1311
-rect 35 1201 69 1217
-rect 207 1201 241 1271
-rect 207 777 241 793
-rect 293 1201 327 1217
-rect 69 725 139 743
-rect 35 709 139 725
-rect 37 552 71 575
-rect 37 502 71 518
-rect 105 404 139 709
-rect 173 494 207 649
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 173 444 207 460
-rect 105 370 269 404
-rect 303 370 319 404
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 370
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 462 61
-rect 0 0 462 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 37 575 71 609
-rect 173 649 207 683
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-<< metal1 >>
-rect 0 1311 462 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 462 1311
-rect 0 1271 462 1277
-rect 161 683 219 689
-rect 140 649 173 683
-rect 207 649 219 683
-rect 161 643 219 649
-rect 25 609 83 615
-rect 25 575 37 609
-rect 71 575 105 609
-rect 25 569 83 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 462 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 462 55
-rect 0 0 462 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 190 666 190 666 1 A
-port 2 n
-rlabel metal1 54 592 54 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__or2_4.mag b/18T_ms/sky130_osu_sc_18T_ms__or2_4.mag
deleted file mode 100644
index 8b7840c..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__or2_4.mag
+++ /dev/null
@@ -1,284 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864608
-<< checkpaint >>
-rect -1209 -1243 1753 2575
-<< nwell >>
-rect -9 581 638 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 593 315
-rect 540 131 551 267
-rect 585 131 593 267
-rect 540 115 593 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 617 166 1217
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 593 1217
-rect 540 657 551 1201
-rect 585 657 593 1201
-rect 540 617 593 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-<< pdiffc >>
-rect 35 725 69 1201
-rect 207 793 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 80 568 110 617
-rect 27 552 110 568
-rect 27 518 37 552
-rect 71 518 110 552
-rect 27 502 110 518
-rect 166 510 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 252 562 540 592
-rect 80 315 110 502
-rect 163 494 217 510
-rect 163 460 173 494
-rect 207 460 217 494
-rect 163 444 217 460
-rect 166 315 196 444
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 303 370 540 384
-rect 252 354 540 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-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 518 71 552
-rect 173 460 207 494
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 638 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 638 1311
-rect 35 1201 69 1217
-rect 207 1201 241 1271
-rect 207 777 241 793
-rect 293 1201 327 1217
-rect 69 725 139 743
-rect 35 709 139 725
-rect 37 552 71 575
-rect 37 502 71 518
-rect 105 404 139 709
-rect 173 494 207 649
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 535 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 173 444 207 460
-rect 105 370 269 404
-rect 303 370 319 404
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 370
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 37 575 71 609
-rect 173 649 207 683
-rect 293 501 327 535
-rect 465 501 499 535
-rect 293 279 327 313
-rect 465 279 499 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 638 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 638 1311
-rect 0 1271 638 1277
-rect 161 683 219 689
-rect 140 649 173 683
-rect 207 649 219 683
-rect 161 643 219 649
-rect 25 609 83 615
-rect 25 575 37 609
-rect 71 575 105 609
-rect 25 569 83 575
-rect 281 535 339 541
-rect 453 535 511 541
-rect 281 501 293 535
-rect 327 501 465 535
-rect 499 501 511 535
-rect 281 495 339 501
-rect 453 495 511 501
-rect 293 319 327 495
-rect 465 319 499 495
-rect 281 313 339 319
-rect 453 313 511 319
-rect 281 279 293 313
-rect 327 279 465 313
-rect 499 279 511 313
-rect 281 273 339 279
-rect 453 273 511 279
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 190 666 190 666 1 A
-port 2 n
-rlabel metal1 54 592 54 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__or2_8.mag b/18T_ms/sky130_osu_sc_18T_ms__or2_8.mag
deleted file mode 100644
index 709d3d3..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__or2_8.mag
+++ /dev/null
@@ -1,426 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864609
-<< checkpaint >>
-rect -1209 -1243 2161 2575
-<< nwell >>
-rect -9 581 990 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 252 115 282 315
-rect 338 115 368 315
-rect 424 115 454 315
-rect 510 115 540 315
-rect 596 115 626 315
-rect 682 115 712 315
-rect 768 115 798 315
-rect 854 115 884 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 252 617 282 1217
-rect 338 617 368 1217
-rect 424 617 454 1217
-rect 510 617 540 1217
-rect 596 617 626 1217
-rect 682 617 712 1217
-rect 768 617 798 1217
-rect 854 617 884 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 267 252 315
-rect 196 131 207 267
-rect 241 131 252 267
-rect 196 115 252 131
-rect 282 267 338 315
-rect 282 131 293 267
-rect 327 131 338 267
-rect 282 115 338 131
-rect 368 267 424 315
-rect 368 131 379 267
-rect 413 131 424 267
-rect 368 115 424 131
-rect 454 267 510 315
-rect 454 131 465 267
-rect 499 131 510 267
-rect 454 115 510 131
-rect 540 267 596 315
-rect 540 131 551 267
-rect 585 131 596 267
-rect 540 115 596 131
-rect 626 267 682 315
-rect 626 131 637 267
-rect 671 131 682 267
-rect 626 115 682 131
-rect 712 267 768 315
-rect 712 131 723 267
-rect 757 131 768 267
-rect 712 115 768 131
-rect 798 267 854 315
-rect 798 131 809 267
-rect 843 131 854 267
-rect 798 115 854 131
-rect 884 267 937 315
-rect 884 131 895 267
-rect 929 131 937 267
-rect 884 115 937 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 725 35 1201
-rect 69 725 80 1201
-rect 27 617 80 725
-rect 110 617 166 1217
-rect 196 1201 252 1217
-rect 196 793 207 1201
-rect 241 793 252 1201
-rect 196 617 252 793
-rect 282 1201 338 1217
-rect 282 657 293 1201
-rect 327 657 338 1201
-rect 282 617 338 657
-rect 368 1201 424 1217
-rect 368 657 379 1201
-rect 413 657 424 1201
-rect 368 617 424 657
-rect 454 1201 510 1217
-rect 454 657 465 1201
-rect 499 657 510 1201
-rect 454 617 510 657
-rect 540 1201 596 1217
-rect 540 657 551 1201
-rect 585 657 596 1201
-rect 540 617 596 657
-rect 626 1201 682 1217
-rect 626 657 637 1201
-rect 671 657 682 1201
-rect 626 617 682 657
-rect 712 1201 768 1217
-rect 712 657 723 1201
-rect 757 657 768 1201
-rect 712 617 768 657
-rect 798 1201 854 1217
-rect 798 657 809 1201
-rect 843 657 854 1201
-rect 798 617 854 657
-rect 884 1201 937 1217
-rect 884 657 895 1201
-rect 929 657 937 1201
-rect 884 617 937 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 207 131 241 267
-rect 293 131 327 267
-rect 379 131 413 267
-rect 465 131 499 267
-rect 551 131 585 267
-rect 637 131 671 267
-rect 723 131 757 267
-rect 809 131 843 267
-rect 895 131 929 267
-<< pdiffc >>
-rect 35 725 69 1201
-rect 207 793 241 1201
-rect 293 657 327 1201
-rect 379 657 413 1201
-rect 465 657 499 1201
-rect 551 657 585 1201
-rect 637 657 671 1201
-rect 723 657 757 1201
-rect 809 657 843 1201
-rect 895 657 929 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-rect 571 1271 595 1305
-rect 629 1271 653 1305
-rect 707 1271 731 1305
-rect 765 1271 789 1305
-rect 843 1271 867 1305
-rect 901 1271 925 1305
-<< 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 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-rect 595 1271 629 1305
-rect 731 1271 765 1305
-rect 867 1271 901 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 338 1217 368 1244
-rect 424 1217 454 1243
-rect 510 1217 540 1243
-rect 596 1217 626 1243
-rect 682 1217 712 1243
-rect 768 1217 798 1243
-rect 854 1217 884 1243
-rect 80 568 110 617
-rect 27 552 110 568
-rect 27 518 37 552
-rect 71 518 110 552
-rect 27 502 110 518
-rect 166 510 196 617
-rect 252 592 282 617
-rect 338 592 368 617
-rect 424 592 454 617
-rect 510 592 540 617
-rect 596 592 626 617
-rect 682 592 712 617
-rect 768 592 798 617
-rect 854 592 884 617
-rect 252 562 884 592
-rect 80 315 110 502
-rect 163 494 217 510
-rect 163 460 173 494
-rect 207 460 217 494
-rect 163 444 217 460
-rect 166 315 196 444
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 384 313 404
-rect 596 384 626 562
-rect 303 370 884 384
-rect 252 354 884 370
-rect 252 315 282 354
-rect 338 315 368 354
-rect 424 315 454 354
-rect 510 315 540 354
-rect 596 315 626 354
-rect 682 315 712 354
-rect 768 315 798 354
-rect 854 315 884 354
-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 518 71 552
-rect 173 460 207 494
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 990 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 595 1311
-rect 629 1271 731 1311
-rect 765 1271 867 1311
-rect 901 1271 990 1311
-rect 35 1201 69 1217
-rect 207 1201 241 1271
-rect 207 777 241 793
-rect 293 1201 327 1217
-rect 69 725 139 743
-rect 35 709 139 725
-rect 37 552 71 575
-rect 37 502 71 518
-rect 105 404 139 709
-rect 173 494 207 649
-rect 293 535 327 657
-rect 379 1201 413 1271
-rect 379 641 413 657
-rect 465 1201 499 1217
-rect 465 535 499 657
-rect 551 1201 585 1271
-rect 551 641 585 657
-rect 637 1201 671 1217
-rect 637 535 671 657
-rect 723 1201 757 1271
-rect 723 641 757 657
-rect 809 1201 843 1217
-rect 809 535 843 657
-rect 895 1201 929 1271
-rect 895 641 929 657
-rect 173 444 207 460
-rect 105 370 269 404
-rect 303 370 319 404
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 370
-rect 121 115 155 131
-rect 207 267 241 283
-rect 207 61 241 131
-rect 293 267 327 279
-rect 293 115 327 131
-rect 379 267 413 283
-rect 379 61 413 131
-rect 465 267 499 279
-rect 465 115 499 131
-rect 551 267 585 283
-rect 551 61 585 131
-rect 637 267 671 279
-rect 637 115 671 131
-rect 723 267 757 283
-rect 723 61 757 131
-rect 809 267 843 279
-rect 809 115 843 131
-rect 895 267 929 283
-rect 895 61 929 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 595 61
-rect 629 21 731 61
-rect 765 21 867 61
-rect 901 21 990 61
-rect 0 0 990 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 595 1305 629 1311
-rect 595 1277 629 1305
-rect 731 1305 765 1311
-rect 731 1277 765 1305
-rect 867 1305 901 1311
-rect 867 1277 901 1305
-rect 37 575 71 609
-rect 173 649 207 683
-rect 293 501 327 535
-rect 465 501 499 535
-rect 637 501 671 535
-rect 809 501 843 535
-rect 293 279 327 313
-rect 465 279 499 313
-rect 637 279 671 313
-rect 809 279 843 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-rect 595 27 629 55
-rect 595 21 629 27
-rect 731 27 765 55
-rect 731 21 765 27
-rect 867 27 901 55
-rect 867 21 901 27
-<< metal1 >>
-rect 0 1311 990 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 595 1311
-rect 629 1277 731 1311
-rect 765 1277 867 1311
-rect 901 1277 990 1311
-rect 0 1271 990 1277
-rect 161 683 219 689
-rect 140 649 173 683
-rect 207 649 219 683
-rect 161 643 219 649
-rect 25 609 83 615
-rect 25 575 37 609
-rect 71 575 105 609
-rect 25 569 83 575
-rect 281 535 339 541
-rect 453 535 511 541
-rect 625 535 683 541
-rect 797 535 855 541
-rect 281 501 293 535
-rect 327 501 465 535
-rect 499 501 637 535
-rect 671 501 809 535
-rect 843 501 855 535
-rect 281 495 339 501
-rect 453 495 511 501
-rect 625 495 683 501
-rect 797 495 855 501
-rect 293 319 327 495
-rect 465 319 499 495
-rect 637 319 671 495
-rect 809 319 843 495
-rect 281 313 339 319
-rect 453 313 511 319
-rect 625 313 683 319
-rect 797 313 855 319
-rect 281 279 293 313
-rect 327 279 465 313
-rect 499 279 637 313
-rect 671 279 683 313
-rect 712 279 809 313
-rect 843 279 855 313
-rect 281 273 339 279
-rect 453 273 511 279
-rect 625 273 683 279
-rect 797 273 855 279
-rect 0 55 990 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 595 55
-rect 629 21 731 55
-rect 765 21 867 55
-rect 901 21 990 55
-rect 0 0 990 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 190 666 190 666 1 A
-port 2 n
-rlabel metal1 54 592 54 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__or2_l.mag b/18T_ms/sky130_osu_sc_18T_ms__or2_l.mag
deleted file mode 100644
index cc30af0..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__or2_l.mag
+++ /dev/null
@@ -1,186 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864609
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 374 1341
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-<< pmos >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 252 817 282 1217
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 166 263
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 199 252 263
-rect 196 131 207 199
-rect 241 131 252 199
-rect 196 115 252 131
-rect 282 199 335 263
-rect 282 131 293 199
-rect 327 131 335 199
-rect 282 115 335 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 929 35 1201
-rect 69 929 80 1201
-rect 27 817 80 929
-rect 110 817 166 1217
-rect 196 1201 252 1217
-rect 196 929 207 1201
-rect 241 929 252 1201
-rect 196 817 252 929
-rect 282 1201 335 1217
-rect 282 929 293 1201
-rect 327 929 335 1201
-rect 282 817 335 929
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-rect 207 131 241 199
-rect 293 131 327 199
-<< pdiffc >>
-rect 35 929 69 1201
-rect 207 929 241 1201
-rect 293 929 327 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 252 1217 282 1243
-rect 80 568 110 817
-rect 27 552 110 568
-rect 27 518 37 552
-rect 71 518 110 552
-rect 27 502 110 518
-rect 166 510 196 817
-rect 252 592 282 817
-rect 252 562 289 592
-rect 80 263 110 502
-rect 163 494 217 510
-rect 163 460 173 494
-rect 207 460 217 494
-rect 163 444 217 460
-rect 166 263 196 444
-rect 259 420 289 562
-rect 259 404 313 420
-rect 259 384 269 404
-rect 252 370 269 384
-rect 303 370 313 404
-rect 252 354 313 370
-rect 252 263 282 354
-rect 80 89 110 115
-rect 166 89 196 115
-rect 252 89 282 115
-<< polycont >>
-rect 37 518 71 552
-rect 173 460 207 494
-rect 269 370 303 404
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 35 743 69 929
-rect 207 1201 241 1271
-rect 207 913 241 929
-rect 293 1201 327 1217
-rect 35 709 139 743
-rect 37 552 71 575
-rect 37 502 71 518
-rect 105 404 139 709
-rect 173 494 207 649
-rect 293 535 327 929
-rect 173 444 207 460
-rect 105 370 269 404
-rect 303 370 319 404
-rect 35 199 69 215
-rect 35 61 69 131
-rect 121 199 155 370
-rect 121 115 155 131
-rect 207 199 241 215
-rect 207 61 241 131
-rect 293 199 327 279
-rect 293 115 327 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 37 575 71 609
-rect 173 649 207 683
-rect 293 501 327 535
-rect 293 279 327 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 161 683 219 689
-rect 140 649 173 683
-rect 207 649 219 683
-rect 161 643 219 649
-rect 25 609 83 615
-rect 25 575 37 609
-rect 71 575 105 609
-rect 25 569 83 575
-rect 281 535 339 541
-rect 281 501 293 535
-rect 327 501 339 535
-rect 281 495 339 501
-rect 293 319 327 495
-rect 281 313 339 319
-rect 281 279 293 313
-rect 327 279 339 313
-rect 281 273 339 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 311 444 311 444 1 Y
-port 1 n
-rlabel metal1 54 592 54 592 1 B
-port 2 n
-rlabel metal1 190 666 190 666 1 A
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__tbufi_1.mag b/18T_ms/sky130_osu_sc_18T_ms__tbufi_1.mag
deleted file mode 100644
index 4718bbd..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__tbufi_1.mag
+++ /dev/null
@@ -1,185 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864609
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 375 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 238 115 268 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 238 617 268 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 115 238 315
-rect 268 267 321 315
-rect 268 131 279 267
-rect 313 131 321 267
-rect 268 115 321 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 617 238 1217
-rect 268 1201 321 1217
-rect 268 657 279 1201
-rect 313 657 321 1201
-rect 268 617 321 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 279 131 313 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 725 155 1201
-rect 279 657 313 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 80 602 110 617
-rect 39 572 110 602
-rect 39 360 69 572
-rect 166 529 196 617
-rect 133 513 196 529
-rect 133 479 143 513
-rect 177 479 196 513
-rect 133 463 196 479
-rect 238 451 268 617
-rect 238 435 292 451
-rect 111 387 165 403
-rect 111 360 121 387
-rect 39 353 121 360
-rect 155 360 165 387
-rect 238 401 248 435
-rect 282 401 292 435
-rect 238 385 292 401
-rect 155 353 196 360
-rect 39 330 196 353
-rect 80 315 110 330
-rect 166 315 196 330
-rect 238 315 268 385
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 143 479 177 513
-rect 121 353 155 387
-rect 248 401 282 435
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 709 155 725
-rect 279 1201 313 1217
-rect 35 513 69 657
-rect 143 513 177 529
-rect 35 479 143 513
-rect 35 267 69 479
-rect 143 463 177 479
-rect 211 435 245 649
-rect 279 535 313 657
-rect 211 401 248 435
-rect 282 401 298 435
-rect 103 353 121 387
-rect 155 353 171 387
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 279 267 313 279
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 211 649 245 683
-rect 279 501 313 535
-rect 121 353 155 387
-rect 279 279 313 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 199 683 257 689
-rect 177 649 211 683
-rect 245 649 257 683
-rect 199 643 257 649
-rect 109 609 167 615
-rect 109 575 189 609
-rect 109 569 167 575
-rect 121 393 155 569
-rect 267 535 325 541
-rect 267 501 279 535
-rect 313 501 325 535
-rect 267 495 325 501
-rect 109 387 167 393
-rect 109 353 121 387
-rect 155 353 167 387
-rect 109 347 167 353
-rect 279 319 313 495
-rect 267 313 325 319
-rect 267 279 279 313
-rect 313 279 325 313
-rect 267 273 325 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 364 305 364 1 Y
-port 1 n
-rlabel metal1 228 666 228 666 1 A
-port 2 n
-rlabel metal1 138 592 138 592 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__tbufi_l.mag b/18T_ms/sky130_osu_sc_18T_ms__tbufi_l.mag
deleted file mode 100644
index dcc28e3..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__tbufi_l.mag
+++ /dev/null
@@ -1,185 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864609
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 375 1341
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
-<< pmos >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 238 817 268 1217
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 166 263
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 115 238 263
-rect 268 199 321 263
-rect 268 131 279 199
-rect 313 131 321 199
-rect 268 115 321 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 817 166 861
-rect 196 817 238 1217
-rect 268 1201 321 1217
-rect 268 861 279 1201
-rect 313 861 321 1201
-rect 268 817 321 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-rect 279 131 313 199
-<< pdiffc >>
-rect 35 861 69 1201
-rect 121 861 155 1201
-rect 279 861 313 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 80 602 110 817
-rect 39 572 110 602
-rect 39 360 69 572
-rect 166 529 196 817
-rect 133 513 196 529
-rect 133 479 143 513
-rect 177 479 196 513
-rect 133 463 196 479
-rect 238 451 268 817
-rect 238 435 292 451
-rect 111 387 165 403
-rect 111 360 121 387
-rect 39 353 121 360
-rect 155 360 165 387
-rect 238 401 248 435
-rect 282 401 292 435
-rect 238 385 292 401
-rect 155 353 196 360
-rect 39 330 196 353
-rect 80 263 110 330
-rect 166 263 196 330
-rect 238 263 268 385
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 143 479 177 513
-rect 121 353 155 387
-rect 248 401 282 435
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 35 513 69 861
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 279 1201 313 1217
-rect 143 513 177 529
-rect 35 479 143 513
-rect 35 199 69 479
-rect 143 463 177 479
-rect 211 435 245 649
-rect 279 535 313 861
-rect 211 401 248 435
-rect 282 401 298 435
-rect 103 353 121 387
-rect 155 353 171 387
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 279 199 313 279
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 211 649 245 683
-rect 279 501 313 535
-rect 121 353 155 387
-rect 279 279 313 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 199 683 257 689
-rect 177 649 211 683
-rect 245 649 257 683
-rect 199 643 257 649
-rect 109 609 167 615
-rect 109 575 189 609
-rect 109 569 167 575
-rect 121 393 155 569
-rect 267 535 325 541
-rect 267 501 279 535
-rect 313 501 325 535
-rect 267 495 325 501
-rect 109 387 167 393
-rect 109 353 121 387
-rect 155 353 167 387
-rect 109 347 167 353
-rect 279 319 313 495
-rect 267 313 325 319
-rect 267 279 279 313
-rect 313 279 325 313
-rect 267 273 325 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 364 305 364 1 Y
-port 1 n
-rlabel metal1 228 666 228 666 1 A
-port 2 n
-rlabel metal1 138 592 138 592 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__tiehi.mag b/18T_ms/sky130_osu_sc_18T_ms__tiehi.mag
deleted file mode 100644
index d05b702..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__tiehi.mag
+++ /dev/null
@@ -1,99 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864609
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< nmos >>
-rect 80 115 110 315
-<< pmos >>
-rect 80 617 110 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 657 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 433 110 617
-rect 80 417 134 433
-rect 80 383 90 417
-rect 124 383 134 417
-rect 80 367 134 383
-rect 80 315 110 367
-rect 80 89 110 115
-<< polycont >>
-rect 90 383 124 417
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 641 69 657
-rect 121 1201 155 1217
-rect 121 609 155 657
-rect 74 383 90 417
-rect 124 383 155 417
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 383
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 121 575 155 609
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 94 609 167 615
-rect 94 575 121 609
-rect 155 575 167 609
-rect 94 569 167 575
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 138 592 138 592 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__tielo.mag b/18T_ms/sky130_osu_sc_18T_ms__tielo.mag
deleted file mode 100644
index 5a351a2..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__tielo.mag
+++ /dev/null
@@ -1,99 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864610
-<< checkpaint >>
-rect -1209 -1243 1345 2575
-<< nwell >>
-rect -9 581 199 1341
-<< nmos >>
-rect 80 115 110 315
-<< pmos >>
-rect 80 617 110 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 163 315
-rect 110 131 121 267
-rect 155 131 163 267
-rect 110 115 163 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 163 1217
-rect 110 657 121 1201
-rect 155 657 163 1201
-rect 110 617 163 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 657 155 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 80 565 110 617
-rect 80 549 134 565
-rect 80 515 90 549
-rect 124 515 134 549
-rect 80 499 134 515
-rect 80 315 110 499
-rect 80 89 110 115
-<< polycont >>
-rect 90 515 124 549
-<< locali >>
-rect 0 1311 198 1332
-rect 0 1271 51 1311
-rect 85 1271 198 1311
-rect 35 1201 69 1271
-rect 35 641 69 657
-rect 121 1201 155 1217
-rect 121 549 155 657
-rect 74 515 90 549
-rect 124 515 155 549
-rect 35 267 69 283
-rect 35 61 69 131
-rect 121 267 155 353
-rect 121 115 155 131
-rect 0 21 51 61
-rect 85 21 198 61
-rect 0 0 198 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 121 353 155 387
-rect 51 27 85 55
-rect 51 21 85 27
-<< metal1 >>
-rect 0 1311 198 1332
-rect 0 1277 51 1311
-rect 85 1277 198 1311
-rect 0 1271 198 1277
-rect 94 387 167 393
-rect 94 353 121 387
-rect 155 353 167 387
-rect 94 347 167 353
-rect 0 55 198 61
-rect 0 21 51 55
-rect 85 21 198 55
-rect 0 0 198 21
-<< labels >>
-rlabel metal1 138 370 138 370 1 Y
-port 1 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__tnbufi_1.mag b/18T_ms/sky130_osu_sc_18T_ms__tnbufi_1.mag
deleted file mode 100644
index 1e21fd3..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__tnbufi_1.mag
+++ /dev/null
@@ -1,180 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864610
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 375 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 238 115 268 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 238 617 268 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 115 238 315
-rect 268 267 321 315
-rect 268 131 279 267
-rect 313 131 321 267
-rect 268 115 321 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 725 121 1201
-rect 155 725 166 1201
-rect 110 617 166 725
-rect 196 617 238 1217
-rect 268 1201 321 1217
-rect 268 657 279 1201
-rect 313 657 321 1201
-rect 268 617 321 657
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 279 131 313 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 725 155 1201
-rect 279 657 313 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 80 602 110 617
-rect 166 602 196 617
-rect 39 572 196 602
-rect 39 360 69 572
-rect 111 570 165 572
-rect 111 536 121 570
-rect 155 536 165 570
-rect 111 520 165 536
-rect 111 452 196 468
-rect 111 418 121 452
-rect 155 418 196 452
-rect 111 402 196 418
-rect 39 330 110 360
-rect 80 315 110 330
-rect 166 315 196 402
-rect 238 451 268 617
-rect 238 435 292 451
-rect 238 401 248 435
-rect 282 401 292 435
-rect 238 385 292 401
-rect 238 315 268 385
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 121 536 155 570
-rect 121 418 155 452
-rect 248 401 282 435
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 709 155 725
-rect 279 1201 313 1217
-rect 35 452 69 657
-rect 121 570 155 575
-rect 121 520 155 536
-rect 121 452 155 468
-rect 35 418 121 452
-rect 35 267 69 418
-rect 121 402 155 418
-rect 211 435 245 649
-rect 279 535 313 657
-rect 211 401 248 435
-rect 282 401 298 435
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 279 267 313 279
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 211 649 245 683
-rect 121 575 155 609
-rect 279 501 313 535
-rect 279 279 313 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 199 683 257 689
-rect 177 649 211 683
-rect 245 649 257 683
-rect 199 643 257 649
-rect 109 609 167 615
-rect 109 575 121 609
-rect 155 575 189 609
-rect 109 569 167 575
-rect 267 535 325 541
-rect 267 501 279 535
-rect 313 501 325 535
-rect 267 495 325 501
-rect 279 319 313 495
-rect 267 313 325 319
-rect 267 279 279 313
-rect 313 279 325 313
-rect 267 273 325 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 364 305 364 1 Y
-port 1 n
-rlabel metal1 228 666 228 666 1 A
-port 2 n
-rlabel metal1 138 592 138 592 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__tnbufi_l.mag b/18T_ms/sky130_osu_sc_18T_ms__tnbufi_l.mag
deleted file mode 100644
index be98072..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__tnbufi_l.mag
+++ /dev/null
@@ -1,180 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864610
-<< checkpaint >>
-rect -1209 -1243 1481 2575
-<< nwell >>
-rect -9 581 375 1341
-<< nmos >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
-<< pmos >>
-rect 80 817 110 1217
-rect 166 817 196 1217
-rect 238 817 268 1217
-<< ndiff >>
-rect 27 199 80 263
-rect 27 131 35 199
-rect 69 131 80 199
-rect 27 115 80 131
-rect 110 199 166 263
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 115 238 263
-rect 268 199 321 263
-rect 268 131 279 199
-rect 313 131 321 199
-rect 268 115 321 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 861 35 1201
-rect 69 861 80 1201
-rect 27 817 80 861
-rect 110 1201 166 1217
-rect 110 861 121 1201
-rect 155 861 166 1201
-rect 110 817 166 861
-rect 196 817 238 1217
-rect 268 1201 321 1217
-rect 268 861 279 1201
-rect 313 861 321 1201
-rect 268 817 321 861
-<< ndiffc >>
-rect 35 131 69 199
-rect 121 131 155 199
-rect 279 131 313 199
-<< pdiffc >>
-rect 35 861 69 1201
-rect 121 861 155 1201
-rect 279 861 313 1201
-<< psubdiff >>
-rect 27 27 51 61
-rect 85 27 109 61
-rect 163 27 187 61
-rect 221 27 245 61
-<< nsubdiff >>
-rect 27 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 80 602 110 817
-rect 166 602 196 817
-rect 39 572 196 602
-rect 39 360 69 572
-rect 111 570 165 572
-rect 111 536 121 570
-rect 155 536 165 570
-rect 111 520 165 536
-rect 111 452 196 468
-rect 111 418 121 452
-rect 155 418 196 452
-rect 111 402 196 418
-rect 39 330 110 360
-rect 80 263 110 330
-rect 166 263 196 402
-rect 238 451 268 817
-rect 238 435 292 451
-rect 238 401 248 435
-rect 282 401 292 435
-rect 238 385 292 401
-rect 238 263 268 385
-rect 80 89 110 115
-rect 166 89 196 115
-rect 238 89 268 115
-<< polycont >>
-rect 121 536 155 570
-rect 121 418 155 452
-rect 248 401 282 435
-<< locali >>
-rect 0 1311 374 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 374 1311
-rect 35 1201 69 1217
-rect 35 452 69 861
-rect 121 1201 155 1271
-rect 121 845 155 861
-rect 279 1201 313 1217
-rect 121 570 155 575
-rect 121 520 155 536
-rect 121 452 155 468
-rect 35 418 121 452
-rect 35 199 69 418
-rect 121 402 155 418
-rect 211 435 245 649
-rect 279 535 313 861
-rect 211 401 248 435
-rect 282 401 298 435
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 279 199 313 279
-rect 279 115 313 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 374 61
-rect 0 0 374 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 211 649 245 683
-rect 121 575 155 609
-rect 279 501 313 535
-rect 279 279 313 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-<< metal1 >>
-rect 0 1311 374 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 374 1311
-rect 0 1271 374 1277
-rect 199 683 257 689
-rect 177 649 211 683
-rect 245 649 257 683
-rect 199 643 257 649
-rect 109 609 167 615
-rect 109 575 121 609
-rect 155 575 189 609
-rect 109 569 167 575
-rect 267 535 325 541
-rect 267 501 279 535
-rect 313 501 325 535
-rect 267 495 325 501
-rect 279 319 313 495
-rect 267 313 325 319
-rect 267 279 279 313
-rect 313 279 325 313
-rect 267 273 325 279
-rect 0 55 374 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 374 55
-rect 0 0 374 21
-<< labels >>
-rlabel metal1 305 364 305 364 1 Y
-port 1 n
-rlabel metal1 228 666 228 666 1 A
-port 2 n
-rlabel metal1 138 592 138 592 1 OE
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__xnor2_l.mag b/18T_ms/sky130_osu_sc_18T_ms__xnor2_l.mag
deleted file mode 100644
index 76a281d..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__xnor2_l.mag
+++ /dev/null
@@ -1,291 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864610
-<< checkpaint >>
-rect -1209 -1243 1753 2575
-<< nwell >>
-rect -9 581 638 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 238 115 268 315
-rect 358 115 388 315
-rect 430 115 460 315
-rect 516 115 546 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 238 617 268 1217
-rect 358 617 388 1217
-rect 430 617 460 1217
-rect 516 617 546 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 199 166 315
-rect 110 131 121 199
-rect 155 131 166 199
-rect 110 115 166 131
-rect 196 115 238 315
-rect 268 267 358 315
-rect 268 131 279 267
-rect 347 131 358 267
-rect 268 115 358 131
-rect 388 115 430 315
-rect 460 199 516 315
-rect 460 131 471 199
-rect 505 131 516 199
-rect 460 115 516 131
-rect 546 267 599 315
-rect 546 131 557 267
-rect 591 131 599 267
-rect 546 115 599 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 657 121 1201
-rect 155 657 166 1201
-rect 110 617 166 657
-rect 196 617 238 1217
-rect 268 1201 358 1217
-rect 268 657 279 1201
-rect 347 657 358 1201
-rect 268 617 358 657
-rect 388 617 430 1217
-rect 460 1201 516 1217
-rect 460 657 471 1201
-rect 505 657 516 1201
-rect 460 617 516 657
-rect 546 1201 599 1217
-rect 546 658 557 1201
-rect 591 658 599 1201
-rect 546 617 599 658
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 199
-rect 279 131 347 267
-rect 471 131 505 199
-rect 557 131 591 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 657 155 1201
-rect 279 657 347 1201
-rect 471 657 505 1201
-rect 557 658 591 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 358 1217 388 1243
-rect 430 1217 460 1243
-rect 516 1217 546 1243
-rect 80 602 110 617
-rect 70 572 110 602
-rect 70 360 100 572
-rect 166 511 196 617
-rect 142 495 196 511
-rect 142 461 152 495
-rect 186 461 196 495
-rect 142 445 196 461
-rect 238 586 268 617
-rect 238 570 292 586
-rect 238 536 248 570
-rect 282 536 292 570
-rect 238 520 292 536
-rect 142 387 196 403
-rect 142 360 152 387
-rect 70 353 152 360
-rect 186 353 196 387
-rect 70 330 196 353
-rect 80 315 110 330
-rect 166 315 196 330
-rect 238 315 268 520
-rect 358 511 388 617
-rect 430 602 460 617
-rect 516 602 546 617
-rect 430 572 546 602
-rect 358 495 472 511
-rect 358 481 428 495
-rect 418 461 428 481
-rect 462 461 472 495
-rect 418 445 472 461
-rect 516 403 546 572
-rect 326 387 380 403
-rect 326 353 336 387
-rect 370 360 380 387
-rect 479 387 546 403
-rect 479 360 489 387
-rect 370 353 388 360
-rect 326 337 388 353
-rect 358 315 388 337
-rect 430 353 489 360
-rect 523 353 546 387
-rect 430 330 546 353
-rect 430 315 460 330
-rect 516 315 546 330
-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 461 186 495
-rect 248 536 282 570
-rect 152 353 186 387
-rect 428 461 462 495
-rect 336 353 370 387
-rect 489 353 523 387
-<< locali >>
-rect 0 1311 638 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 638 1311
-rect 35 1201 69 1217
-rect 35 495 69 657
-rect 121 1201 155 1271
-rect 279 1201 347 1217
-rect 121 641 155 657
-rect 268 683 279 689
-rect 302 649 347 657
-rect 279 641 347 649
-rect 471 1201 505 1271
-rect 471 641 505 657
-rect 557 1201 591 1217
-rect 557 570 591 658
-rect 232 536 248 570
-rect 282 536 591 570
-rect 35 461 152 495
-rect 186 461 370 495
-rect 35 267 69 461
-rect 152 387 186 403
-rect 336 387 370 461
-rect 152 313 186 353
-rect 268 283 302 353
-rect 336 337 370 353
-rect 412 461 428 495
-rect 462 461 478 495
-rect 412 313 446 461
-rect 489 387 523 403
-rect 489 337 523 353
-rect 268 267 347 283
-rect 268 249 279 267
-rect 35 115 69 131
-rect 121 199 155 215
-rect 121 61 155 131
-rect 557 267 591 536
-rect 279 115 347 131
-rect 471 199 505 215
-rect 471 61 505 131
-rect 557 115 591 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 268 657 279 683
-rect 279 657 302 683
-rect 268 649 302 657
-rect 152 279 186 313
-rect 268 353 302 387
-rect 489 353 523 387
-rect 412 279 446 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 638 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 638 1311
-rect 0 1271 638 1277
-rect 256 683 314 689
-rect 256 649 268 683
-rect 302 649 314 683
-rect 256 643 314 649
-rect 268 393 302 643
-rect 256 387 314 393
-rect 477 387 535 393
-rect 256 353 268 387
-rect 302 353 314 387
-rect 455 353 489 387
-rect 523 353 535 387
-rect 256 347 314 353
-rect 477 347 535 353
-rect 140 313 198 319
-rect 400 313 458 319
-rect 140 279 152 313
-rect 186 279 412 313
-rect 446 279 458 313
-rect 140 273 198 279
-rect 400 273 458 279
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 170 296 170 296 1 A
-port 1 n
-rlabel metal1 506 370 506 370 1 B
-port 2 n
-rlabel metal1 284 427 284 427 1 Y
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/18T_ms/sky130_osu_sc_18T_ms__xor2_l.mag b/18T_ms/sky130_osu_sc_18T_ms__xor2_l.mag
deleted file mode 100644
index 9e67659..0000000
--- a/18T_ms/sky130_osu_sc_18T_ms__xor2_l.mag
+++ /dev/null
@@ -1,290 +0,0 @@
-magic
-tech sky130A
-magscale 1 2
-timestamp 1606864610
-<< checkpaint >>
-rect -1209 -1243 1753 2575
-<< nwell >>
-rect -9 581 638 1341
-<< nmos >>
-rect 80 115 110 315
-rect 166 115 196 315
-rect 238 115 268 315
-rect 358 115 388 315
-rect 430 115 460 315
-rect 516 115 546 315
-<< pmos >>
-rect 80 617 110 1217
-rect 166 617 196 1217
-rect 238 617 268 1217
-rect 358 617 388 1217
-rect 430 617 460 1217
-rect 516 617 546 1217
-<< ndiff >>
-rect 27 267 80 315
-rect 27 131 35 267
-rect 69 131 80 267
-rect 27 115 80 131
-rect 110 267 166 315
-rect 110 131 121 267
-rect 155 131 166 267
-rect 110 115 166 131
-rect 196 115 238 315
-rect 268 267 358 315
-rect 268 131 279 267
-rect 347 131 358 267
-rect 268 115 358 131
-rect 388 115 430 315
-rect 460 267 516 315
-rect 460 131 471 267
-rect 505 131 516 267
-rect 460 115 516 131
-rect 546 267 599 315
-rect 546 131 557 267
-rect 591 131 599 267
-rect 546 115 599 131
-<< pdiff >>
-rect 27 1201 80 1217
-rect 27 657 35 1201
-rect 69 657 80 1201
-rect 27 617 80 657
-rect 110 1201 166 1217
-rect 110 793 121 1201
-rect 155 793 166 1201
-rect 110 617 166 793
-rect 196 617 238 1217
-rect 268 1201 358 1217
-rect 268 657 279 1201
-rect 347 657 358 1201
-rect 268 617 358 657
-rect 388 617 430 1217
-rect 460 1201 516 1217
-rect 460 793 471 1201
-rect 505 793 516 1201
-rect 460 617 516 793
-rect 546 1201 599 1217
-rect 546 658 557 1201
-rect 591 658 599 1201
-rect 546 617 599 658
-<< ndiffc >>
-rect 35 131 69 267
-rect 121 131 155 267
-rect 279 131 347 267
-rect 471 131 505 267
-rect 557 131 591 267
-<< pdiffc >>
-rect 35 657 69 1201
-rect 121 793 155 1201
-rect 279 657 347 1201
-rect 471 793 505 1201
-rect 557 658 591 1201
-<< 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 1271 51 1305
-rect 85 1271 109 1305
-rect 163 1271 187 1305
-rect 221 1271 245 1305
-rect 299 1271 323 1305
-rect 357 1271 381 1305
-rect 435 1271 459 1305
-rect 493 1271 517 1305
-<< psubdiffcont >>
-rect 51 27 85 61
-rect 187 27 221 61
-rect 323 27 357 61
-rect 459 27 493 61
-<< nsubdiffcont >>
-rect 51 1271 85 1305
-rect 187 1271 221 1305
-rect 323 1271 357 1305
-rect 459 1271 493 1305
-<< poly >>
-rect 80 1217 110 1243
-rect 166 1217 196 1243
-rect 238 1217 268 1243
-rect 358 1217 388 1243
-rect 430 1217 460 1243
-rect 516 1217 546 1243
-rect 80 602 110 617
-rect 166 602 196 617
-rect 70 572 196 602
-rect 70 355 100 572
-rect 142 570 196 572
-rect 142 536 152 570
-rect 186 536 196 570
-rect 142 520 196 536
-rect 142 462 196 478
-rect 142 428 152 462
-rect 186 428 196 462
-rect 142 412 196 428
-rect 70 330 110 355
-rect 80 315 110 330
-rect 166 315 196 412
-rect 238 403 268 617
-rect 358 586 388 617
-rect 334 570 388 586
-rect 430 602 460 617
-rect 516 602 546 617
-rect 430 572 546 602
-rect 334 536 344 570
-rect 378 536 388 570
-rect 334 520 388 536
-rect 479 570 546 572
-rect 479 536 489 570
-rect 523 536 546 570
-rect 479 520 546 536
-rect 420 461 474 477
-rect 420 432 430 461
-rect 358 427 430 432
-rect 464 427 474 461
-rect 238 387 292 403
-rect 238 353 248 387
-rect 282 353 292 387
-rect 238 337 292 353
-rect 358 402 474 427
-rect 238 315 268 337
-rect 358 315 388 402
-rect 516 360 546 520
-rect 430 330 546 360
-rect 430 315 460 330
-rect 516 315 546 330
-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 536 186 570
-rect 152 428 186 462
-rect 344 536 378 570
-rect 489 536 523 570
-rect 430 427 464 461
-rect 248 353 282 387
-<< locali >>
-rect 0 1311 638 1332
-rect 0 1271 51 1311
-rect 85 1271 187 1311
-rect 221 1271 323 1311
-rect 357 1271 459 1311
-rect 493 1271 638 1311
-rect 35 1201 69 1217
-rect 121 1201 155 1271
-rect 121 777 155 793
-rect 279 1201 347 1217
-rect 35 462 69 657
-rect 152 649 200 683
-rect 268 657 279 675
-rect 471 1201 505 1271
-rect 471 777 505 793
-rect 557 1201 591 1217
-rect 152 570 186 649
-rect 268 641 347 657
-rect 136 536 152 570
-rect 186 536 202 570
-rect 268 535 302 641
-rect 344 570 378 586
-rect 344 462 378 536
-rect 35 428 152 462
-rect 186 428 378 462
-rect 412 461 446 649
-rect 489 570 523 575
-rect 489 520 523 536
-rect 35 267 69 428
-rect 412 427 430 461
-rect 464 427 480 461
-rect 557 387 591 658
-rect 232 353 248 387
-rect 282 353 591 387
-rect 35 115 69 131
-rect 121 267 155 283
-rect 121 61 155 131
-rect 279 279 296 283
-rect 330 279 347 283
-rect 279 267 347 279
-rect 279 115 347 131
-rect 471 267 505 283
-rect 471 61 505 131
-rect 557 267 591 353
-rect 557 115 591 131
-rect 0 21 51 61
-rect 85 21 187 61
-rect 221 21 323 61
-rect 357 21 459 61
-rect 493 21 638 61
-rect 0 0 638 21
-<< viali >>
-rect 51 1305 85 1311
-rect 51 1277 85 1305
-rect 187 1305 221 1311
-rect 187 1277 221 1305
-rect 323 1305 357 1311
-rect 323 1277 357 1305
-rect 459 1305 493 1311
-rect 459 1277 493 1305
-rect 200 649 234 683
-rect 412 649 446 683
-rect 268 501 302 535
-rect 489 575 523 609
-rect 296 279 330 313
-rect 51 27 85 55
-rect 51 21 85 27
-rect 187 27 221 55
-rect 187 21 221 27
-rect 323 27 357 55
-rect 323 21 357 27
-rect 459 27 493 55
-rect 459 21 493 27
-<< metal1 >>
-rect 0 1311 638 1332
-rect 0 1277 51 1311
-rect 85 1277 187 1311
-rect 221 1277 323 1311
-rect 357 1277 459 1311
-rect 493 1277 638 1311
-rect 0 1271 638 1277
-rect 188 683 246 689
-rect 400 683 458 689
-rect 188 649 200 683
-rect 234 649 412 683
-rect 446 649 458 683
-rect 188 643 246 649
-rect 400 643 458 649
-rect 477 609 535 615
-rect 455 575 489 609
-rect 523 575 535 609
-rect 477 569 535 575
-rect 256 535 314 541
-rect 256 501 268 535
-rect 302 501 314 535
-rect 256 495 314 501
-rect 268 319 302 495
-rect 268 313 342 319
-rect 268 279 296 313
-rect 330 279 342 313
-rect 284 273 342 279
-rect 0 55 638 61
-rect 0 21 51 55
-rect 85 21 187 55
-rect 221 21 323 55
-rect 357 21 459 55
-rect 493 21 638 55
-rect 0 0 638 21
-<< labels >>
-rlabel metal1 218 666 218 666 1 A
-port 1 n
-rlabel metal1 285 486 285 486 1 Y
-port 2 n
-rlabel metal1 506 592 506 592 1 B
-port 3 n
-rlabel viali 68 48 68 48 1 gnd
-rlabel viali 68 1284 68 1284 1 vdd
-<< end >>
diff --git a/Makefile b/Makefile
index 5dc8c0d..74d7233 100644
--- a/Makefile
+++ b/Makefile
@@ -10,10 +10,12 @@
do: char design
char:
+ @mkdir -p outputs
-@cd lib && make magic pex VARIANT=${VARIANT}
-@cd char && make VARIANT=${VARIANT}
design:
+ @mkdir -p outputs
@cd flow/synth_snps && make synth VARIANT=${VARIANT}
@cd flow && make change VARIANT=${VARIANT}
@cd flow/pnr && make all
diff --git a/char/abstract/Makefile b/char/abstract/Makefile
index eb7e56b..428fffa 100644
--- a/char/abstract/Makefile
+++ b/char/abstract/Makefile
@@ -12,6 +12,7 @@
.PHONY: do clean
do:
+ @mkdir -p ../../outputs
@sed -i 's/18T_ms/${VARIANT}/g' lef_gen
@sed -i 's/18T_ms/${VARIANT}/g' abstract_SKILL_script
@sed -i 's/18T/${TRACKS}/g' abstract_SKILL_script
diff --git a/char/liberate/Makefile b/char/liberate/Makefile
index daa41cd..87964b0 100644
--- a/char/liberate/Makefile
+++ b/char/liberate/Makefile
@@ -28,6 +28,7 @@
SF
setup:
+ @mkdir -p outputs
@mkdir -p $(VPATH) $(LOG) NETLIST LIBRARY LDB DATASHEET VERILOG
@cp ../../skywater/s8pdk/V1.3.0/MODELS/spice/* MODELS/
@cp ../../lib/output/$(VARIANT)/spice/* NETLIST/
