updated

commit: b08d313a9ca2fefcafa4ddf68879b574f54873a0 [log] [tgz]
author: adithyasunil26 <adithyasunil26@gmail.com> Fri Dec 31 19:20:34 2021 +0530
committer: adithyasunil26 <adithyasunil26@gmail.com> Fri Dec 31 19:20:34 2021 +0530
tree: bc7e93cde840a943fd44c3347a6874f24da82b30
parent: c7aa6febc534176bd3de6185a4e0fcffbb206bfb [diff]
diff --git a/mag/and.ext b/mag/and.ext
index 5b43bff..ff013f3 100644
--- a/mag/and.ext
+++ b/mag/and.ext

@@ -1,4 +1,4 @@
-timestamp 1640698682
+timestamp 1640957762
 version 8.3
 tech sky130A
 style ngspice()
@@ -6,46 +6,39 @@
 resistclasses 4400000 2200000 1700000 3050000 120000 197000 114000 191000 120000 197000 114000 191000 48200 319800 2000000 48200 48200 12200 125 125 47 47 29 5
 parameters sky130_fd_pr__nfet_01v8 l=l w=w a1=as p1=ps a2=ad p2=pd
 parameters sky130_fd_pr__pfet_01v8 l=l w=w a1=as p1=ps a2=ad p2=pd
-node "gnd!" 12 145.32 110 -980 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14400 480 0 0 0 0 0 0 0 0 0 0 0 0
-node "vdd!" 12 110 240 740 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 400 0 0 0 0 0 0 0 0 0 0 0 0
 node "Z1" 1640 305.275 10 -670 ndif 0 0 0 0 0 0 0 0 64000 1920 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 59000 1900 0 0 0 0 0 0 0 0 0 0 0 0
-node "GND" 1568 1223.21 -100 -670 ndif 0 0 0 0 0 0 0 0 56000 1720 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 65000 2340 12800 640 20000 800 28800 960 62400 1780 0 0 0 0
+node "gnd!" 1568 1223.21 -100 -670 ndif 0 0 0 0 0 0 0 0 56000 1720 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 65000 2340 12800 640 20000 800 28800 960 62400 1780 0 0 0 0
 node "OUT" 2627 624.887 510 -670 ndif 0 0 0 0 0 0 0 0 24000 760 60800 1680 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 98200 3260 0 0 0 0 0 0 0 0 0 0 0 0
 node "B" 2102 596.73 150 -230 p 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 46300 2880 0 0 8800 440 16000 960 0 0 0 0 0 0 0 0 0 0
 node "A" 2103 442.645 -100 -230 p 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 46300 2880 0 0 9200 460 0 0 0 0 0 0 0 0 0 0 0 0
-node "a_n100_20#" 5769 1998 -100 20 pdif 0 0 0 0 0 0 0 0 0 0 144000 4080 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 149400 4940 19200 960 30000 1200 30000 1200 93600 3080 0 0 0 0
+node "vdd!" 5769 1998 -100 20 pdif 0 0 0 0 0 0 0 0 0 0 144000 4080 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 149400 4940 19200 960 30000 1200 30000 1200 93600 3080 0 0 0 0
 node "out1" 6488 1253.5 10 20 pdif 0 0 0 0 0 0 0 0 32000 960 83200 2400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 53200 3340 0 0 136500 4640 0 0 0 0 0 0 0 0 0 0 0 0
-node "VDD" 2103 2469.6 -170 -30 nw 0 0 0 0 823200 3640 0 0 6400 320 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-substrate "a_120_n970#" 0 0 120 -970 ppd 0 0 0 0 0 0 0 0 0 0 10000 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+node "VDD" 1983 2469.6 -170 -30 nw 0 0 0 0 823200 3640 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+substrate "VSUBS" 0 0 -1073741817 -1073741817 space 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+cap "gnd!" "Z1" 409.78
+cap "OUT" "Z1" 43.6452
+cap "OUT" "gnd!" 198
+cap "B" "Z1" 67.1786
+cap "A" "gnd!" 57.75
+cap "B" "OUT" 8.8
+cap "vdd!" "Z1" 7.96552
+cap "out1" "Z1" 356.371
+cap "vdd!" "gnd!" 13.8886
+cap "out1" "gnd!" 226.769
+cap "vdd!" "OUT" 574.768
+cap "A" "B" 87.6201
 cap "out1" "OUT" 261.752
-cap "a_n100_20#" "B" 13.5882
-cap "a_n100_20#" "A" 13.5882
+cap "vdd!" "B" 13.5882
+cap "vdd!" "A" 13.5882
 cap "VDD" "OUT" 2.3125
 cap "out1" "B" 176.792
 cap "out1" "A" 13.5179
-cap "out1" "a_n100_20#" 1441.54
-cap "VDD" "a_n100_20#" 48.86
+cap "out1" "vdd!" 1441.54
+cap "VDD" "vdd!" 48.86
 cap "VDD" "out1" 6.1975
-cap "vdd!" "OUT" 7.33333
-cap "Z1" "OUT" 43.6452
-cap "GND" "OUT" 198
-cap "Z1" "B" 67.1786
-cap "vdd!" "a_n100_20#" 50.2857
-cap "GND" "A" 57.75
-cap "Z1" "a_n100_20#" 7.96552
-cap "vdd!" "out1" 11.55
-cap "Z1" "out1" 356.371
-cap "GND" "a_n100_20#" 13.8886
-cap "vdd!" "VDD" 9.25
-cap "GND" "out1" 226.769
-cap "Z1" "gnd!" 15.5425
-cap "GND" "Z1" 409.78
-cap "B" "OUT" 8.8
-cap "a_n100_20#" "OUT" 574.768
-cap "A" "B" 87.6201
-device msubckt sky130_fd_pr__nfet_01v8 480 -670 481 -669 l=30 w=300 "a_120_n970#" "out1" 60 0 "GND" 300 0 "OUT" 300 0
-device msubckt sky130_fd_pr__nfet_01v8 230 -670 231 -669 l=30 w=400 "a_120_n970#" "B" 60 0 "Z1" 400 0 "out1" 400 0
-device msubckt sky130_fd_pr__nfet_01v8 -20 -670 -19 -669 l=30 w=400 "a_120_n970#" "A" 60 0 "GND" 400 0 "Z1" 400 0
-device msubckt sky130_fd_pr__pfet_01v8 480 20 481 21 l=30 w=760 "VDD" "out1" 60 0 "a_n100_20#" 760 0 "OUT" 760 0
-device msubckt sky130_fd_pr__pfet_01v8 230 20 231 21 l=30 w=520 "VDD" "B" 60 0 "a_n100_20#" 520 0 "out1" 520 0
-device msubckt sky130_fd_pr__pfet_01v8 -20 20 -19 21 l=30 w=520 "VDD" "A" 60 0 "a_n100_20#" 520 0 "out1" 520 0
+device msubckt sky130_fd_pr__nfet_01v8 480 -670 481 -669 l=30 w=300 "VSUBS" "out1" 60 0 "gnd!" 300 0 "OUT" 300 0
+device msubckt sky130_fd_pr__nfet_01v8 230 -670 231 -669 l=30 w=400 "VSUBS" "B" 60 0 "Z1" 400 0 "out1" 400 0
+device msubckt sky130_fd_pr__nfet_01v8 -20 -670 -19 -669 l=30 w=400 "VSUBS" "A" 60 0 "gnd!" 400 0 "Z1" 400 0
+device msubckt sky130_fd_pr__pfet_01v8 480 20 481 21 l=30 w=760 "VDD" "out1" 60 0 "vdd!" 760 0 "OUT" 760 0
+device msubckt sky130_fd_pr__pfet_01v8 230 20 231 21 l=30 w=520 "VDD" "B" 60 0 "vdd!" 520 0 "out1" 520 0
+device msubckt sky130_fd_pr__pfet_01v8 -20 20 -19 21 l=30 w=520 "VDD" "A" 60 0 "vdd!" 520 0 "out1" 520 0

diff --git a/mag/and.mag b/mag/and.mag
index 08733bf..323803e 100644
--- a/mag/and.mag
+++ b/mag/and.mag

@@ -1,6 +1,6 @@
 magic
 tech sky130A
-timestamp 1640698682
+timestamp 1640957225
 << nwell >>
 rect -85 -15 335 475
 << nmos >>
@@ -259,10 +259,6 @@
 rect 265 110 290 135
 rect 265 65 290 90
 rect 265 20 290 45
-<< psubdiff >>
-rect 60 -485 110 -435
-<< nsubdiff >>
-rect 125 375 165 415
 << poly >>
 rect 240 390 255 410
 rect -10 270 5 295
@@ -296,7 +292,6 @@
 rect 200 440 205 460
 rect 225 440 230 460
 rect 200 425 230 440
-rect 120 370 170 420
 rect 205 390 230 425
 rect 200 360 235 390
 rect -45 325 -40 345
@@ -514,7 +509,6 @@
 rect -25 -415 -20 -395
 rect 200 -395 225 -375
 rect 200 -415 205 -395
-rect 55 -490 115 -430
 << viali >>
 rect 205 440 225 460
 rect -40 325 -20 345
@@ -697,6 +691,6 @@
 rlabel locali 45 -105 105 -85 1 B
 rlabel locali 15 -235 105 -210 1 Z1
 rlabel locali 140 -110 230 -90 1 out1
-rlabel locali 145 395 145 395 1 vdd!
-rlabel locali 85 -465 85 -465 1 gnd!
+rlabel locali 219 -363 219 -363 1 gnd!
+rlabel locali 214 405 214 405 1 vdd!
 << end >>

diff --git a/mag/and_pd.ext b/mag/and_pd.ext
index c29dad7..158d8cd 100644
--- a/mag/and_pd.ext
+++ b/mag/and_pd.ext

@@ -1,4 +1,4 @@
-timestamp 1640776259
+timestamp 1640958486
 version 8.3
 tech sky130A
 style ngspice()
@@ -15,19 +15,10 @@
 node "A" 1358 374.675 -60 -250 p 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 32500 1960 0 0 8000 400 0 0 0 0 0 0 0 0 0 0 0 0
 node "VDD" 2352 1494 -160 -70 nw 0 0 0 0 498000 2860 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 substrate "VSUBS" 0 0 -1073741817 -1073741817 space 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-cap "a_n60_n30#" "Out" 277.2
-cap "Out1" "Out" 188.1
-cap "B" "Out" 8.8
-cap "Out1" "a_n60_n30#" 1023.37
-cap "B" "a_n60_n30#" 18.7
-cap "VDD" "Out" 1.85
-cap "B" "Out1" 271.254
-cap "A" "a_n60_n30#" 18.7
-cap "VDD" "a_n60_n30#" 37.17
-cap "A" "Out1" 13.5179
-cap "VDD" "Out1" 3.7
-cap "A" "B" 75.0211
 cap "GND" "Z1" 192.37
+cap "VDD" "Out" 1.85
+cap "VDD" "a_n60_n30#" 37.17
+cap "VDD" "Out1" 3.7
 cap "Out" "Z1" 19.8
 cap "Out" "GND" 118.8
 cap "a_n60_n30#" "Z1" 8.88462
@@ -36,6 +27,15 @@
 cap "Out1" "GND" 176.55
 cap "B" "Z1" 57.75
 cap "A" "GND" 57.75
+cap "a_n60_n30#" "Out" 277.2
+cap "Out1" "Out" 188.1
+cap "B" "Out" 8.8
+cap "Out1" "a_n60_n30#" 1023.37
+cap "B" "a_n60_n30#" 18.7
+cap "B" "Out1" 271.254
+cap "A" "a_n60_n30#" 18.7
+cap "A" "Out1" 13.5179
+cap "A" "B" 75.0211
 device msubckt sky130_fd_pr__nfet_01v8 520 -470 521 -469 l=30 w=180 "VSUBS" "Out1" 60 0 "GND" 180 0 "Out" 180 0
 device msubckt sky130_fd_pr__nfet_01v8 270 -470 271 -469 l=30 w=180 "VSUBS" "B" 60 0 "Z1" 180 0 "Out1" 180 0
 device msubckt sky130_fd_pr__nfet_01v8 20 -470 21 -469 l=30 w=180 "VSUBS" "A" 60 0 "GND" 180 0 "Z1" 180 0

diff --git a/mag/cbank.ext b/mag/cbank.ext
index 32a7c5d..14f11b3 100644
--- a/mag/cbank.ext
+++ b/mag/cbank.ext

@@ -26,18 +26,18 @@
 node "a_2730_n30#" 133 1402.86 2730 -30 ndif 0 0 0 0 0 0 0 0 19600 560 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 19600 560 19600 560 19600 560 642800 4060 0 0 0 0 0 0
 node "a_1720_n30#" 120 0 1720 -30 ndif 0 0 0 0 0 0 0 0 19600 560 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 substrate "gnd!" 0 0 4850 -1660 ppd 0 0 0 0 0 0 0 0 0 0 67600 1040 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 455200 8040 376200 6460 439200 7160 1906800 11780 2795480 19244 0 0 0 0
-cap "a_2730_n30#" "li_1720_n30#" 199.5
-cap "a_1720_n30#" "li_1720_n30#" 18.13
+cap "a_2730_n30#" "v" 1301.39
+cap "a_2730_n30#" "a_3680_n30#" 199.5
+cap "v" "li_1720_n30#" 1301.39
 cap "a_6660_n30#" "v" 1301.39
 cap "a_5640_n30#" "v" 1301.39
 cap "a_5640_n30#" "a_6660_n30#" 191.52
 cap "a_4660_n30#" "v" 1301.39
 cap "a_3680_n30#" "v" 1301.39
 cap "a_4660_n30#" "a_5640_n30#" 199.5
-cap "a_2730_n30#" "v" 1301.39
 cap "a_3680_n30#" "a_4660_n30#" 199.5
-cap "a_2730_n30#" "a_3680_n30#" 199.5
-cap "v" "li_1720_n30#" 1301.39
+cap "a_2730_n30#" "li_1720_n30#" 199.5
+cap "a_1720_n30#" "li_1720_n30#" 18.13
 device csubckt sky130_fd_pr__cap_mim_m3_1 6510 590 6511 591 w=560 l=560 "None" "v" 1920 0 "a_6660_n30#" 1440 0
 device csubckt sky130_fd_pr__cap_mim_m3_1 5510 590 5511 591 w=560 l=560 "None" "v" 1920 0 "a_5640_n30#" 1440 0
 device csubckt sky130_fd_pr__cap_mim_m3_1 4520 590 4521 591 w=560 l=560 "None" "v" 1920 0 "a_4660_n30#" 1440 0
@@ -45,14 +45,14 @@
 device csubckt sky130_fd_pr__cap_mim_m3_1 2540 590 2541 591 w=560 l=560 "None" "v" 1920 0 "a_2730_n30#" 1440 0
 device csubckt sky130_fd_pr__cap_mim_m3_1 1550 590 1551 591 w=560 l=560 "None" "v" 1920 0 "li_1720_n30#" 1440 0
 device csubckt sky130_fd_pr__cap_mim_m3_1 70 130 71 131 w=1040 l=1000 "None" "v" 3760 0 "gnd!" 1440 0
-cap "switch_1/vin" "switch_1/vcont" -136.5
-cap "switch_0/vout" "switch_0/vcont" 4.23077
 cap "switch_1/vin" "switch_1/vout" -0.157143
-cap "switch_0/vin" "switch_0/vcont" 83.635
-cap "switch_1/vcont" "switch_1/vout" 4.23077
-cap "switch_1/vcont" "switch_1/vin" 83.635
+cap "switch_1/vcont" "switch_1/vin" -136.5
+cap "switch_0/vcont" "switch_0/vout" 4.23077
+cap "switch_0/vcont" "switch_0/vin" 83.635
 cap "switch_2/vcont" "switch_2/vout" 4.23077
 cap "switch_2/vcont" "switch_2/vin" 83.635
+cap "switch_1/vcont" "switch_1/vout" 4.23077
+cap "switch_1/vcont" "switch_1/vin" 83.635
 cap "switch_3/vcont" "switch_3/vout" 4.23077
 cap "switch_3/vcont" "switch_3/vin" 83.635
 cap "switch_5/vcont" "switch_5/vout" 4.23077

diff --git a/mag/divider.ext b/mag/divider.ext
index fc2632f..a5216e4 100644
--- a/mag/divider.ext
+++ b/mag/divider.ext

@@ -1,16 +1,16 @@
-timestamp 1640902018
+timestamp 1640957771
 version 8.3
 tech sky130A
 style ngspice()
 scale 1000 1 500000
 resistclasses 4400000 2200000 1700000 3050000 120000 197000 114000 191000 120000 197000 114000 191000 48200 319800 2000000 48200 48200 12200 125 125 47 47 29 5
+use nor nor_0 -1 0 5660 0 -1 3210
+use nor nor_1 -1 0 6630 0 -1 3210
+use and and_0 -1 0 4660 0 -1 2930
 use prescaler prescaler_0 1 0 50 0 1 400
 use tspc tspc_2 1 0 7280 0 1 990
 use tspc tspc_1 1 0 5700 0 1 990
 use tspc tspc_0 1 0 4120 0 1 990
-use nor nor_1 -1 0 6630 0 -1 3210
-use nor nor_0 -1 0 5660 0 -1 3210
-use and and_0 -1 0 4660 0 -1 2930
 node "m4_7020_30#" 0 79.26 7020 30 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10800 480 0 0 0 0
 node "gnd" 0 83.08 5430 30 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 11400 500 0 0 0 0
 node "gnd" 0 79.08 3830 30 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10800 480 0 0 0 0
@@ -28,7 +28,7 @@
 node "li_7140_680#" 43 3235 7140 680 v0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1600 160 226300 14980 0 0 0 0 0 0 0 0 0 0
 node "li_5560_680#" 24 1325.71 5560 680 v0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1600 160 91500 5960 0 0 0 0 0 0 0 0 0 0
 node "li_3980_680#" 25 1368.34 3980 680 v0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1600 160 94000 6160 0 0 0 0 0 0 0 0 0 0
-node "Out" 32 105.012 8660 820 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6500 360 0 0 0 0 0 0 0 0 0 0 0 0
+node "Out" 32 111.612 8660 820 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6500 360 0 0 0 0 0 0 0 0 0 0 0 0
 node "li_7040_820#" 13 214.937 7040 820 v0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1600 160 6400 320 11900 480 0 0 0 0 0 0 0 0
 node "li_5460_820#" 13 214.895 5460 820 v0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1600 160 6400 320 11800 480 0 0 0 0 0 0 0 0
 node "li_3310_1810#" 314 639.68 3310 1810 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 45100 2240 0 0 0 0 0 0 0 0 0 0 0 0
@@ -36,268 +36,315 @@
 node "li_6130_3350#" 19 802.775 6130 3350 v0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1600 160 55000 3560 0 0 0 0 0 0 0 0 0 0
 node "li_4830_3100#" 180 368.33 4830 3100 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 23600 1260 0 0 0 0 0 0 0 0 0 0 0 0
 node "li_2870_2670#" 482 898.77 2870 2670 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 63200 3240 0 0 0 0 0 0 0 0 0 0 0 0
-node "mc2" 155 3420.79 6740 3250 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16400 900 6400 320 225200 14700 0 0 0 0 0 0 0 0
-node "w_n140_1520#" 3306 3024 -140 1520 nw 0 0 0 0 1008000 4240 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-node "w_2780_1920#" 30753 19421.4 2780 1920 nw 0 0 0 0 6473800 22840 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-substrate "VSUBS" 0 0 -1073741817 -1073741817 space 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-cap "vdd" "vdd" 33.5
-cap "vdd" "vdd" 51.2353
-cap "vdd" "vdd" 20.1
-cap "m4_7020_30#" "li_5560_680#" 24.425
+node "mc2" 155 3424.46 6740 3250 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16400 900 6400 320 225200 14700 0 0 0 0 0 0 0 0
+node "w_n140_1520#" 3438 3270.42 -140 1520 nw 0 0 0 0 1008000 4240 0 0 122500 1400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 67080 1036 67080 1036 67080 1036 67080 1036 168928 2064 0 0 0 0
+node "w_2780_1920#" 31943 20273.1 2780 1920 nw 0 0 0 0 6485992 23000 0 0 245000 2800 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 134160 2072 134160 2072 134160 2072 134160 2072 610588 4880 0 0 0 0
+substrate "a_n940_n20#" 0 0 -940 -20 ppd 0 0 0 0 0 0 0 0 0 0 1757600 27040 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9826000 57800 0 0 0 0 0 0 0 0 0 0 0 0
+cap "li_5560_680#" "m4_7020_30#" 24.425
+cap "w_2780_1920#" "vdd" 8.88
+cap "mc2" "gnd" 27.9
+cap "li_3980_680#" "gnd" 24.425
+cap "li_3980_680#" "gnd" 27.1625
+cap "mc2" "m1_5770_3360#" 35.7143
+cap "mc2" "li_7140_680#" 61.52
+cap "w_2780_1920#" "m1_5770_3360#" 53.84
+cap "li_5740_3250#" "vdd" 27.9
+cap "li_3310_1810#" "vdd" 35.39
+cap "li_5740_3250#" "vdd" 27.9
+cap "mc2" "li_5740_3250#" 22.679
+cap "w_2780_1920#" "li_3310_1810#" 24.0375
+cap "w_2780_1920#" "li_5740_3250#" 72.945
+cap "w_2780_1920#" "li_6130_3350#" 7.215
 cap "li_7140_680#" "m1_5770_3360#" 19.2857
 cap "li_5560_680#" "m1_5770_3360#" 16.875
-cap "gnd" "li_3980_680#" 24.425
 cap "li_5560_680#" "li_7140_680#" 437.5
-cap "gnd" "li_3980_680#" 27.1625
 cap "li_7040_820#" "m1_5770_3360#" 90
 cap "li_3980_680#" "li_5560_680#" 782.5
 cap "Out" "li_7140_680#" 23.5
 cap "li_7040_820#" "li_5560_680#" 15
-cap "w_2780_1920#" "vdd" 8.88
 cap "li_5740_3250#" "m1_5770_3360#" 286.375
-cap "mc2" "gnd" 27.9
 cap "li_5460_820#" "li_3980_680#" 20
 cap "li_6130_3350#" "m1_5770_3360#" 136.842
 cap "li_5740_3250#" "li_5560_680#" 21.9534
-cap "vdd" "li_5740_3250#" 27.9
-cap "vdd" "li_3310_1810#" 35.39
+cap "w_2780_1920#" "m4_7030_1860#" 40.0711
 cap "li_5740_3250#" "li_3980_680#" 22.5
-cap "mc2" "m1_5770_3360#" 35.7143
-cap "vdd" "li_5740_3250#" 27.9
-cap "mc2" "li_7140_680#" 61.52
+cap "w_2780_1920#" "vdd" 0.84
+cap "w_2780_1920#" "vdd" 9.82
+cap "w_2780_1920#" "li_2870_2670#" 76.8485
+cap "w_2780_1920#" "vdd" 4.08
 cap "li_5740_3250#" "li_5460_820#" 128.305
-cap "w_2780_1920#" "m1_5770_3360#" 53.84
-cap "m4_7030_1860#" "w_2780_1920#" 1.36
-cap "vdd" "w_2780_1920#" 0.84
 cap "li_6130_3350#" "li_5740_3250#" 68.1032
-cap "vdd" "w_2780_1920#" 9.82
-cap "vdd" "w_2780_1920#" 4.08
-cap "mc2" "li_5740_3250#" 22.679
-cap "w_2780_1920#" "li_3310_1810#" 18.0375
-cap "w_2780_1920#" "li_5740_3250#" 72.945
-cap "w_2780_1920#" "li_6130_3350#" 7.215
-cap "w_2780_1920#" "li_2870_2670#" 50.69
-cap "tspc_0/w_n140_n70#" "prescaler_0/GND" 4.08
-cap "tspc_0/w_n140_n70#" "prescaler_0/tspc_1/a_740_n680#" 6.63
-cap "prescaler_0/tspc_1/a_740_n680#" "tspc_0/D" 4.21875
-cap "prescaler_0/tspc_1/Q" "tspc_0/D" 12.6992
-cap "prescaler_0/GND" "tspc_0/a_630_n680#" 3.80769
-cap "tspc_0/D" "tspc_0/a_630_n680#" 152.917
+cap "vdd" "vdd" 33.5
+cap "vdd" "vdd" 51.2353
+cap "vdd" "vdd" 20.1
+cap "a_n940_n20#" "prescaler_0/nand_0/A" 17.3684
+cap "a_n940_n20#" "prescaler_0/tspc_0/a_630_n680#" 9.78378
+cap "a_n940_n20#" "prescaler_0/GND" 21.945
+cap "a_n940_n20#" "prescaler_0/tspc_0/Z2" 27.6618
+cap "a_n940_n20#" "prescaler_0/tspc_1/a_630_n680#" 4.89189
+cap "a_n940_n20#" "prescaler_0/tspc_1/Z2" 27.6618
+cap "a_n940_n20#" "prescaler_0/tspc_1/GND" 30.14
+cap "prescaler_0/tspc_1/a_740_n680#" "tspc_0/D" 8.4375
+cap "tspc_0/w_n140_n70#" "prescaler_0/GND" 0.12
+cap "a_n940_n20#" "prescaler_0/GND" 21.945
+cap "a_n940_n20#" "prescaler_0/tspc_1/a_630_n680#" 4.89189
 cap "tspc_0/D" "tspc_0/Z4" 35.0633
-cap "tspc_0/D" "prescaler_0/m1_2700_2190#" 4.21875
-cap "tspc_0/D" "li_5560_680#" 2.25
-cap "tspc_0/D" "prescaler_0/GND" 513.859
-cap "tspc_0/D" "tspc_1/a_300_n150#" 7.39286
-cap "tspc_0/D" "tspc_0/Z3" 1.36364
 cap "tspc_0/D" "tspc_0/Z2" 141.466
-cap "tspc_0/a_630_n680#" "li_5560_680#" 2.72727
-cap "prescaler_0/tspc_1/Q" "tspc_0/D" 12.6992
-cap "tspc_1/D" "tspc_1/a_630_n680#" 95.25
-cap "tspc_1/a_300_n150#" "tspc_1/a_n60_n20#" 36.9286
-cap "tspc_1/a_300_n150#" "tspc_1/D" 70.641
-cap "tspc_1/D" "tspc_0/a_630_n680#" 2.72727
-cap "tspc_1/D" "tspc_1/Z4" 33.0938
+cap "tspc_0/w_n140_n70#" "prescaler_0/tspc_1/a_740_n680#" 0.195
+cap "tspc_0/D" "prescaler_0/GND" 413.181
+cap "a_n940_n20#" "tspc_0/Z2" 27.6618
+cap "tspc_0/D" "tspc_0/Z3" 1.36364
+cap "prescaler_0/tspc_1/Q" "tspc_0/D" 25.3985
 cap "tspc_0/a_740_n680#" "tspc_1/D" -7.31795
-cap "tspc_1/Z2" "tspc_1/GND" 7.81579
-cap "tspc_0/a_740_n680#" "tspc_1/Z4" 20.5714
-cap "tspc_1/D" "tspc_1/GND" 555.809
-cap "tspc_1/a_300_n150#" "tspc_1/Z4" 30.4615
-cap "tspc_0/a_740_n680#" "tspc_1/a_300_n150#" 215.64
-cap "tspc_0/a_740_n680#" "tspc_0/a_630_n680#" 6.66667
-cap "tspc_1/w_n140_n70#" "tspc_1/a_300_n150#" -3.33067e-16
-cap "tspc_1/w_n140_n70#" "tspc_0/a_740_n680#" 4.695
-cap "tspc_1/D" "tspc_1/Z3" 1.36364
+cap "tspc_1/a_300_n150#" "tspc_1/D" 70.641
+cap "tspc_1/GND" "tspc_0/a_630_n680#" 7.61538
+cap "tspc_0/a_740_n680#" "tspc_1/a_300_n150#" 145.525
 cap "tspc_1/D" "tspc_1/Z2" 213.298
-cap "tspc_0/a_740_n680#" "tspc_1/GND" 65.2632
-cap "tspc_1/a_300_n150#" "tspc_1/GND" 21.2143
-cap "tspc_1/GND" "tspc_0/a_630_n680#" 3.80769
+cap "tspc_1/D" "tspc_1/Z4" 33.0938
+cap "tspc_0/a_740_n680#" "tspc_1/Z2" 112.823
+cap "tspc_1/a_300_n150#" "tspc_1/Z4" 30.4615
 cap "tspc_1/a_300_n150#" "tspc_1/Z2" 25.8231
-cap "tspc_0/a_740_n680#" "tspc_1/Z2" 154.016
-cap "tspc_1/a_300_n150#" "tspc_1/Z1" 7
-cap "tspc_1/a_740_n680#" "tspc_2/a_300_n150#" 230.89
-cap "tspc_2/w_n140_n70#" "tspc_1/a_740_n680#" 4.615
-cap "tspc_2/Z2" "tspc_2/GND" 7.81579
-cap "tspc_2/w_n140_n70#" "tspc_2/a_300_n150#" -3.33067e-16
-cap "tspc_2/D" "tspc_1/a_630_n680#" 1.21622
-cap "tspc_2/D" "tspc_2/GND" 508.356
-cap "tspc_1/a_740_n680#" "tspc_1/a_630_n680#" 63.8571
-cap "tspc_1/a_740_n680#" "tspc_2/GND" 118.593
-cap "tspc_2/a_300_n150#" "tspc_2/GND" 21.2143
-cap "tspc_2/GND" "tspc_1/a_630_n680#" 7.61538
-cap "tspc_2/D" "tspc_2/a_630_n680#" 41.25
-cap "tspc_2/D" "tspc_2/Z3" 1.36364
-cap "tspc_2/D" "tspc_2/Z4" 35.8248
-cap "tspc_2/D" "tspc_2/Z2" 309.898
-cap "tspc_1/a_740_n680#" "tspc_2/Z4" 21.1765
-cap "tspc_1/a_740_n680#" "tspc_2/Z2" 156.315
-cap "tspc_2/a_300_n150#" "tspc_2/Z4" 30.4615
-cap "tspc_2/a_300_n150#" "tspc_2/Z1" 7
-cap "tspc_2/a_300_n150#" "tspc_2/Z2" 25.8231
-cap "tspc_2/a_300_n150#" "tspc_2/a_n60_n20#" 36.9286
-cap "tspc_1/a_740_n680#" "tspc_2/D" -6.57619
+cap "tspc_0/a_740_n680#" "tspc_1/Z4" 20.5714
+cap "tspc_1/w_n140_n70#" "tspc_0/a_740_n680#" 0.065
+cap "tspc_1/w_n140_n70#" "tspc_1/a_300_n150#" 2.77556e-17
+cap "a_n940_n20#" "tspc_1/Z2" 27.6618
+cap "tspc_1/D" "tspc_0/a_630_n680#" 5.45455
+cap "tspc_1/D" "tspc_1/GND" 346.096
+cap "tspc_0/a_740_n680#" "tspc_0/a_630_n680#" 159.583
+cap "tspc_1/a_300_n150#" "tspc_1/GND" 21.2143
+cap "tspc_0/a_740_n680#" "tspc_1/GND" 281.141
+cap "tspc_1/D" "tspc_1/Z3" 1.36364
+cap "tspc_1/GND" "tspc_1/Z2" 7.81579
+cap "a_n940_n20#" "tspc_1/GND" 23.265
+cap "a_n940_n20#" "tspc_0/a_630_n680#" 9.78378
+cap "tspc_1/a_740_n680#" "tspc_2/gnd!" 440.385
 cap "tspc_2/a_300_n150#" "tspc_2/D" 70.641
-cap "tspc_2/a_740_n680#" "tspc_2/a_630_n680#" 118.333
-cap "tspc_2/a_740_n680#" "tspc_2/GND" 155.113
-cap "tspc_2/a_740_n680#" "tspc_2/Q" 20.775
-cap "prescaler_0/nand_0/VDD" "prescaler_0/nand_0/a_n20_20#" 9.24
-cap "prescaler_0/nand_0/VDD" "prescaler_0/mc1" 23.03
-cap "prescaler_0/tspc_1/a_n60_n20#" "prescaler_0/tspc_1/Q" 19.25
-cap "prescaler_0/tspc_1/a_n60_n20#" "prescaler_0/GND" 92.731
-cap "prescaler_0/tspc_1/a_n60_n20#" "prescaler_0/nand_1/a_280_n230#" 37.52
-cap "prescaler_0/tspc_1/a_n60_n20#" "prescaler_0/nand_1/VDD" 16.2475
-cap "prescaler_0/nand_1/VDD" "prescaler_0/GND" 16.32
-cap "prescaler_0/nand_1/VDD" "prescaler_0/mc1" 21.365
-cap "prescaler_0/nand_1/VDD" "prescaler_0/nand_1/a_280_n230#" 40.95
-cap "tspc_1/a_n60_n20#" "prescaler_0/m4_2730_1520#" 10.4433
-cap "tspc_1/a_n60_n20#" "tspc_1/a_n60_n20#" 0.881579
-cap "tspc_1/a_n60_n20#" "prescaler_0/GND" 49.961
-cap "tspc_1/a_n60_n20#" "li_5740_3250#" 0.961538
-cap "tspc_1/a_n60_n20#" "tspc_1/w_n140_n70#" 9.035
-cap "and_0/vdd!" "tspc_0/vdd!" 11
-cap "tspc_1/a_n60_n20#" "tspc_0/vdd!" 11.2857
-cap "and_0/OUT" "tspc_1/a_n60_n20#" 7.5
-cap "tspc_1/a_n60_n20#" "tspc_0/Z2" 10
-cap "tspc_1/a_n60_n20#" "li_5740_3250#" 83.7778
-cap "nor_1/a_n40_20#" "tspc_1/a_n60_n20#" 432.374
-cap "m1_5770_3360#" "tspc_1/w_n140_n70#" -4.42
-cap "nor_1/a_n40_20#" "tspc_1/w_n140_n70#" -4.08
-cap "tspc_1/a_n60_n20#" "tspc_1/a_300_n150#" 56.8559
-cap "tspc_1/a_n60_n20#" "tspc_1/w_n140_n70#" -1.79856e-14
-cap "nor_1/A" "m1_5770_3360#" 14.775
-cap "nor_1/Z1" "m1_5770_3360#" 170.44
-cap "nor_1/B" "m1_5770_3360#" 14.775
-cap "nor_1/a_n40_20#" "li_5740_3250#" 93.75
-cap "nor_1/a_n40_20#" "m1_5770_3360#" 26.8462
-cap "nor_1/Out" "m1_5770_3360#" 85.22
-cap "tspc_1/a_740_n680#" "m1_5770_3360#" 2.10938
-cap "tspc_2/w_n140_n70#" "m1_5770_3360#" 12.155
-cap "tspc_2/a_n60_n20#" "tspc_2/a_300_n150#" 56.8559
-cap "nor_1/a_n40_20#" "tspc_2/a_n60_n20#" 31.4366
-cap "tspc_2/w_n140_n70#" "tspc_2/a_n60_n20#" -0.52
-cap "tspc_2/Z2" "m1_5770_3360#" 45
-cap "tspc_1/a_740_n680#" "m1_5770_3360#" 31.3043
-cap "tspc_2/a_n60_n20#" "m1_5770_3360#" 59.3707
-cap "nor_1/a_n40_20#" "m1_5770_3360#" -166.637
-cap "li_7140_680#" "tspc_2/a_740_n680#" 21.8182
-cap "li_7140_680#" "tspc_2/a_n60_n20#" 13.125
-cap "prescaler_0/tspc_2/a_630_n680#" "mc2" 142.175
-cap "prescaler_0/tspc_2/GND" "mc2" 211.575
-cap "prescaler_0/GND" "mc2" 143.403
-cap "prescaler_0/tspc_2/a_630_n680#" "mc2" 52.165
-cap "prescaler_0/tspc_2/Z2" "mc2" 236.68
-cap "prescaler_0/nand_1/A" "and_0/a_n100_20#" 1.83333
-cap "prescaler_0/nand_1/A" "prescaler_0/GND" 22.72
-cap "w_2780_1920#" "prescaler_0/GND" 3.12
-cap "w_2780_1920#" "prescaler_0/nand_1/A" 3.33
-cap "and_0/Z1" "mc2" 92.03
+cap "tspc_1/a_740_n680#" "tspc_2/D" -6.57619
+cap "tspc_1/a_740_n680#" "tspc_2/a_300_n150#" 155.525
+cap "tspc_2/w_n140_n70#" "tspc_1/a_740_n680#" 0.065
+cap "tspc_2/gnd!" "tspc_2/Z2" 7.81579
+cap "a_n940_n20#" "tspc_2/Z2" 12.6176
+cap "tspc_2/D" "tspc_2/Z3" 0.681818
+cap "tspc_2/D" "tspc_2/Z4" 20.0553
+cap "tspc_2/a_300_n150#" "tspc_2/Z4" 30.4615
+cap "tspc_2/D" "tspc_2/Z2" 309.898
+cap "tspc_1/a_740_n680#" "tspc_2/Z4" 10.5882
+cap "tspc_2/a_300_n150#" "tspc_2/Z2" 25.8231
+cap "tspc_1/a_740_n680#" "tspc_2/Z2" 116.18
+cap "tspc_2/gnd!" "tspc_1/a_630_n680#" 7.61538
+cap "a_n940_n20#" "tspc_1/a_630_n680#" 9.78378
+cap "a_n940_n20#" "tspc_2/gnd!" 30.14
+cap "tspc_2/D" "tspc_1/a_630_n680#" 1.21622
+cap "tspc_2/D" "tspc_2/gnd!" 339.551
+cap "tspc_1/a_740_n680#" "tspc_1/a_630_n680#" 159.107
+cap "tspc_2/a_300_n150#" "tspc_2/gnd!" 21.2143
+cap "tspc_2/D" "tspc_2/Z3" 0.681818
+cap "tspc_2/D" "tspc_2/a_300_n150#" -1.77636e-15
+cap "tspc_2/a_630_n680#" "tspc_2/D" 159.583
+cap "tspc_2/GND" "tspc_2/D" 450.398
+cap "tspc_2/Z4" "tspc_2/D" 17.815
+cap "tspc_2/GND" "a_n940_n20#" 23.265
+cap "tspc_2/a_630_n680#" "a_n940_n20#" 9.78378
+cap "tspc_2/Z2" "a_n940_n20#" 15.0441
+cap "tspc_2/Z4" "li_5560_680#" 10.5882
+cap "tspc_2/D" "tspc_2/Q" 20.775
+cap "prescaler_0/mc1" "prescaler_0/nand_0/VDD" 78.0797
+cap "prescaler_0/nand_0/A" "prescaler_0/nand_0/VDD" 12.2938
+cap "prescaler_0/nand_0/A" "a_n940_n20#" 14.7632
+cap "prescaler_0/tspc_0/D" "prescaler_0/nand_0/VDD" -2.84217e-14
+cap "prescaler_0/nand_0/VDD" "prescaler_0/tspc_2/vdd!" 4.57853
+cap "prescaler_0/nand_0/VDD" "prescaler_0/tspc_2/Q" 6.67557
+cap "prescaler_0/nand_0/VDD" "prescaler_0/tspc_0/Z1" -2.4869e-14
+cap "prescaler_0/nand_0/VDD" "prescaler_0/tspc_2/Q" 6.67557
+cap "prescaler_0/tspc_0/Z2" "prescaler_0/nand_0/VDD" -1.77636e-15
+cap "prescaler_0/mc1" "prescaler_0/nand_0/VDD" 2.73
+cap "prescaler_0/tspc_1/Z3" "prescaler_0/tspc_1/vdd!" -2.37588e-14
+cap "prescaler_0/tspc_1/Z2" "prescaler_0/tspc_1/vdd!" 6.92779e-14
+cap "prescaler_0/tspc_1/Z1" "prescaler_0/tspc_1/vdd!" 3.19744e-14
+cap "prescaler_0/mc1" "prescaler_0/tspc_1/vdd!" 73.8879
+cap "prescaler_0/nand_1/a_280_n230#" "prescaler_0/tspc_1/vdd!" 14.3654
+cap "and_0/VDD" "and_0/OUT" 7.5
+cap "and_0/VDD" "prescaler_0/GND" 244.839
+cap "and_0/VDD" "prescaler_0/mc1" 2.6129
+cap "and_0/VDD" "tspc_0/Z1" -2.4869e-14
+cap "and_0/VDD" "tspc_0/Z2" 10
+cap "and_0/VDD" "prescaler_0/tspc_1/Q" 19.25
+cap "and_0/VDD" "prescaler_0/tspc_1/a_740_n680#" 114.95
+cap "nor_0/vdd!" "tspc_1/a_300_n150#" 93.7845
+cap "tspc_1/a_300_n150#" "tspc_1/Z1" 7
+cap "nor_0/vdd!" "tspc_0/a_740_n680#" 177.528
+cap "nor_0/VDD" "tspc_0/a_740_n680#" 4.63
+cap "tspc_0/a_740_n680#" "tspc_1/Z2" 41.1927
+cap "nor_0/VDD" "nor_0/vdd!" -3.46
+cap "tspc_0/a_740_n680#" "tspc_1/a_300_n150#" 75.365
+cap "nor_0/VDD" "tspc_1/Z2" 3.10862e-14
+cap "nor_0/vdd!" "tspc_1/a_740_n680#" 13.3333
+cap "nor_0/VDD" "tspc_1/a_740_n680#" 76.5957
+cap "nor_0/VDD" "nor_0/vdd!" 224.245
+cap "tspc_2/Z1" "tspc_2/a_300_n150#" 7
+cap "tspc_2/Z2" "tspc_1/a_740_n680#" 85.1351
+cap "tspc_1/a_740_n680#" "tspc_2/a_300_n150#" 75.365
+cap "tspc_2/Z2" "nor_0/VDD" 4.44089e-16
+cap "tspc_2/Z1" "nor_0/VDD" 2.2482e-14
+cap "nor_0/VDD" "tspc_1/Z3" -2.37588e-14
+cap "nor_0/VDD" "tspc_2/a_300_n150#" 93.7845
+cap "tspc_2/vdd!" "tspc_2/Q" -5.32907e-14
+cap "tspc_2/vdd!" "tspc_2/Z3" -2.37588e-14
+cap "tspc_2/vdd!" "tspc_2/Z2" 3.73035e-14
+cap "tspc_2/vdd!" "tspc_2/a_740_n680#" 13.125
+cap "tspc_2/vdd!" "tspc_2/Z1" -1.90958e-14
+cap "w_n140_1520#" "prescaler_0/tspc_2/vdd!" 6.56545
+cap "w_n140_1520#" "prescaler_0/tspc_2/Q" 27.2014
+cap "prescaler_0/tspc_2/a_630_n680#" "mc2" 328.675
+cap "prescaler_0/GND" "mc2" 319.267
+cap "a_n940_n20#" "prescaler_0/tspc_2/a_630_n680#" 5.04167
+cap "a_n940_n20#" "prescaler_0/GND" 12.1359
+cap "prescaler_0/tspc_2/Z2" "mc2" 136.815
+cap "prescaler_0/tspc_2/vdd!" "prescaler_0/tspc_2/Z1" -2.84217e-14
+cap "a_n940_n20#" "prescaler_0/tspc_2/Z2" 9.75806
+cap "prescaler_0/tspc_2/vdd!" "prescaler_0/tspc_2/Q" 9.57252
+cap "prescaler_0/tspc_2/vdd!" "prescaler_0/tspc_2/a_300_n150#" 5.55112e-16
+cap "prescaler_0/tspc_2/vdd!" "prescaler_0/tspc_2/Z3" -1.33227e-15
+cap "prescaler_0/tspc_2/vdd!" "prescaler_0/tspc_2/a_740_n680#" -1.13687e-13
+cap "prescaler_0/nand_1/VDD" "prescaler_0/nand_1/a_280_n230#" 34.0634
+cap "prescaler_0/nand_1/VDD" "prescaler_0/mc1" 19.9143
+cap "a_n940_n20#" "prescaler_0/GND" 3.58696
+cap "prescaler_0/nand_1/VDD" "prescaler_0/tspc_2/D" 1.13687e-13
+cap "a_n940_n20#" "prescaler_0/tspc_2/Z2" 4.5
+cap "prescaler_0/GND" "mc2" 127.942
+cap "prescaler_0/tspc_2/Z2" "mc2" -280.235
+cap "mc2" "and_0/B" 13.94
+cap "mc2" "and_0/out1" 59.955
+cap "prescaler_0/m1_2700_2190#" "and_0/VDD" 36.6566
+cap "and_0/GND" "and_0/VDD" 23.0856
+cap "and_0/OUT" "and_0/out1" 48.6223
+cap "and_0/OUT" "and_0/VDD" 0.870968
+cap "and_0/Z1" "mc2" 74.215
+cap "and_0/GND" "mc2" 117.19
 cap "and_0/OUT" "mc2" 46.015
-cap "prescaler_0/GND" "nor_0/gnd!" 12.25
-cap "prescaler_0/GND" "mc2" 234.38
-cap "nor_0/Out" "nor_0/gnd!" 14.496
-cap "nor_0/Out" "mc2" 13.94
-cap "and_0/B" "mc2" 13.94
-cap "and_0/out1" "mc2" 59.955
-cap "nor_0/Out" "nor_0/Z1" 11.4391
-cap "and_0/a_120_n970#" "mc2" 49.2
-cap "and_0/OUT" "and_0/a_n100_20#" 39.6
-cap "nor_0/Out" "nor_0/B" 6.6
-cap "nor_0/Out" "prescaler_0/GND" 16.9459
-cap "and_0/OUT" "prescaler_0/GND" -20.05
-cap "and_0/out1" "and_0/OUT" 48.6223
-cap "w_2780_1920#" "and_0/OUT" -1.77636e-15
-cap "w_2780_1920#" "and_0/B" 1.17
-cap "nor_0/gnd!" "mc2" 65.22
-cap "nor_0/B" "nor_1/B" 12.6816
-cap "nor_1/A" "nor_1/Out" 163.742
-cap "nor_0/a_460_n430#" "nor_1/A" 49.2
-cap "nor_1/B" "nor_1/Out" 41.7957
-cap "nor_1/B" "nor_1/A" 13.7084
-cap "nor_1/a_n40_20#" "nor_0/B" 12.72
-cap "nor_1/GND" "nor_1/gnd!" 11.2881
-cap "nor_1/A" "nor_1/gnd!" 65.22
-cap "nor_1/Out" "nor_1/gnd!" 2.53846
-cap "nor_0/A" "nor_1/GND" 1.28205
-cap "nor_0/B" "nor_1/Z1" 85.22
-cap "nor_0/Out" "nor_1/Out" 90.78
-cap "nor_0/Out" "nor_0/Z1" 11.4391
-cap "nor_1/GND" "nor_1/A" 440.796
-cap "nor_0/B" "nor_0/Out" 6.6
+cap "and_0/OUT" "and_0/vdd!" 39.6
+cap "and_0/OUT" "and_0/GND" 22.72
+cap "a_n940_n20#" "and_0/out1" 3.20833
+cap "and_0/Z1" "a_n940_n20#" 5.5
+cap "and_0/GND" "a_n940_n20#" 5.09291
+cap "and_0/OUT" "a_n940_n20#" 3.20833
 cap "nor_0/B" "nor_0/A" 58.3333
-cap "nor_0/A" "nor_1/Out" 15.1125
-cap "w_2780_1920#" "nor_0/A" 0.99
-cap "nor_1/Out" "nor_0/a_n40_20#" 90.78
-cap "nor_0/Out" "nor_1/A" 147.445
-cap "nor_0/A" "nor_1/A" 12.84
-cap "nor_0/B" "nor_1/A" 20.2275
-cap "w_2780_1920#" "nor_0/B" -2.21
-cap "nor_0/B" "nor_1/Out" 127.077
+cap "nor_0/Out" "nor_0/B" 13.2
 cap "nor_1/Out" "nor_0/Z1" 181.56
-cap "w_2780_1920#" "nor_1/Out" 7.41
-cap "nor_1/A" "nor_1/Out" 16.2969
-cap "nor_1/A" "nor_1/GND" -54.6596
-cap "nor_1/B" "nor_1/A" 0.868421
-cap "m1_5770_3360#" "w_2780_1920#" -0.26
-cap "nor_1/a_n40_20#" "m1_5770_3360#" -162.86
-merge "and_0/GND" "nor_1/GND" -278.645 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 92500 -2320 0 0 0 0
-merge "nor_1/GND" "m4_5770_3730#"
-merge "m4_5770_3730#" "nor_0/GND"
-merge "nor_0/GND" "m4_4690_3730#"
-merge "m4_4690_3730#" "tspc_2/GND"
+cap "nor_1/Out" "nor_0/vdd!" 90.78
+cap "a_n940_n20#" "and_0/Z1" 0.916667
+cap "nor_1/Out" "nor_0/A" 15.1125
+cap "a_n940_n20#" "nor_0/GND" 6.50362
+cap "nor_1/Out" "nor_0/B" 84.4673
+cap "nor_0/VDD" "nor_0/A" 0.99
+cap "nor_1/Out" "nor_0/Out" 90.78
+cap "a_n940_n20#" "nor_0/Out" 7
+cap "nor_0/VDD" "nor_1/Out" 4.29
+cap "and_0/Z1" "mc2" -164.32
+cap "nor_0/GND" "mc2" 364.635
+cap "nor_0/A" "mc2" 12.84
+cap "nor_0/B" "mc2" 12.84
+cap "nor_0/Out" "mc2" 161.385
+cap "nor_0/Out" "nor_0/Z1" 22.8782
+cap "nor_0/A" "nor_0/GND" 1.28205
+cap "nor_0/B" "nor_1/B" 2.64706
+cap "nor_0/Out" "nor_0/GND" 16.9459
+cap "nor_0/vdd!" "nor_0/B" 90.78
+cap "nor_1/Z1" "nor_0/B" 181.56
+cap "nor_1/Out" "nor_0/B" 90.78
+cap "nor_1/A" "nor_0/B" 15.1125
+cap "nor_1/B" "nor_0/B" 17.7596
+cap "nor_1/A" "nor_1/Out" 180.039
+cap "nor_1/A" "nor_1/GND" 305.362
+cap "nor_1/B" "nor_1/Out" 41.7957
+cap "nor_1/B" "nor_1/A" 14.5768
+cap "nor_0/VDD" "nor_0/B" -7.41
+cap "nor_0/VDD" "nor_1/Out" 4.29
+cap "a_n940_n20#" "nor_1/Out" 7
+cap "a_n940_n20#" "nor_1/GND" 2
+cap "a_n940_n20#" "prescaler_0/tspc_2/Z2" 9.75806
+cap "a_n940_n20#" "prescaler_0/tspc_2/a_630_n680#" 5.04167
+cap "a_n940_n20#" "prescaler_0/GND" 12.1359
+cap "a_n940_n20#" "prescaler_0/GND" 3.58696
+cap "a_n940_n20#" "prescaler_0/tspc_2/Z2" 4.5
+cap "a_n940_n20#" "and_0/OUT" 3.20833
+cap "a_n940_n20#" "and_0/GND" 9.75595
+cap "a_n940_n20#" "and_0/Z1" 5.5
+cap "a_n940_n20#" "and_0/out1" 3.20833
+cap "a_n940_n20#" "nor_0/Out" 7
+cap "a_n940_n20#" "and_0/Z1" 0.916667
+cap "a_n940_n20#" "nor_0/GND" 29.5
+cap "a_n940_n20#" "nor_1/GND" 20.3333
+cap "a_n940_n20#" "nor_1/Out" 7
+merge "nor_1/GND" "nor_0/gnd!" -270.175 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 70100 -2250 0 0 0 0
+merge "nor_0/gnd!" "nor_1/gnd!"
+merge "nor_1/gnd!" "nor_0/GND"
+merge "nor_0/GND" "m4_5770_3730#"
+merge "m4_5770_3730#" "and_0/GND"
+merge "and_0/GND" "m4_4690_3730#"
+merge "m4_4690_3730#" "tspc_1/gnd!"
+merge "tspc_1/gnd!" "tspc_2/GND"
 merge "tspc_2/GND" "tspc_1/GND"
-merge "tspc_1/GND" "m4_7020_30#"
+merge "tspc_1/GND" "tspc_2/gnd!"
+merge "tspc_2/gnd!" "m4_7020_30#"
 merge "m4_7020_30#" "tspc_0/GND"
 merge "tspc_0/GND" "prescaler_0/GND"
 merge "prescaler_0/GND" "gnd"
-merge "nor_1/a_460_n430#" "nor_0/a_460_n430#" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-merge "nor_0/a_460_n430#" "and_0/a_120_n970#"
-merge "and_0/a_120_n970#" "tspc_2/a_540_n1120#"
-merge "tspc_2/a_540_n1120#" "tspc_1/a_540_n1120#"
-merge "tspc_1/a_540_n1120#" "tspc_0/a_540_n1120#"
-merge "tspc_0/a_540_n1120#" "prescaler_0/VSUBS"
-merge "prescaler_0/VSUBS" "VSUBS"
-merge "prescaler_0/clk" "clk" -32.84 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 19200 -200 0 0 0 0 0 0 0 0
-merge "and_0/OUT" "prescaler_0/nand_1/A" -86.575 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10400 -260 0 0 0 0 0 0 0 0 0 0 0 0
-merge "prescaler_0/nand_1/A" "prescaler_0/mc1"
+merge "nor_1/VSUBS" "nor_0/VSUBS" -12309.6 0 0 0 0 0 0 0 0 0 0 331259 -18282 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 935653 -49352 0 0 0 0 0 0 0 0 0 0 0 0
+merge "nor_0/VSUBS" "and_0/VSUBS"
+merge "and_0/VSUBS" "tspc_2/VSUBS"
+merge "tspc_2/VSUBS" "tspc_1/VSUBS"
+merge "tspc_1/VSUBS" "tspc_0/VSUBS"
+merge "tspc_0/VSUBS" "prescaler_0/VSUBS"
+merge "prescaler_0/VSUBS" "a_n940_n20#"
+merge "prescaler_0/clk" "clk" -41.255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -600 -200 0 0 0 0 0 0 0 0
+merge "and_0/OUT" "prescaler_0/mc1" -171.12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -81000 -260 0 0 0 0 0 0 0 0 0 0 0 0
 merge "prescaler_0/mc1" "li_2870_2670#"
-merge "tspc_2/a_n60_n20#" "nor_1/a_n40_20#" -1206.52 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -2100 -320 0 0 0 0 0 0 22700 -5600 0 0 0 0
-merge "nor_1/a_n40_20#" "nor_0/a_n40_20#"
-merge "nor_0/a_n40_20#" "m4_7030_1860#"
-merge "m4_7030_1860#" "tspc_1/a_n60_n20#"
-merge "tspc_1/a_n60_n20#" "and_0/a_n100_20#"
-merge "and_0/a_n100_20#" "tspc_0/a_n60_n20#"
-merge "tspc_0/a_n60_n20#" "vdd"
-merge "vdd" "prescaler_0/tspc_1/a_n60_n20#"
-merge "prescaler_0/tspc_1/a_n60_n20#" "li_3310_1810#"
-merge "nor_1/B" "tspc_2/a_740_n680#" -643.044 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1600 -160 -19260 -2332 0 0 0 0 0 0 0 0 0 0
-merge "tspc_2/a_740_n680#" "tspc_2/D"
-merge "tspc_2/D" "li_7140_680#"
-merge "nor_0/B" "tspc_1/a_740_n680#" -954.857 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -3200 -160 379400 -4460 4100 -160 0 0 0 0 0 0 0 0
-merge "tspc_1/a_740_n680#" "m1_5770_3360#"
-merge "m1_5770_3360#" "tspc_1/D"
-merge "tspc_1/D" "li_5560_680#"
-merge "nor_1/Out" "and_0/B" -205.455 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1200 -140 218100 -60 0 0 0 0 0 0 0 0 0 0
-merge "and_0/B" "li_6130_3350#"
-merge "tspc_1/Q" "tspc_2/a_300_n150#" -754.337 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -33600 -160 -456300 0 -786800 -80 0 0 0 0 0 0 0 0
-merge "tspc_2/a_300_n150#" "li_7040_820#"
-merge "nor_0/A" "tspc_0/a_740_n680#" -974.675 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -4400 -300 -111000 -260 70700 -3420 0 0 0 0 0 0 0 0
-merge "tspc_0/a_740_n680#" "li_5740_3250#"
-merge "li_5740_3250#" "tspc_0/D"
-merge "tspc_0/D" "li_3980_680#"
-merge "tspc_0/a_300_n150#" "prescaler_0/Out" -48.08 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -45600 -140 0 0 0 0 0 0 0 0
-merge "prescaler_0/Out" "m2_3910_680#"
-merge "prescaler_0/tspc_2/w_n140_n70#" "prescaler_0/nand_0/VDD" -46.02 0 0 0 0 -15340 -5670 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-merge "prescaler_0/nand_0/VDD" "w_n140_1520#"
-merge "nor_1/A" "mc2" -504.34 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4400 -80 0 0 0 0 0 0 0 0 0 0 0 0
-merge "nor_1/VDD" "nor_0/VDD" -5830.44 0 0 0 0 -1943480 -46041 0 0 -57800 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-merge "nor_0/VDD" "and_0/VDD"
-merge "and_0/VDD" "prescaler_0/nand_1/VDD"
+merge "prescaler_0/m4_2730_1520#" "prescaler_0/nand_1/vdd!" 628.645 0 0 0 0 677908 -39550 0 0 -119000 -1030 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 219820 -1356 -67080 -1036 -67080 -1036 -67080 -1036 -324072 -7758 0 0 0 0
+merge "prescaler_0/nand_1/vdd!" "tspc_2/vdd!"
+merge "tspc_2/vdd!" "m4_7030_1860#"
+merge "m4_7030_1860#" "tspc_1/vdd!"
+merge "tspc_1/vdd!" "nor_1/vdd!"
+merge "nor_1/vdd!" "nor_1/VDD"
+merge "nor_1/VDD" "nor_0/vdd!"
+merge "nor_0/vdd!" "nor_0/VDD"
+merge "nor_0/VDD" "tspc_0/vdd!"
+merge "tspc_0/vdd!" "and_0/vdd!"
+merge "and_0/vdd!" "vdd"
+merge "vdd" "and_0/VDD"
+merge "and_0/VDD" "prescaler_0/tspc_1/vdd!"
+merge "prescaler_0/tspc_1/vdd!" "li_3310_1810#"
+merge "li_3310_1810#" "prescaler_0/nand_1/VDD"
 merge "prescaler_0/nand_1/VDD" "tspc_2/w_n140_n70#"
 merge "tspc_2/w_n140_n70#" "tspc_1/w_n140_n70#"
 merge "tspc_1/w_n140_n70#" "tspc_0/w_n140_n70#"
 merge "tspc_0/w_n140_n70#" "prescaler_0/tspc_1/w_n140_n70#"
-merge "prescaler_0/tspc_1/w_n140_n70#" "w_2780_1920#"
-merge "tspc_0/Q" "tspc_1/a_300_n150#" -258.082 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 26400 -160 0 0 -447600 -80 0 0 0 0 0 0 0 0
+merge "prescaler_0/tspc_1/w_n140_n70#" "prescaler_0/w_1930_2072#"
+merge "prescaler_0/w_1930_2072#" "w_2780_1920#"
+merge "nor_1/B" "tspc_2/a_740_n680#" -1006.11 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6800 -160 163360 -4720 0 0 0 0 0 0 0 0 0 0
+merge "tspc_2/a_740_n680#" "tspc_2/D"
+merge "tspc_2/D" "li_7140_680#"
+merge "nor_0/B" "tspc_1/a_740_n680#" -424.615 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6800 -160 55500 -280 102000 0 0 0 0 0 0 0 0 0
+merge "tspc_1/a_740_n680#" "m1_5770_3360#"
+merge "m1_5770_3360#" "tspc_1/D"
+merge "tspc_1/D" "li_5560_680#"
+merge "nor_1/Out" "and_0/B" -325.365 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 18000 -140 6300 -60 0 0 0 0 0 0 0 0 0 0
+merge "and_0/B" "li_6130_3350#"
+merge "tspc_1/Q" "tspc_2/a_300_n150#" -105.642 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 17800 -160 0 0 -70200 -80 0 0 0 0 0 0 0 0
+merge "tspc_2/a_300_n150#" "li_7040_820#"
+merge "nor_0/A" "tspc_0/a_740_n680#" -210.902 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4400 -300 6700 -260 70300 0 0 0 0 0 0 0 0 0
+merge "tspc_0/a_740_n680#" "li_5740_3250#"
+merge "li_5740_3250#" "tspc_0/D"
+merge "tspc_0/D" "li_3980_680#"
+merge "prescaler_0/tspc_2/vdd!" "prescaler_0/tspc_2/w_n140_n70#" -695.273 0 0 0 0 -223152 -5390 0 0 -36000 -500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 720 -564 -17680 -564 -17680 -564 -17680 -564 -10720 -820 0 0 0 0
+merge "prescaler_0/tspc_2/w_n140_n70#" "prescaler_0/nand_0/vdd!"
+merge "prescaler_0/nand_0/vdd!" "prescaler_0/nand_0/VDD"
+merge "prescaler_0/nand_0/VDD" "w_n140_1520#"
+merge "tspc_0/a_300_n150#" "prescaler_0/Out" -31.505 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -6600 -140 0 0 0 0 0 0 0 0
+merge "prescaler_0/Out" "m2_3910_680#"
+merge "nor_1/A" "mc2" 128.665 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 12000 -80 50800 0 898800 0 0 0 0 0 0 0 0 0
+merge "tspc_0/Q" "tspc_1/a_300_n150#" -118.057 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -7200 -160 0 0 -45000 -80 0 0 0 0 0 0 0 0
 merge "tspc_1/a_300_n150#" "li_5460_820#"
-merge "and_0/A" "nor_0/Out" -26.98 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 18400 -160 0 0 0 0 0 0 0 0 0 0 0 0
-merge "nor_0/Out" "li_4830_3100#"
-merge "tspc_2/Q" "Out" -27.5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -100 0 0 0 0 0 0 0 0 0 0 0 0
+merge "nor_0/Out" "and_0/A" -50.29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -6800 -160 0 0 0 0 0 0 0 0 0 0 0 0
+merge "and_0/A" "li_4830_3100#"
+merge "tspc_2/Q" "Out" -28.98 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1600 -100 0 0 0 0 0 0 0 0 0 0 0 0

diff --git a/mag/divider.mag b/mag/divider.mag
index c190b06..7829f67 100644
--- a/mag/divider.mag
+++ b/mag/divider.mag

@@ -1,6 +1,6 @@
 magic
 tech sky130A
-timestamp 1640711282
+timestamp 1640957771
 << nwell >>
 rect 2885 1480 3070 1620
 rect 3370 1480 4310 1620
@@ -9,25 +9,253 @@
 rect 1390 990 1995 1260
 rect 2415 990 4310 1480
 rect 1390 960 4310 990
+rect 1549 941 1642 960
 rect 1800 460 1990 960
 rect 2730 460 2780 960
 rect 3370 955 4310 960
 rect 3520 460 3570 955
+rect 3650 934 3711 955
+<< psubdiff >>
+rect -205 2115 -75 2130
+rect -205 2015 -190 2115
+rect -90 2015 -75 2115
+rect -205 2000 -75 2015
+rect 370 2115 500 2130
+rect 370 2015 385 2115
+rect 485 2015 500 2115
+rect 370 2000 500 2015
+rect 945 2115 1075 2130
+rect 945 2015 960 2115
+rect 1060 2015 1075 2115
+rect 945 2000 1075 2015
+rect 1520 2115 1650 2130
+rect 1520 2015 1535 2115
+rect 1635 2015 1650 2115
+rect 1520 2000 1650 2015
+rect 2095 2115 2225 2130
+rect 2095 2015 2110 2115
+rect 2210 2015 2225 2115
+rect 2095 2000 2225 2015
+rect 2670 2115 2800 2130
+rect 2670 2015 2685 2115
+rect 2785 2015 2800 2115
+rect 2670 2000 2800 2015
+rect 3245 2115 3375 2130
+rect 3245 2015 3260 2115
+rect 3360 2015 3375 2115
+rect 3245 2000 3375 2015
+rect 3820 2115 3950 2130
+rect 3820 2015 3835 2115
+rect 3935 2015 3950 2115
+rect 3820 2000 3950 2015
+rect 4395 2115 4525 2130
+rect 4395 2015 4410 2115
+rect 4510 2015 4525 2115
+rect 4395 2000 4525 2015
+rect -470 1830 -340 1845
+rect -470 1730 -455 1830
+rect -355 1730 -340 1830
+rect -470 1715 -340 1730
+rect 4540 1830 4670 1845
+rect 4540 1730 4555 1830
+rect 4655 1730 4670 1830
+rect 4540 1715 4670 1730
+rect -470 1255 -340 1270
+rect -470 1155 -455 1255
+rect -355 1155 -340 1255
+rect -470 1140 -340 1155
+rect 4540 1255 4670 1270
+rect 4540 1155 4555 1255
+rect 4655 1155 4670 1255
+rect 4540 1140 4670 1155
+rect -470 680 -340 695
+rect -470 580 -455 680
+rect -355 580 -340 680
+rect -470 565 -340 580
+rect 4540 680 4670 695
+rect 4540 580 4555 680
+rect 4655 580 4670 680
+rect 4540 565 4670 580
+rect -470 105 -340 120
+rect -470 5 -455 105
+rect -355 5 -340 105
+rect -470 -10 -340 5
+rect 4540 105 4670 120
+rect 4540 5 4555 105
+rect 4655 5 4670 105
+rect 4540 -10 4670 5
+rect -195 -100 -65 -85
+rect -195 -200 -180 -100
+rect -80 -200 -65 -100
+rect -195 -215 -65 -200
+rect 380 -100 510 -85
+rect 380 -200 395 -100
+rect 495 -200 510 -100
+rect 380 -215 510 -200
+rect 955 -100 1085 -85
+rect 955 -200 970 -100
+rect 1070 -200 1085 -100
+rect 955 -215 1085 -200
+rect 1530 -100 1660 -85
+rect 1530 -200 1545 -100
+rect 1645 -200 1660 -100
+rect 1530 -215 1660 -200
+rect 2105 -100 2235 -85
+rect 2105 -200 2120 -100
+rect 2220 -200 2235 -100
+rect 2105 -215 2235 -200
+rect 2680 -100 2810 -85
+rect 2680 -200 2695 -100
+rect 2795 -200 2810 -100
+rect 2680 -215 2810 -200
+rect 3255 -100 3385 -85
+rect 3255 -200 3270 -100
+rect 3370 -200 3385 -100
+rect 3255 -215 3385 -200
+rect 3830 -100 3960 -85
+rect 3830 -200 3845 -100
+rect 3945 -200 3960 -100
+rect 3830 -215 3960 -200
+rect 4405 -100 4535 -85
+rect 4405 -200 4420 -100
+rect 4520 -200 4535 -100
+rect 4405 -215 4535 -200
+<< nsubdiff >>
+rect 3705 1334 3880 1370
+rect 60 1229 235 1265
+rect 60 1125 90 1229
+rect 193 1125 235 1229
+rect 3705 1230 3735 1334
+rect 3838 1230 3880 1334
+rect 3705 1195 3880 1230
+rect 60 1090 235 1125
+rect 1520 1159 1695 1195
+rect 1520 1055 1550 1159
+rect 1653 1055 1695 1159
+rect 1520 1020 1695 1055
+<< psubdiffcont >>
+rect -190 2015 -90 2115
+rect 385 2015 485 2115
+rect 960 2015 1060 2115
+rect 1535 2015 1635 2115
+rect 2110 2015 2210 2115
+rect 2685 2015 2785 2115
+rect 3260 2015 3360 2115
+rect 3835 2015 3935 2115
+rect 4410 2015 4510 2115
+rect -455 1730 -355 1830
+rect 4555 1730 4655 1830
+rect -455 1155 -355 1255
+rect 4555 1155 4655 1255
+rect -455 580 -355 680
+rect 4555 580 4655 680
+rect -455 5 -355 105
+rect 4555 5 4655 105
+rect -180 -200 -80 -100
+rect 395 -200 495 -100
+rect 970 -200 1070 -100
+rect 1545 -200 1645 -100
+rect 2120 -200 2220 -100
+rect 2695 -200 2795 -100
+rect 3270 -200 3370 -100
+rect 3845 -200 3945 -100
+rect 4420 -200 4520 -100
+<< nsubdiffcont >>
+rect 90 1125 193 1229
+rect 3735 1230 3838 1334
+rect 1550 1055 1653 1159
 << locali >>
+rect -490 2115 4690 2150
+rect -490 2015 -190 2115
+rect -90 2015 385 2115
+rect 485 2015 960 2115
+rect 1060 2015 1535 2115
+rect 1635 2015 2110 2115
+rect 2210 2015 2685 2115
+rect 2785 2015 3260 2115
+rect 3360 2015 3835 2115
+rect 3935 2015 4410 2115
+rect 4510 2015 4690 2115
+rect -490 1980 4690 2015
+rect -490 1830 -320 1980
+rect -490 1730 -455 1830
+rect -355 1730 -320 1830
+rect 4520 1830 4690 1980
+rect -490 1255 -320 1730
 rect 1975 1355 1995 1585
 rect 2565 1570 2585 1695
 rect 3400 1645 3420 1780
 rect 3370 1625 3420 1645
+rect 4520 1730 4555 1830
+rect 4655 1730 4690 1830
 rect 2415 1550 2585 1570
 rect 1435 1335 1995 1355
+rect -490 1155 -455 1255
+rect -355 1155 -320 1255
+rect 3724 1334 3854 1346
+rect -490 680 -320 1155
+rect 79 1229 209 1241
+rect 79 1125 90 1229
+rect 193 1228 209 1229
+rect 79 1123 91 1125
+rect 194 1123 209 1228
+rect 3724 1230 3735 1334
+rect 3838 1333 3854 1334
+rect 3724 1228 3736 1230
+rect 3839 1228 3854 1333
+rect 3724 1217 3854 1228
+rect 4520 1255 4690 1730
+rect 79 1112 209 1123
+rect 1539 1159 1669 1171
+rect 1539 1055 1550 1159
+rect 1653 1158 1669 1159
+rect 1539 1053 1551 1055
+rect 1654 1053 1669 1158
+rect 1539 1042 1669 1053
+rect 4520 1155 4555 1255
+rect 4655 1155 4690 1255
 rect 1655 945 2060 965
 rect 1655 905 1675 945
 rect 2035 850 2060 945
+rect -490 580 -455 680
+rect -355 580 -320 680
+rect -490 105 -320 580
+rect 4520 680 4690 1155
+rect 4520 580 4555 680
+rect 4655 580 4690 680
 rect 4330 410 4395 435
+rect -490 5 -455 105
+rect -355 5 -320 105
+rect -490 -65 -320 5
+rect 4520 105 4690 580
+rect 4520 5 4555 105
+rect 4655 5 4690 105
+rect 4520 -65 4690 5
+rect -490 -100 4690 -65
+rect -490 -200 -180 -100
+rect -80 -200 395 -100
+rect 495 -200 970 -100
+rect 1070 -200 1545 -100
+rect 1645 -200 2120 -100
+rect 2220 -200 2695 -100
+rect 2795 -200 3270 -100
+rect 3370 -200 3845 -100
+rect 3945 -200 4420 -100
+rect 4520 -200 4690 -100
+rect -490 -235 4690 -200
 << viali >>
 rect 3400 1780 3420 1800
 rect 3065 1675 3085 1695
 rect 2870 1625 2890 1645
+rect 91 1125 193 1228
+rect 193 1125 194 1228
+rect 91 1123 194 1125
+rect 3736 1230 3838 1333
+rect 3838 1230 3839 1333
+rect 3736 1228 3839 1230
+rect 1551 1055 1653 1158
+rect 1653 1055 1654 1158
+rect 1551 1053 1654 1055
 rect 2730 410 2750 430
 rect 3520 410 3540 430
 rect 1990 340 2010 360
@@ -61,6 +289,14 @@
 rect 3005 1335 3010 1355
 rect 3005 1325 3490 1335
 rect 2970 1320 3490 1325
+rect 79 1228 209 1241
+rect 79 1123 91 1228
+rect 194 1123 209 1228
+rect 79 1112 209 1123
+rect 1539 1158 1669 1171
+rect 1539 1053 1551 1158
+rect 1654 1053 1669 1158
+rect 1539 1042 1669 1053
 rect 2730 595 2770 600
 rect 2730 585 2735 595
 rect 2685 570 2735 585
@@ -85,6 +321,10 @@
 rect 2765 340 2780 360
 rect 2800 340 2810 360
 rect 3475 340 3490 1320
+rect 3724 1333 3854 1346
+rect 3724 1228 3736 1333
+rect 3839 1228 3854 1333
+rect 3724 1217 3854 1228
 rect 3510 435 3550 440
 rect 3510 405 3515 435
 rect 3545 405 3550 435
@@ -118,12 +358,15 @@
 rect 2890 1625 2895 1645
 rect 2865 1620 2895 1625
 rect 2975 1325 3005 1355
+rect 91 1123 194 1228
+rect 1551 1053 1654 1158
 rect 2735 565 2765 595
 rect 2725 430 2755 435
 rect 2725 410 2730 430
 rect 2730 410 2750 430
 rect 2750 410 2755 430
 rect 2725 405 2755 410
+rect 3736 1228 3839 1333
 rect 3515 430 3545 435
 rect 3515 410 3520 430
 rect 3520 410 3540 430
@@ -144,12 +387,24 @@
 rect 2895 1645 2905 1650
 rect 2895 1620 2915 1645
 rect 2855 1610 2915 1620
+rect 79 1228 209 1241
+rect 79 1123 91 1228
+rect 194 1123 209 1228
+rect 79 1112 209 1123
+rect 1539 1158 1669 1171
+rect 1539 1053 1551 1158
+rect 1654 1053 1669 1158
+rect 1539 1042 1669 1053
 rect 2900 995 2915 1610
 rect 2985 1365 3000 1670
 rect 2965 1355 3015 1365
 rect 2965 1325 2975 1355
 rect 3005 1325 3015 1355
 rect 2965 1315 3015 1325
+rect 3724 1333 3854 1346
+rect 3724 1228 3736 1333
+rect 3839 1228 3854 1333
+rect 3724 1217 3854 1228
 rect 2745 980 2915 995
 rect 2745 605 2760 980
 rect 2725 595 2775 605
@@ -171,47 +426,90 @@
 rect 3545 430 3570 435
 rect 3545 405 3555 430
 rect 3505 395 3555 405
+<< via2 >>
+rect 91 1123 194 1228
+rect 1551 1053 1654 1158
+rect 3736 1228 3839 1333
+<< metal3 >>
+rect 3724 1333 3854 1346
+rect 79 1228 209 1241
+rect 79 1123 91 1228
+rect 194 1123 209 1228
+rect 3724 1228 3736 1333
+rect 3839 1228 3854 1333
+rect 3724 1217 3854 1228
+rect 79 1112 209 1123
+rect 1539 1158 1669 1171
+rect 1539 1053 1551 1158
+rect 1654 1053 1669 1158
+rect 1539 1042 1669 1053
+<< via3 >>
+rect 91 1123 194 1228
+rect 3736 1228 3839 1333
+rect 1551 1053 1654 1158
 << metal4 >>
 rect 1885 1850 2040 1885
 rect 2345 1865 2590 1895
 rect 2885 1865 3070 1895
 rect 1885 1530 1915 1850
+rect 3645 1333 3940 1420
+rect 129 1241 279 1278
+rect 79 1228 279 1241
+rect 79 1161 91 1228
+rect 78 1123 91 1161
+rect 194 1123 279 1228
+rect 3645 1228 3736 1333
+rect 3839 1228 3940 1333
+rect 1589 1171 1705 1208
+rect 78 1096 279 1123
+rect 1539 1158 1705 1171
+rect 78 1095 171 1096
+rect 216 964 273 1096
+rect 1539 1091 1551 1158
+rect 1538 1053 1551 1091
+rect 1654 1053 1705 1158
 rect 2350 1080 2785 1110
 rect 2885 1080 3070 1110
+rect 3645 1065 3940 1228
+rect 1538 1050 1705 1053
+rect 1538 1025 1710 1050
+rect 1549 975 1710 1025
+rect 1549 941 1642 975
 rect 1995 960 2415 995
 rect 2725 930 2815 960
 rect 3515 930 3605 960
+rect 3650 934 3711 1065
 rect 1915 15 2005 45
 rect 2715 15 2810 45
 rect 3510 15 3600 45
-use tspc  tspc_2
-timestamp 1640710665
-transform 1 0 3640 0 1 495
-box -70 -565 690 465
-use tspc  tspc_1
-timestamp 1640710665
-transform 1 0 2850 0 1 495
-box -70 -565 690 465
-use tspc  tspc_0
-timestamp 1640710665
-transform 1 0 2060 0 1 495
-box -70 -565 690 465
-use prescaler  prescaler_0
-timestamp 1640711282
-transform 1 0 25 0 1 200
-box -210 -270 1930 1790
-use and  and_0
-timestamp 1640698682
-transform -1 0 2330 0 -1 1465
-box -85 -490 335 475
 use nor  nor_0
-timestamp 1640700690
+timestamp 1640957762
 transform -1 0 2830 0 -1 1605
-box -55 -300 290 610
+box -55 -300 245 610
 use nor  nor_1
-timestamp 1640700690
+timestamp 1640957762
 transform -1 0 3315 0 -1 1605
-box -55 -300 290 610
+box -55 -300 245 610
+use and  and_0
+timestamp 1640957762
+transform -1 0 2330 0 -1 1465
+box -85 -435 335 475
+use prescaler  prescaler_0
+timestamp 1640957762
+transform 1 0 25 0 1 200
+box -210 -195 1930 1715
+use tspc  tspc_2
+timestamp 1640957762
+transform 1 0 3640 0 1 495
+box -70 -490 690 465
+use tspc  tspc_1
+timestamp 1640957762
+transform 1 0 2850 0 1 495
+box -70 -490 690 465
+use tspc  tspc_0
+timestamp 1640957762
+transform 1 0 2060 0 1 495
+box -70 -490 690 465
 << labels >>
 rlabel metal4 1915 15 2005 45 1 gnd
 rlabel metal4 2715 15 2810 45 1 gnd

diff --git a/mag/filter.ext b/mag/filter.ext
new file mode 100644
index 0000000..f85e42a
--- /dev/null
+++ b/mag/filter.ext

@@ -0,0 +1,26 @@
+timestamp 1640921877
+version 8.3
+tech sky130A
+style ngspice()
+scale 1000 1 500000
+resistclasses 4400000 2200000 1700000 3050000 120000 197000 114000 191000 120000 197000 114000 191000 48200 319800 2000000 48200 48200 12200 125 125 47 47 29 5
+parameters sky130_fd_pr__res_xhigh_po l=l w=w
+parameters sky130_fd_pr__res_xhigh_po_5p73 l=l
+parameters sky130_fd_pr__res_xhigh_po_2p85 l=l
+parameters sky130_fd_pr__res_xhigh_po_1p41 l=l
+parameters sky130_fd_pr__res_xhigh_po_0p69 l=l
+parameters sky130_fd_pr__res_xhigh_po_0p35 l=l
+parameters sky130_fd_pr__cap_mim_m3_1 w=w l=l
+node "a_4294_n4798#" 51429 0 4294 -4798 xres 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 126000 3740 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+node "a_3976_n5230#" 178 415258 3976 -5230 xpc 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 60480 2008 154056 1592 40000 800 40000 800 177102650 116770 0 0 0 0
+node "a_3976_n4798#" 51429 0 3976 -4798 xres 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 126000 3740 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+node "a_3976_n2998#" 382 1341.76 3976 -2998 xpc 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 120960 4016 151980 1600 0 0 0 0 0 0 0 0 0 0
+substrate "v" 0 0 -3380 -20660 ppd 0 0 0 0 0 0 0 0 0 0 4732000 72800 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51962080 147668 853254 8326 97600 1760 241185900 76920 35214504 24450 0 0 0 0
+device csubckt sky130_fd_pr__cap_mim_m3_1 -2460 -19830 -2459 -19829 w=6000 l=6000 "None" "a_3976_n5230#" 22900 0 "v" 0 0
+device csubckt sky130_fd_pr__cap_mim_m3_1 4120 -19730 4121 -19729 w=6000 l=6000 "None" "a_3976_n5230#" 22890 0 "v" 0 0
+device csubckt sky130_fd_pr__cap_mim_m3_1 -2460 -13520 -2459 -13519 w=6000 l=6000 "None" "a_3976_n5230#" 23680 0 "v" 0 0
+device csubckt sky130_fd_pr__cap_mim_m3_1 4120 -13340 4121 -13339 w=6000 l=6000 "None" "a_3976_n5230#" 22900 0 "v" 0 0
+device csubckt sky130_fd_pr__cap_mim_m3_1 4770 -7130 4771 -7129 w=6000 l=6000 "None" "v" 22120 0 "v" 0 0
+device csubckt sky130_fd_pr__cap_mim_m3_1 -2460 -7130 -2459 -7129 w=6000 l=6000 "None" "a_3976_n5230#" 22900 0 "v" 0 0
+device rsubckt sky130_fd_pr__res_xhigh_po 4294 -4798 4295 -4797 l=1800 w=70 "v" "a_4294_n4798#" 0 0 "v" 70 0 "a_3976_n2998#" 70 0
+device rsubckt sky130_fd_pr__res_xhigh_po 3976 -4798 3977 -4797 l=1800 w=70 "v" "a_3976_n4798#" 0 0 "a_3976_n5230#" 70 0 "a_3976_n2998#" 70 0

diff --git a/mag/filter.mag b/mag/filter.mag
index a680503..ea65c1d 100644
--- a/mag/filter.mag
+++ b/mag/filter.mag

@@ -1,19 +1,701 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1640749174
+timestamp 1640921877
+<< psubdiff >>
+rect -3380 530 -3120 560
+rect -3380 330 -3350 530
+rect -3150 330 -3120 530
+rect -3380 300 -3120 330
+rect -2480 530 -2220 560
+rect -2480 330 -2450 530
+rect -2250 330 -2220 530
+rect -2480 300 -2220 330
+rect -1450 530 -1190 560
+rect -1450 330 -1420 530
+rect -1220 330 -1190 530
+rect -1450 300 -1190 330
+rect -420 530 -160 560
+rect -420 330 -390 530
+rect -190 330 -160 530
+rect -420 300 -160 330
+rect 610 530 870 560
+rect 610 330 640 530
+rect 840 330 870 530
+rect 610 300 870 330
+rect 1640 530 1900 560
+rect 1640 330 1670 530
+rect 1870 330 1900 530
+rect 1640 300 1900 330
+rect 2670 530 2930 560
+rect 2670 330 2700 530
+rect 2900 330 2930 530
+rect 2670 300 2930 330
+rect 3700 530 3960 560
+rect 3700 330 3730 530
+rect 3930 330 3960 530
+rect 3700 300 3960 330
+rect 4730 530 4990 560
+rect 4730 330 4760 530
+rect 4960 330 4990 530
+rect 4730 300 4990 330
+rect 5760 530 6020 560
+rect 5760 330 5790 530
+rect 5990 330 6020 530
+rect 5760 300 6020 330
+rect 6790 530 7050 560
+rect 6790 330 6820 530
+rect 7020 330 7050 530
+rect 6790 300 7050 330
+rect 7820 530 8080 560
+rect 7820 330 7850 530
+rect 8050 330 8080 530
+rect 7820 300 8080 330
+rect 8850 530 9110 560
+rect 8850 330 8880 530
+rect 9080 330 9110 530
+rect 8850 300 9110 330
+rect 9880 530 10140 560
+rect 9880 330 9910 530
+rect 10110 330 10140 530
+rect 9880 300 10140 330
+rect 10910 530 11170 560
+rect 10910 330 10940 530
+rect 11140 330 11170 530
+rect 10910 300 11170 330
+rect 11630 530 11890 560
+rect 11630 330 11660 530
+rect 11860 330 11890 530
+rect 11630 300 11890 330
+rect 11630 -710 11890 -680
+rect -3380 -740 -3120 -710
+rect -3380 -940 -3350 -740
+rect -3150 -940 -3120 -740
+rect 11630 -910 11660 -710
+rect 11860 -910 11890 -710
+rect 11630 -940 11890 -910
+rect -3380 -970 -3120 -940
+rect 11630 -1740 11890 -1710
+rect -3380 -1770 -3120 -1740
+rect -3380 -1970 -3350 -1770
+rect -3150 -1970 -3120 -1770
+rect 11630 -1940 11660 -1740
+rect 11860 -1940 11890 -1740
+rect 11630 -1970 11890 -1940
+rect -3380 -2000 -3120 -1970
+rect -3380 -2800 -3120 -2770
+rect -3380 -3000 -3350 -2800
+rect -3150 -3000 -3120 -2800
+rect -3380 -3030 -3120 -3000
+rect -3380 -3830 -3120 -3800
+rect -3380 -4030 -3350 -3830
+rect -3150 -4030 -3120 -3830
+rect -3380 -4060 -3120 -4030
+rect -3380 -4860 -3120 -4830
+rect -3380 -5060 -3350 -4860
+rect -3150 -5060 -3120 -4860
+rect -3380 -5090 -3120 -5060
+rect 11630 -2770 11890 -2740
+rect 11630 -2970 11660 -2770
+rect 11860 -2970 11890 -2770
+rect 11630 -3000 11890 -2970
+rect 11630 -3800 11890 -3770
+rect 11630 -4000 11660 -3800
+rect 11860 -4000 11890 -3800
+rect 11630 -4030 11890 -4000
+rect 11630 -4830 11890 -4800
+rect 11630 -5030 11660 -4830
+rect 11860 -5030 11890 -4830
+rect 11630 -5060 11890 -5030
+rect 11630 -5860 11890 -5830
+rect -3380 -5890 -3120 -5860
+rect -3380 -6090 -3350 -5890
+rect -3150 -6090 -3120 -5890
+rect 11630 -6060 11660 -5860
+rect 11860 -6060 11890 -5860
+rect 11630 -6090 11890 -6060
+rect -3380 -6120 -3120 -6090
+rect 11630 -6890 11890 -6860
+rect -3380 -6920 -3120 -6890
+rect -3380 -7120 -3350 -6920
+rect -3150 -7120 -3120 -6920
+rect 11630 -7090 11660 -6890
+rect 11860 -7090 11890 -6890
+rect 11630 -7120 11890 -7090
+rect -3380 -7150 -3120 -7120
+rect 11630 -7920 11890 -7890
+rect -3380 -7950 -3120 -7920
+rect -3380 -8150 -3350 -7950
+rect -3150 -8150 -3120 -7950
+rect 11630 -8120 11660 -7920
+rect 11860 -8120 11890 -7920
+rect 11630 -8150 11890 -8120
+rect -3380 -8180 -3120 -8150
+rect 11630 -8950 11890 -8920
+rect -3380 -8980 -3120 -8950
+rect -3380 -9180 -3350 -8980
+rect -3150 -9180 -3120 -8980
+rect 11630 -9150 11660 -8950
+rect 11860 -9150 11890 -8950
+rect 11630 -9180 11890 -9150
+rect -3380 -9210 -3120 -9180
+rect 11630 -9980 11890 -9950
+rect -3380 -10010 -3120 -9980
+rect -3380 -10210 -3350 -10010
+rect -3150 -10210 -3120 -10010
+rect 11630 -10180 11660 -9980
+rect 11860 -10180 11890 -9980
+rect 11630 -10210 11890 -10180
+rect -3380 -10240 -3120 -10210
+rect 11630 -11010 11890 -10980
+rect -3380 -11040 -3120 -11010
+rect -3380 -11240 -3350 -11040
+rect -3150 -11240 -3120 -11040
+rect 11630 -11210 11660 -11010
+rect 11860 -11210 11890 -11010
+rect 11630 -11240 11890 -11210
+rect -3380 -11270 -3120 -11240
+rect 11630 -12040 11890 -12010
+rect -3380 -12070 -3120 -12040
+rect -3380 -12270 -3350 -12070
+rect -3150 -12270 -3120 -12070
+rect 11630 -12240 11660 -12040
+rect 11860 -12240 11890 -12040
+rect 11630 -12270 11890 -12240
+rect -3380 -12300 -3120 -12270
+rect 11630 -13070 11890 -13040
+rect -3380 -13100 -3120 -13070
+rect -3380 -13300 -3350 -13100
+rect -3150 -13300 -3120 -13100
+rect 11630 -13270 11660 -13070
+rect 11860 -13270 11890 -13070
+rect 11630 -13300 11890 -13270
+rect -3380 -13330 -3120 -13300
+rect 11630 -14100 11890 -14070
+rect -3380 -14130 -3120 -14100
+rect -3380 -14330 -3350 -14130
+rect -3150 -14330 -3120 -14130
+rect 11630 -14300 11660 -14100
+rect 11860 -14300 11890 -14100
+rect 11630 -14330 11890 -14300
+rect -3380 -14360 -3120 -14330
+rect 11630 -15130 11890 -15100
+rect -3380 -15160 -3120 -15130
+rect -3380 -15360 -3350 -15160
+rect -3150 -15360 -3120 -15160
+rect 11630 -15330 11660 -15130
+rect 11860 -15330 11890 -15130
+rect 11630 -15360 11890 -15330
+rect -3380 -15390 -3120 -15360
+rect 11630 -16160 11890 -16130
+rect -3380 -16190 -3120 -16160
+rect -3380 -16390 -3350 -16190
+rect -3150 -16390 -3120 -16190
+rect 11630 -16360 11660 -16160
+rect 11860 -16360 11890 -16160
+rect 11630 -16390 11890 -16360
+rect -3380 -16420 -3120 -16390
+rect 11630 -17190 11890 -17160
+rect -3380 -17220 -3120 -17190
+rect -3380 -17420 -3350 -17220
+rect -3150 -17420 -3120 -17220
+rect 11630 -17390 11660 -17190
+rect 11860 -17390 11890 -17190
+rect 11630 -17420 11890 -17390
+rect -3380 -17450 -3120 -17420
+rect 11630 -18220 11890 -18190
+rect -3380 -18250 -3120 -18220
+rect -3380 -18450 -3350 -18250
+rect -3150 -18450 -3120 -18250
+rect 11630 -18420 11660 -18220
+rect 11860 -18420 11890 -18220
+rect 11630 -18450 11890 -18420
+rect -3380 -18480 -3120 -18450
+rect 11630 -19250 11890 -19220
+rect -3380 -19280 -3120 -19250
+rect -3380 -19480 -3350 -19280
+rect -3150 -19480 -3120 -19280
+rect 11630 -19450 11660 -19250
+rect 11860 -19450 11890 -19250
+rect 11630 -19480 11890 -19450
+rect -3380 -19510 -3120 -19480
+rect -3380 -20430 -3120 -20400
+rect -3380 -20630 -3350 -20430
+rect -3150 -20630 -3120 -20430
+rect -3380 -20660 -3120 -20630
+rect -2480 -20430 -2220 -20400
+rect -2480 -20630 -2450 -20430
+rect -2250 -20630 -2220 -20430
+rect -2480 -20660 -2220 -20630
+rect -1450 -20430 -1190 -20400
+rect -1450 -20630 -1420 -20430
+rect -1220 -20630 -1190 -20430
+rect -1450 -20660 -1190 -20630
+rect -420 -20430 -160 -20400
+rect -420 -20630 -390 -20430
+rect -190 -20630 -160 -20430
+rect -420 -20660 -160 -20630
+rect 610 -20430 870 -20400
+rect 610 -20630 640 -20430
+rect 840 -20630 870 -20430
+rect 610 -20660 870 -20630
+rect 1640 -20430 1900 -20400
+rect 1640 -20630 1670 -20430
+rect 1870 -20630 1900 -20430
+rect 1640 -20660 1900 -20630
+rect 2670 -20430 2930 -20400
+rect 2670 -20630 2700 -20430
+rect 2900 -20630 2930 -20430
+rect 2670 -20660 2930 -20630
+rect 3700 -20430 3960 -20400
+rect 3700 -20630 3730 -20430
+rect 3930 -20630 3960 -20430
+rect 3700 -20660 3960 -20630
+rect 4730 -20430 4990 -20400
+rect 4730 -20630 4760 -20430
+rect 4960 -20630 4990 -20430
+rect 4730 -20660 4990 -20630
+rect 5760 -20430 6020 -20400
+rect 5760 -20630 5790 -20430
+rect 5990 -20630 6020 -20430
+rect 5760 -20660 6020 -20630
+rect 6790 -20430 7050 -20400
+rect 6790 -20630 6820 -20430
+rect 7020 -20630 7050 -20430
+rect 6790 -20660 7050 -20630
+rect 7820 -20430 8080 -20400
+rect 7820 -20630 7850 -20430
+rect 8050 -20630 8080 -20430
+rect 7820 -20660 8080 -20630
+rect 8850 -20430 9110 -20400
+rect 8850 -20630 8880 -20430
+rect 9080 -20630 9110 -20430
+rect 8850 -20660 9110 -20630
+rect 9880 -20430 10140 -20400
+rect 9880 -20630 9910 -20430
+rect 10110 -20630 10140 -20430
+rect 9880 -20660 10140 -20630
+rect 10910 -20430 11170 -20400
+rect 10910 -20630 10940 -20430
+rect 11140 -20630 11170 -20430
+rect 10910 -20660 11170 -20630
+rect 11630 -20430 11890 -20400
+rect 11630 -20630 11660 -20430
+rect 11860 -20630 11890 -20430
+rect 11630 -20660 11890 -20630
+<< psubdiffcont >>
+rect -3350 330 -3150 530
+rect -2450 330 -2250 530
+rect -1420 330 -1220 530
+rect -390 330 -190 530
+rect 640 330 840 530
+rect 1670 330 1870 530
+rect 2700 330 2900 530
+rect 3730 330 3930 530
+rect 4760 330 4960 530
+rect 5790 330 5990 530
+rect 6820 330 7020 530
+rect 7850 330 8050 530
+rect 8880 330 9080 530
+rect 9910 330 10110 530
+rect 10940 330 11140 530
+rect 11660 330 11860 530
+rect -3350 -940 -3150 -740
+rect 11660 -910 11860 -710
+rect -3350 -1970 -3150 -1770
+rect 11660 -1940 11860 -1740
+rect -3350 -3000 -3150 -2800
+rect -3350 -4030 -3150 -3830
+rect -3350 -5060 -3150 -4860
+rect 11660 -2970 11860 -2770
+rect 11660 -4000 11860 -3800
+rect 11660 -5030 11860 -4830
+rect -3350 -6090 -3150 -5890
+rect 11660 -6060 11860 -5860
+rect -3350 -7120 -3150 -6920
+rect 11660 -7090 11860 -6890
+rect -3350 -8150 -3150 -7950
+rect 11660 -8120 11860 -7920
+rect -3350 -9180 -3150 -8980
+rect 11660 -9150 11860 -8950
+rect -3350 -10210 -3150 -10010
+rect 11660 -10180 11860 -9980
+rect -3350 -11240 -3150 -11040
+rect 11660 -11210 11860 -11010
+rect -3350 -12270 -3150 -12070
+rect 11660 -12240 11860 -12040
+rect -3350 -13300 -3150 -13100
+rect 11660 -13270 11860 -13070
+rect -3350 -14330 -3150 -14130
+rect 11660 -14300 11860 -14100
+rect -3350 -15360 -3150 -15160
+rect 11660 -15330 11860 -15130
+rect -3350 -16390 -3150 -16190
+rect 11660 -16360 11860 -16160
+rect -3350 -17420 -3150 -17220
+rect 11660 -17390 11860 -17190
+rect -3350 -18450 -3150 -18250
+rect 11660 -18420 11860 -18220
+rect -3350 -19480 -3150 -19280
+rect 11660 -19450 11860 -19250
+rect -3350 -20630 -3150 -20430
+rect -2450 -20630 -2250 -20430
+rect -1420 -20630 -1220 -20430
+rect -390 -20630 -190 -20430
+rect 640 -20630 840 -20430
+rect 1670 -20630 1870 -20430
+rect 2700 -20630 2900 -20430
+rect 3730 -20630 3930 -20430
+rect 4760 -20630 4960 -20430
+rect 5790 -20630 5990 -20430
+rect 6820 -20630 7020 -20430
+rect 7850 -20630 8050 -20430
+rect 8880 -20630 9080 -20430
+rect 9910 -20630 10110 -20430
+rect 10940 -20630 11140 -20430
+rect 11660 -20630 11860 -20430
+<< xpolycontact >>
+rect 3976 -2998 4046 -2566
+rect 3976 -5230 4046 -4798
+rect 4294 -2998 4364 -2566
+rect 4294 -5230 4364 -4798
+<< xpolyres >>
+rect 3976 -4798 4046 -2998
+rect 4294 -4798 4364 -2998
 << locali >>
-rect 2090 6970 2460 7390
-use sky130_fd_pr__res_xhigh_po_0p35_6YXUWP  sky130_fd_pr__res_xhigh_po_0p35_6YXUWP_0
-timestamp 1640749174
-transform 1 0 2117 0 1 5962
-box -37 -1432 37 1432
-use sky130_fd_pr__res_xhigh_po_0p35_6YXUWP  sky130_fd_pr__res_xhigh_po_0p35_6YXUWP_1
-timestamp 1640749174
-transform 1 0 2437 0 1 5962
-box -37 -1432 37 1432
-use sky130_fd_pr__cap_mim_m3_1_C2TDQN  sky130_fd_pr__cap_mim_m3_1_C2TDQN_0
-timestamp 1640749174
-transform 1 0 2440 0 1 -153340
-box -3150 -157500 3149 157500
+rect -3600 530 12130 780
+rect -3600 330 -3350 530
+rect -3150 330 -2450 530
+rect -2250 330 -1420 530
+rect -1220 330 -390 530
+rect -190 330 640 530
+rect 840 330 1670 530
+rect 1870 330 2700 530
+rect 2900 330 3730 530
+rect 3930 330 4760 530
+rect 4960 330 5790 530
+rect 5990 330 6820 530
+rect 7020 330 7850 530
+rect 8050 330 8880 530
+rect 9080 330 9910 530
+rect 10110 330 10940 530
+rect 11140 330 11660 530
+rect 11860 330 12130 530
+rect -3600 60 12130 330
+rect -3600 -740 -2880 60
+rect -3600 -940 -3350 -740
+rect -3150 -940 -2880 -740
+rect -3600 -1770 -2880 -940
+rect -3600 -1970 -3350 -1770
+rect -3150 -1970 -2880 -1770
+rect -3600 -2800 -2880 -1970
+rect 11410 -710 12130 60
+rect 11410 -910 11660 -710
+rect 11860 -910 12130 -710
+rect 11410 -1740 12130 -910
+rect 11410 -1940 11660 -1740
+rect 11860 -1940 12130 -1740
+rect 4100 -2180 4430 -2160
+rect 4100 -2380 4210 -2180
+rect 4410 -2380 4430 -2180
+rect 4100 -2400 4430 -2380
+rect -3600 -3000 -3350 -2800
+rect -3150 -3000 -2880 -2800
+rect 11410 -2770 12130 -1940
+rect 11410 -2970 11660 -2770
+rect 11860 -2970 12130 -2770
+rect -3600 -3830 -2880 -3000
+rect -3600 -4030 -3350 -3830
+rect -3150 -4030 -2880 -3830
+rect -3600 -4860 -2880 -4030
+rect 11410 -3800 12130 -2970
+rect 11410 -4000 11660 -3800
+rect 11860 -4000 12130 -3800
+rect -3600 -5060 -3350 -4860
+rect -3150 -5060 -2880 -4860
+rect -3600 -5890 -2880 -5060
+rect 11410 -4830 12130 -4000
+rect 11410 -5030 11660 -4830
+rect 11860 -5030 12130 -4830
+rect -3600 -6090 -3350 -5890
+rect -3150 -6090 -2880 -5890
+rect -3600 -6920 -2880 -6090
+rect -3600 -7120 -3350 -6920
+rect -3150 -7120 -2880 -6920
+rect -3600 -7950 -2880 -7120
+rect -3600 -8150 -3350 -7950
+rect -3150 -8150 -2880 -7950
+rect -3600 -8980 -2880 -8150
+rect -3600 -9180 -3350 -8980
+rect -3150 -9180 -2880 -8980
+rect -3600 -10010 -2880 -9180
+rect -3600 -10210 -3350 -10010
+rect -3150 -10210 -2880 -10010
+rect -3600 -11040 -2880 -10210
+rect -3600 -11240 -3350 -11040
+rect -3150 -11240 -2880 -11040
+rect -3600 -12070 -2880 -11240
+rect -3600 -12270 -3350 -12070
+rect -3150 -12270 -2880 -12070
+rect -3600 -13100 -2880 -12270
+rect -3600 -13300 -3350 -13100
+rect -3150 -13300 -2880 -13100
+rect -3600 -14130 -2880 -13300
+rect -3600 -14330 -3350 -14130
+rect -3150 -14330 -2880 -14130
+rect -3600 -15160 -2880 -14330
+rect -3600 -15360 -3350 -15160
+rect -3150 -15360 -2880 -15160
+rect -3600 -16190 -2880 -15360
+rect -3600 -16390 -3350 -16190
+rect -3150 -16390 -2880 -16190
+rect -3600 -17220 -2880 -16390
+rect -3600 -17420 -3350 -17220
+rect -3150 -17420 -2880 -17220
+rect -3600 -18250 -2880 -17420
+rect -3600 -18450 -3350 -18250
+rect -3150 -18450 -2880 -18250
+rect -3600 -19280 -2880 -18450
+rect -3600 -19480 -3350 -19280
+rect -3150 -19480 -2880 -19280
+rect -3600 -20180 -2880 -19480
+rect 11410 -5860 12130 -5030
+rect 11410 -6060 11660 -5860
+rect 11860 -6060 12130 -5860
+rect 11410 -6890 12130 -6060
+rect 11410 -7090 11660 -6890
+rect 11860 -7090 12130 -6890
+rect 11410 -7920 12130 -7090
+rect 11410 -8120 11660 -7920
+rect 11860 -8120 12130 -7920
+rect 11410 -8950 12130 -8120
+rect 11410 -9150 11660 -8950
+rect 11860 -9150 12130 -8950
+rect 11410 -9980 12130 -9150
+rect 11410 -10180 11660 -9980
+rect 11860 -10180 12130 -9980
+rect 11410 -11010 12130 -10180
+rect 11410 -11210 11660 -11010
+rect 11860 -11210 12130 -11010
+rect 11410 -12040 12130 -11210
+rect 11410 -12240 11660 -12040
+rect 11860 -12240 12130 -12040
+rect 11410 -13070 12130 -12240
+rect 11410 -13270 11660 -13070
+rect 11860 -13270 12130 -13070
+rect 11410 -14100 12130 -13270
+rect 11410 -14300 11660 -14100
+rect 11860 -14300 12130 -14100
+rect 11410 -15130 12130 -14300
+rect 11410 -15330 11660 -15130
+rect 11860 -15330 12130 -15130
+rect 11410 -16160 12130 -15330
+rect 11410 -16360 11660 -16160
+rect 11860 -16360 12130 -16160
+rect 11410 -17190 12130 -16360
+rect 11410 -17390 11660 -17190
+rect 11860 -17390 12130 -17190
+rect 11410 -18220 12130 -17390
+rect 11410 -18420 11660 -18220
+rect 11860 -18420 12130 -18220
+rect 11410 -19250 12130 -18420
+rect 11410 -19450 11660 -19250
+rect 11860 -19450 12130 -19250
+rect 11410 -20180 12130 -19450
+rect -3600 -20430 12130 -20180
+rect -3600 -20630 -3350 -20430
+rect -3150 -20630 -2450 -20430
+rect -2250 -20630 -1420 -20430
+rect -1220 -20630 -390 -20430
+rect -190 -20630 640 -20430
+rect 840 -20630 1670 -20430
+rect 1870 -20630 2700 -20430
+rect 2900 -20630 3730 -20430
+rect 3930 -20630 4760 -20430
+rect 4960 -20630 5790 -20430
+rect 5990 -20630 6820 -20430
+rect 7020 -20630 7850 -20430
+rect 8050 -20630 8880 -20430
+rect 9080 -20630 9910 -20430
+rect 10110 -20630 10940 -20430
+rect 11140 -20630 11660 -20430
+rect 11860 -20630 12130 -20430
+rect -3600 -20900 12130 -20630
+<< viali >>
+rect 4210 -2380 4410 -2180
+rect 3992 -2981 4030 -2584
+rect 4310 -2981 4348 -2584
+rect 3992 -5212 4030 -4815
+rect 4310 -5212 4348 -4815
+rect 4450 -5110 4610 -4950
+rect 3730 -20630 3930 -20430
+<< metal1 >>
+rect 4180 -2180 4650 -2150
+rect 4180 -2380 4210 -2180
+rect 4410 -2380 4650 -2180
+rect 4180 -2410 4650 -2380
+rect 3986 -2580 4036 -2572
+rect 4304 -2580 4354 -2572
+rect 3986 -2584 4354 -2580
+rect 3986 -2981 3992 -2584
+rect 4030 -2981 4310 -2584
+rect 4348 -2981 4354 -2584
+rect 3986 -2990 4354 -2981
+rect 3986 -2993 4036 -2990
+rect 4304 -2993 4354 -2990
+rect 3970 -4803 4000 -4800
+rect 3970 -4810 4036 -4803
+rect 3670 -4815 4036 -4810
+rect 3670 -4950 3992 -4815
+rect 3670 -5110 3710 -4950
+rect 3870 -5110 3992 -4950
+rect 3670 -5212 3992 -5110
+rect 4030 -5212 4036 -4815
+rect 3670 -5224 4036 -5212
+rect 4304 -4810 4354 -4803
+rect 4430 -4810 4650 -2410
+rect 4304 -4815 4650 -4810
+rect 4304 -5212 4310 -4815
+rect 4348 -4950 4650 -4815
+rect 4348 -5110 4450 -4950
+rect 4610 -5110 4650 -4950
+rect 4348 -5212 4650 -5110
+rect 4304 -5224 4650 -5212
+rect 3670 -5230 4000 -5224
+rect 4340 -5230 4650 -5224
+rect 3710 -20430 3950 -20410
+rect 3710 -20630 3730 -20430
+rect 3930 -20630 3950 -20430
+rect 3710 -20650 3950 -20630
+<< via1 >>
+rect 3710 -5110 3870 -4950
+rect 4450 -5110 4610 -4950
+rect 3730 -20630 3930 -20430
+<< metal2 >>
+rect 3690 -4950 3890 -4930
+rect 3690 -5110 3710 -4950
+rect 3870 -5110 3890 -4950
+rect 3690 -5130 3890 -5110
+rect 4430 -4950 4630 -4930
+rect 4430 -5110 4450 -4950
+rect 4610 -5110 4630 -4950
+rect 4430 -5130 4630 -5110
+rect 3710 -20430 3950 -20410
+rect 3710 -20630 3730 -20430
+rect 3930 -20630 3950 -20430
+rect 3710 -20650 3950 -20630
+<< via2 >>
+rect 3710 -5110 3870 -4950
+rect 4450 -5110 4610 -4950
+rect 3730 -20630 3930 -20430
+<< metal3 >>
+rect -2560 -6220 3600 -1030
+rect 4610 -4930 10830 -970
+rect 3690 -4950 3890 -4930
+rect 3690 -5110 3710 -4950
+rect 3870 -5110 3890 -4950
+rect 3690 -5130 3890 -5110
+rect 4430 -4950 10830 -4930
+rect 4430 -5110 4450 -4950
+rect 4610 -5110 10830 -4950
+rect 4430 -5130 10830 -5110
+rect 4610 -6220 10830 -5130
+rect -2560 -7270 10830 -6220
+rect -2560 -20010 10180 -7270
+rect 140 -20020 920 -20010
+rect 3710 -20410 3940 -20010
+rect 3710 -20430 3950 -20410
+rect 3710 -20630 3730 -20430
+rect 3930 -20630 3950 -20430
+rect 3710 -20650 3950 -20630
+<< via3 >>
+rect 3710 -5110 3870 -4950
+rect 4450 -5110 4610 -4950
+<< mimcap >>
+rect -2460 -1170 3540 -1130
+rect -2460 -7090 -2420 -1170
+rect 3500 -7090 3540 -1170
+rect -2460 -7130 3540 -7090
+rect 4770 -1170 10770 -1130
+rect 4770 -7090 4810 -1170
+rect 10730 -7090 10770 -1170
+rect 4770 -7130 10770 -7090
+rect 4120 -7380 10120 -7340
+rect -2460 -7560 3540 -7520
+rect -2460 -13480 -2420 -7560
+rect 3500 -13480 3540 -7560
+rect 4120 -13300 4160 -7380
+rect 10080 -13300 10120 -7380
+rect 4120 -13340 10120 -13300
+rect -2460 -13520 3540 -13480
+rect 4120 -13770 10120 -13730
+rect -2460 -13870 3540 -13830
+rect -2460 -19790 -2420 -13870
+rect 3500 -19790 3540 -13870
+rect 4120 -19690 4160 -13770
+rect 10080 -19690 10120 -13770
+rect 4120 -19730 10120 -19690
+rect -2460 -19830 3540 -19790
+<< mimcapcontact >>
+rect -2420 -7090 3500 -1170
+rect 4810 -7090 10730 -1170
+rect -2420 -13480 3500 -7560
+rect 4160 -13300 10080 -7380
+rect -2420 -19790 3500 -13870
+rect 4160 -19690 10080 -13770
+<< metal4 >>
+rect -2421 -1170 140 -1169
+rect 920 -1170 3501 -1169
+rect -2421 -7090 -2420 -1170
+rect 3500 -4810 3501 -1170
+rect 4809 -1170 7370 -1169
+rect 8150 -1170 10731 -1169
+rect 4809 -4810 4810 -1170
+rect 3500 -4930 3830 -4810
+rect 4490 -4930 4810 -4810
+rect 3500 -4950 3890 -4930
+rect 3500 -5110 3710 -4950
+rect 3870 -5110 3890 -4950
+rect 3500 -5130 3890 -5110
+rect 4430 -4950 4810 -4930
+rect 4430 -5110 4450 -4950
+rect 4610 -5110 4810 -4950
+rect 4430 -5130 4810 -5110
+rect 3500 -5230 3830 -5130
+rect 4490 -5230 4810 -5130
+rect 3500 -7090 3501 -5230
+rect -2421 -7091 3501 -7090
+rect 4809 -7090 4810 -5230
+rect 10730 -7090 10731 -1170
+rect 4809 -7091 7370 -7090
+rect 8150 -7091 10731 -7090
+rect 140 -7559 920 -7091
+rect 4159 -7380 6720 -7379
+rect 7500 -7380 10081 -7379
+rect -2421 -7560 3501 -7559
+rect -2421 -13480 -2420 -7560
+rect 3500 -13480 3501 -7560
+rect 4159 -13300 4160 -7380
+rect 10080 -13300 10081 -7380
+rect 4159 -13301 10081 -13300
+rect -2421 -13481 3501 -13480
+rect 140 -13869 920 -13481
+rect 6720 -13769 7500 -13301
+rect 4159 -13770 10081 -13769
+rect -2421 -13870 3501 -13869
+rect -2421 -19790 -2420 -13870
+rect 3500 -16470 3501 -13870
+rect 4159 -16470 4160 -13770
+rect 3500 -17340 4160 -16470
+rect 3500 -19790 3501 -17340
+rect 4159 -19690 4160 -17340
+rect 10080 -19690 10081 -13770
+rect 4159 -19691 6720 -19690
+rect 7510 -19691 10081 -19690
+rect -2421 -19791 140 -19790
+rect 920 -19791 3501 -19790
+<< labels >>
+rlabel locali 4310 -20570 4310 -20570 1 gnd
+rlabel locali 4310 -20570 4310 -20570 1 gnd!
+rlabel locali 4130 -2280 4130 -2280 1 v
 << end >>

diff --git a/mag/nand.ext b/mag/nand.ext
index d94811b..58cede1 100644
--- a/mag/nand.ext
+++ b/mag/nand.ext

@@ -1,4 +1,4 @@
-timestamp 1640608660
+timestamp 1640957762
 version 8.3
 tech sky130A
 style ngspice()
@@ -6,38 +6,31 @@
 resistclasses 4400000 2200000 1700000 3050000 120000 197000 114000 191000 120000 197000 114000 191000 48200 319800 2000000 48200 48200 12200 125 125 47 47 29 5
 parameters sky130_fd_pr__nfet_01v8 l=l w=w a1=as p1=ps a2=ad p2=pd
 parameters sky130_fd_pr__pfet_01v8 l=l w=w a1=as p1=ps a2=ad p2=pd
-node "gnd!" 12 132.192 480 -540 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 12100 440 0 0 0 0 0 0 0 0 0 0 0 0
-node "vdd!" 12 88 490 170 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6400 320 0 0 0 0 0 0 0 0 0 0 0 0
 node "z1" 1013 195.275 90 -450 ndif 0 0 0 0 0 0 0 0 32000 1120 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 31000 1100 0 0 0 0 0 0 0 0 0 0 0 0
-node "GND" 372 610.215 -20 -450 ndif 0 0 0 0 0 0 0 0 16000 560 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 21000 820 5600 300 6400 320 10000 400 39400 1380 0 0 0 0
+node "gnd!" 372 610.215 -20 -450 ndif 0 0 0 0 0 0 0 0 16000 560 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 21000 820 5600 300 6400 320 10000 400 39400 1380 0 0 0 0
 node "OUT" 3155 852.152 90 20 pdif 0 0 0 0 0 0 0 0 16000 560 64000 1920 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 110000 4040 0 0 0 0 0 0 0 0 0 0 0 0
-node "a_n20_20#" 2663 1075.5 -20 20 pdif 0 0 0 0 0 0 0 0 0 0 64000 1920 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 65600 2360 11200 600 12800 640 20000 800 47800 1580 0 0 0 0
+node "vdd!" 2663 1094 -20 20 pdif 0 0 0 0 0 0 0 0 0 0 64000 1920 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 65600 2360 11200 600 12800 640 20000 800 84800 1680 0 0 0 0
 node "a_280_n230#" 1523 573.545 280 -230 p 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 32500 2060 0 0 9600 480 19000 1160 0 0 0 0 0 0 0 0 0 0
 node "A" 1521 380.56 30 -230 p 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 32500 2060 0 0 9600 480 0 0 0 0 0 0 0 0 0 0 0 0
-node "VDD" 2047 1224 -80 -20 nw 0 0 0 0 408000 2560 0 0 3600 240 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-substrate "a_490_n530#" 0 0 490 -530 ppd 0 0 0 0 0 0 0 0 0 0 8100 360 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-cap "z1" "gnd!" 5.7957
-cap "OUT" "gnd!" 26.819
-cap "GND" "z1" 159.5
-cap "OUT" "vdd!" 59.1643
-cap "a_n20_20#" "vdd!" 13.8947
+node "VDD" 1727 1248 -80 -20 nw 0 0 0 0 416000 2580 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+substrate "VSUBS" 0 0 -1073741817 -1073741817 space 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+cap "gnd!" "z1" 159.5
 cap "OUT" "z1" 210.754
-cap "OUT" "GND" 22
-cap "a_n20_20#" "z1" 8.55556
+cap "OUT" "gnd!" 22
+cap "vdd!" "z1" 8.55556
 cap "a_280_n230#" "z1" 70.125
-cap "a_n20_20#" "GND" 8.55556
-cap "a_n20_20#" "OUT" 838.2
-cap "a_280_n230#" "OUT" 150.608
-cap "a_280_n230#" "a_n20_20#" 13.0842
+cap "vdd!" "gnd!" 8.55556
 cap "A" "z1" 8.25
-cap "VDD" "vdd!" 5.92
-cap "A" "GND" 57.75
+cap "A" "gnd!" 57.75
+cap "vdd!" "OUT" 838.2
+cap "a_280_n230#" "OUT" 150.608
+cap "a_280_n230#" "vdd!" 13.0842
 cap "A" "OUT" 9.74286
-cap "A" "a_n20_20#" 13.0842
+cap "A" "vdd!" 13.0842
 cap "VDD" "OUT" 2.96
-cap "VDD" "a_n20_20#" 21.8
+cap "VDD" "vdd!" 29.2
 cap "A" "a_280_n230#" 81.6947
-device msubckt sky130_fd_pr__nfet_01v8 310 -450 311 -449 l=30 w=200 "a_490_n530#" "a_280_n230#" 60 0 "z1" 200 0 "OUT" 200 0
-device msubckt sky130_fd_pr__nfet_01v8 60 -450 61 -449 l=30 w=200 "a_490_n530#" "A" 60 0 "GND" 200 0 "z1" 200 0
-device msubckt sky130_fd_pr__pfet_01v8 310 20 311 21 l=30 w=400 "VDD" "a_280_n230#" 60 0 "a_n20_20#" 400 0 "OUT" 400 0
-device msubckt sky130_fd_pr__pfet_01v8 60 20 61 21 l=30 w=400 "VDD" "A" 60 0 "a_n20_20#" 400 0 "OUT" 400 0
+device msubckt sky130_fd_pr__nfet_01v8 310 -450 311 -449 l=30 w=200 "VSUBS" "a_280_n230#" 60 0 "z1" 200 0 "OUT" 200 0
+device msubckt sky130_fd_pr__nfet_01v8 60 -450 61 -449 l=30 w=200 "VSUBS" "A" 60 0 "gnd!" 200 0 "z1" 200 0
+device msubckt sky130_fd_pr__pfet_01v8 310 20 311 21 l=30 w=400 "VDD" "a_280_n230#" 60 0 "vdd!" 400 0 "OUT" 400 0
+device msubckt sky130_fd_pr__pfet_01v8 60 20 61 21 l=30 w=400 "VDD" "A" 60 0 "vdd!" 400 0 "OUT" 400 0

diff --git a/mag/nand.mag b/mag/nand.mag
index d65cd76..d85268a 100644
--- a/mag/nand.mag
+++ b/mag/nand.mag

@@ -1,8 +1,8 @@
 magic
 tech sky130A
-timestamp 1640608660
+timestamp 1640957032
 << nwell >>
-rect -40 -10 300 290
+rect -40 -10 280 315
 << nmos >>
 rect 30 -225 45 -125
 rect 155 -225 170 -125
@@ -117,10 +117,6 @@
 rect 180 110 205 135
 rect 180 65 205 90
 rect 180 20 205 45
-<< psubdiff >>
-rect 245 -265 290 -220
-<< nsubdiff >>
-rect 250 90 280 120
 << poly >>
 rect 30 210 45 230
 rect 155 210 170 230
@@ -192,7 +188,6 @@
 rect 175 90 210 110
 rect 175 65 180 90
 rect 205 65 210 90
-rect 245 85 285 125
 rect 175 45 210 65
 rect 175 20 180 45
 rect 205 20 210 45
@@ -236,7 +231,6 @@
 rect 205 -215 210 -190
 rect 175 -225 210 -215
 rect -5 -275 20 -225
-rect 240 -270 295 -215
 rect 15 -295 20 -275
 << viali >>
 rect -5 250 15 270
@@ -318,15 +312,15 @@
 rect 20 -300 25 -270
 rect -15 -305 25 -300
 << metal4 >>
-rect -40 280 275 290
-rect -40 260 -10 280
-rect -20 245 -10 260
-rect 25 260 115 280
-rect 25 245 30 260
+rect -40 280 280 315
+rect -40 255 -10 280
+rect -20 245 -10 255
+rect 25 255 115 280
+rect 25 245 30 255
 rect -20 235 30 245
-rect 105 245 115 260
-rect 150 260 275 280
-rect 150 245 155 260
+rect 105 245 115 255
+rect 150 255 280 280
+rect 150 245 155 255
 rect 105 235 155 245
 rect -20 -265 30 -260
 rect -20 -305 -15 -265
@@ -337,9 +331,9 @@
 rlabel locali 60 -40 250 -15 1 OUT
 rlabel space 100 -105 170 -85 1 B
 rlabel locali -25 -105 45 -85 1 A
-rlabel locali 265 100 265 100 1 vdd!
-rlabel locali 265 -245 265 -245 1 gnd!
 rlabel nwell -40 260 275 290 1 VDD
 rlabel metal4 -20 -310 275 -280 1 GND
 rlabel locali 55 -170 145 -145 1 z1
+rlabel locali 130 222 130 222 1 vdd!
+rlabel locali 6 -251 6 -251 1 gnd!
 << end >>

diff --git a/mag/nor.ext b/mag/nor.ext
index 826420b..0add68f 100644
--- a/mag/nor.ext
+++ b/mag/nor.ext

@@ -1,4 +1,4 @@
-timestamp 1640700690
+timestamp 1640957762
 version 8.3
 tech sky130A
 style ngspice()
@@ -6,37 +6,31 @@
 resistclasses 4400000 2200000 1700000 3050000 120000 197000 114000 191000 120000 197000 114000 191000 48200 319800 2000000 48200 48200 12200 125 125 47 47 29 5
 parameters sky130_fd_pr__nfet_01v8 l=l w=w a1=as p1=ps a2=ad p2=pd
 parameters sky130_fd_pr__pfet_01v8 l=l w=w a1=as p1=ps a2=ad p2=pd
-node "gnd!" 12 145.32 460 -430 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14400 480 0 0 0 0 0 0 0 0 0 0 0 0
-node "vdd!" 12 132 180 1070 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14400 480 0 0 0 0 0 0 0 0 0 0 0 0
-node "GND" 1098 1030.73 -40 -420 ndif 0 0 0 0 0 0 0 0 32000 1120 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 43000 1680 12800 640 20000 800 20000 800 44000 1480 0 0 0 0
+node "gnd!" 1098 1030.73 -40 -420 ndif 0 0 0 0 0 0 0 0 32000 1120 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 43000 1680 12800 640 20000 800 20000 800 44000 1480 0 0 0 0
 node "Out" 3538 770.477 70 -420 ndif 0 0 0 0 0 0 0 0 32000 1120 72000 1960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 119000 4080 0 0 0 0 0 0 0 0 0 0 0 0
 node "Z1" 5188 577.5 70 20 pdif 0 0 0 0 0 0 0 0 0 0 144000 3920 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129000 3900 0 0 0 0 0 0 0 0 0 0 0 0
-node "a_n40_20#" 2400 795.1 -40 20 pdif 0 0 0 0 0 0 0 0 0 0 72000 1960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68500 2160 6400 320 10000 400 10000 400 40000 1400 0 0 0 0
+node "vdd!" 2400 795.1 -40 20 pdif 0 0 0 0 0 0 0 0 0 0 72000 1960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68500 2160 6400 320 10000 400 10000 400 40000 1400 0 0 0 0
 node "B" 2203 502.86 210 -100 p 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48700 3040 0 0 6400 320 19800 1160 0 0 0 0 0 0 0 0 0 0
 node "A" 2231 379.695 -40 -100 p 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48700 3040 0 0 9200 460 0 0 0 0 0 0 0 0 0 0 0 0
-node "VDD" 3662 2250 -110 -30 nw 0 0 0 0 750000 3700 0 0 10000 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-substrate "a_460_n430#" 0 0 460 -430 ppd 0 0 0 0 0 0 0 0 0 0 14400 480 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-cap "GND" "gnd!" 21.9035
-cap "Out" "gnd!" 79.8251
-cap "Out" "GND" 453.75
-cap "Z1" "vdd!" 15.4
-cap "Z1" "GND" 9.625
+node "VDD" 3542 2250 -110 -30 nw 0 0 0 0 750000 3700 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+substrate "VSUBS" 0 0 -1073741817 -1073741817 space 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+cap "Out" "gnd!" 453.75
+cap "Z1" "gnd!" 9.625
 cap "Z1" "Out" 779.396
-cap "a_n40_20#" "GND" 9.625
-cap "B" "GND" 39.7045
-cap "a_n40_20#" "Out" 99
-cap "a_n40_20#" "Z1" 749.833
+cap "vdd!" "gnd!" 9.625
+cap "B" "gnd!" 39.7045
+cap "vdd!" "Out" 99
+cap "A" "gnd!" 19.25
+cap "vdd!" "Z1" 749.833
 cap "B" "Out" 246.8
-cap "B" "Z1" 57.75
-cap "A" "GND" 19.25
-cap "VDD" "vdd!" 13.32
 cap "A" "Out" 8.8
+cap "B" "Z1" 57.75
 cap "VDD" "Out" 2.3125
-cap "A" "a_n40_20#" 57.75
+cap "A" "vdd!" 57.75
 cap "VDD" "Z1" 2.775
-cap "VDD" "a_n40_20#" 16.2425
+cap "VDD" "vdd!" 16.2425
 cap "A" "B" 72.9302
-device msubckt sky130_fd_pr__nfet_01v8 290 -420 291 -419 l=30 w=200 "a_460_n430#" "B" 60 0 "GND" 200 0 "Out" 200 0
-device msubckt sky130_fd_pr__nfet_01v8 40 -420 41 -419 l=30 w=200 "a_460_n430#" "A" 60 0 "GND" 200 0 "Out" 200 0
+device msubckt sky130_fd_pr__nfet_01v8 290 -420 291 -419 l=30 w=200 "VSUBS" "B" 60 0 "gnd!" 200 0 "Out" 200 0
+device msubckt sky130_fd_pr__nfet_01v8 40 -420 41 -419 l=30 w=200 "VSUBS" "A" 60 0 "gnd!" 200 0 "Out" 200 0
 device msubckt sky130_fd_pr__pfet_01v8 290 20 291 21 l=30 w=900 "VDD" "B" 60 0 "Z1" 900 0 "Out" 900 0
-device msubckt sky130_fd_pr__pfet_01v8 40 20 41 21 l=30 w=900 "VDD" "A" 60 0 "a_n40_20#" 900 0 "Z1" 900 0
+device msubckt sky130_fd_pr__pfet_01v8 40 20 41 21 l=30 w=900 "VDD" "A" 60 0 "vdd!" 900 0 "Z1" 900 0

diff --git a/mag/nor.mag b/mag/nor.mag
index 1719701..3f22872 100644
--- a/mag/nor.mag
+++ b/mag/nor.mag

@@ -1,6 +1,6 @@
 magic
 tech sky130A
-timestamp 1640700690
+timestamp 1640957264
 << nwell >>
 rect -55 -15 245 610
 << nmos >>
@@ -213,10 +213,6 @@
 rect 170 110 195 135
 rect 170 65 195 90
 rect 170 20 195 45
-<< psubdiff >>
-rect 230 -215 290 -155
-<< nsubdiff >>
-rect 95 540 145 590
 << poly >>
 rect 20 460 35 480
 rect 145 460 160 480
@@ -238,7 +234,6 @@
 rect -10 -40 10 -20
 rect 115 -40 135 -20
 << locali >>
-rect 90 535 150 595
 rect 5 495 10 515
 rect -15 460 10 495
 rect -20 450 15 460
@@ -407,7 +402,6 @@
 rect -15 -265 10 -210
 rect 5 -285 10 -265
 rect 110 -265 135 -210
-rect 230 -215 290 -155
 rect 130 -285 135 -265
 << viali >>
 rect -15 495 5 515
@@ -518,12 +512,12 @@
 rect 140 -295 145 -290
 rect 95 -300 145 -295
 << labels >>
-rlabel locali 110 565 110 565 1 vdd!
-rlabel locali 265 -185 265 -185 1 gnd!
 rlabel metal4 -55 -290 245 -260 1 GND
 rlabel nwell -55 495 245 525 1 VDD
 rlabel locali 75 200 105 225 1 Z1
 rlabel locali 170 -90 245 -70 1 Out
 rlabel locali -55 -40 10 -20 1 A
 rlabel metal1 -55 -90 10 -75 1 B
+rlabel locali -6 467 -6 467 1 vdd!
+rlabel locali 118 -234 118 -234 1 gnd!
 << end >>

diff --git a/mag/pd.ext b/mag/pd.ext
index ac2b6aa..d4e0f1a 100644
--- a/mag/pd.ext
+++ b/mag/pd.ext

@@ -1,4 +1,4 @@
-timestamp 1640777101
+timestamp 1640958486
 version 8.3
 tech sky130A
 style ngspice()
@@ -7,108 +7,140 @@
 use tspc_r tspc_r_0 1 0 290 0 1 760
 use tspc_r tspc_r_1 1 0 290 0 -1 -850
 use and_pd and_pd_0 1 0 2200 0 1 790
-node "GND" 1 835.41 20 -130 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 343400 4380 0 0 0 0
+node "GND" 1 842.66 20 -130 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 343400 4380 0 0 0 0
+node "m4_1440_1280#" 0 173.9 1440 1280 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 24600 940 0 0 0 0
 node "DIV" 1 109.532 -230 -910 m2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6900 520 0 0 0 0 0 0 0 0
 node "REF" 1 109.532 -230 790 m2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6900 520 0 0 0 0 0 0 0 0
 node "UP" 2 244.23 2400 670 m1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16200 1140 0 0 0 0 0 0 0 0 0 0
 node "m1_2010_600#" 1 81.02 2010 600 m1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4800 380 0 0 0 0 0 0 0 0 0 0
-node "R" 26 1552.78 2870 560 v0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1600 160 6400 320 114700 7100 0 0 0 0 0 0 0 0
+node "R" 26 1557.5 2870 560 v0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1600 160 6400 320 114700 7100 0 0 0 0 0 0 0 0
 node "DOWN" 22 1071.98 2160 560 v0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1600 160 73300 4780 0 0 0 0 0 0 0 0 0 0
-node "VDD" 76 1878.87 60 -770 v0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3200 320 12800 640 16400 720 20000 800 213800 7140 0 0 0 0
-node "VDD" 22177 1894.2 0 1160 nw 0 0 0 0 631400 6180 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-substrate "VSUBS" 0 0 -1073741817 -1073741817 space 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+node "VDD" 76 1895.43 60 -770 v0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3200 320 12800 640 16400 720 20000 800 213800 7140 0 0 0 0
+node "w_0_n1460#" 18910 2199.75 0 -1460 nw 0 0 0 0 662500 5900 0 0 19600 560 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14400 480 14400 480 14400 480 14400 480 45800 1300 0 0 0 0
+node "VDD" 27087 2548.65 0 1160 nw 0 0 0 0 793200 7540 0 0 19600 560 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14400 480 14400 480 14400 480 14400 480 37400 1040 0 0 0 0
+substrate "a_n420_n1430#" 0 0 -420 -1430 ppd 0 0 0 0 0 0 0 0 0 0 486400 12160 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2463100 27820 0 0 0 0 0 0 0 0 0 0 0 0
 cap "R" "GND" 53.75
 cap "DOWN" "GND" 50.15
 cap "VDD" "GND" 113.9
-cap "m1_2010_600#" "UP" 4.5
 cap "VDD" "DIV" 27.9
+cap "VDD" "m4_1440_1280#" 4.92
+cap "m1_2010_600#" "UP" 4.5
 cap "R" "UP" 72
-cap "VDD" "REF" 27.9
 cap "DOWN" "UP" 101.25
 cap "DOWN" "m1_2010_600#" 41.625
+cap "VDD" "REF" 27.9
 cap "DOWN" "R" 185.417
+cap "VDD" "UP" 7.2
+cap "VDD" "R" 11.2838
+cap "w_0_n1460#" "VDD" 0.48
 cap "VDD" "VDD" 0.48
-cap "tspc_r_1/R" "tspc_r_1/Z3" 148.04
-cap "tspc_r_1/VDD" "tspc_r_1/Z3" 10.9091
-cap "tspc_r_0/z5" "tspc_r_1/z5" 4.86486
-cap "tspc_r_1/VDD" "tspc_r_1/clk" 62.5
-cap "tspc_r_1/VDD" "tspc_r_1/R" 100
+cap "tspc_r_0/GND" "tspc_r_1/Z3" 7.21875
 cap "tspc_r_1/VDD" "tspc_r_1/Z2" 72
-cap "tspc_r_0/Z4" "tspc_r_1/Z4" 9.72973
-cap "tspc_r_0/GND" "tspc_r_1/Z4" 6.66667
-cap "tspc_r_0/GND" "tspc_r_1/R" 80.745
-cap "tspc_r_0/GND" "tspc_r_1/VDD" 53.6
-cap "tspc_r_0/GND" "tspc_r_0/Z4" 6.66667
-cap "tspc_r_0/GND" "tspc_r_1/z5" 6.66667
-cap "tspc_r_0/GND" "tspc_r_1/Q" 38.8765
-cap "tspc_r_0/GND" "tspc_r_1/R" 9.25926
-cap "tspc_r_0/GND" "tspc_r_0/z5" 6.66667
-cap "tspc_r_0/z5" "tspc_r_1/z5" 4.86486
-cap "tspc_r_0/z5" "tspc_r_1/z5" 4.86486
-cap "tspc_r_0/Z4" "tspc_r_1/Z4" 9.72973
-cap "tspc_r_0/GND" "tspc_r_1/Z4" 6.66667
-cap "tspc_r_0/VDD" "tspc_r_0/Z3" 10.9091
-cap "tspc_r_0/GND" "tspc_r_0/Z4" 6.66667
-cap "tspc_r_0/R" "tspc_r_0/Z3" 155.78
-cap "tspc_r_0/GND" "tspc_r_0/VDD" 53.6
-cap "tspc_r_0/R" "tspc_r_0/clk" 103.99
+cap "tspc_r_1/R" "tspc_r_1/Z3" 11.355
+cap "tspc_r_1/VDD" "tspc_r_0/GND" 99.8267
+cap "tspc_r_1/VDD" "tspc_r_1/w_n290_n40#" 33.74
+cap "tspc_r_1/VDD" "tspc_r_1/Z3" 10.9091
+cap "tspc_r_1/VDD" "tspc_r_1/R" 100
+cap "tspc_r_1/VDD" "tspc_r_1/clk" 62.5
+cap "tspc_r_1/w_n290_n40#" "tspc_r_1/Z2" 12.775
+cap "tspc_r_0/GND" "tspc_r_1/Z2" 9.69375
+cap "tspc_r_0/GND" "tspc_r_1/Z1" 14.4375
+cap "tspc_r_1/VDD" "tspc_r_1/Qbar" 30.4615
+cap "a_n420_n1430#" "tspc_r_1/Qbar" 7.21875
+cap "a_n420_n1430#" "tspc_r_1/Q" 7.21875
+cap "tspc_r_1/R" "tspc_r_1/Z3" 126.785
+cap "a_n420_n1430#" "tspc_r_1/Qbar1" 7.21875
+cap "tspc_r_1/VDD" "tspc_r_1/Qbar1" 5.68434e-14
+cap "tspc_r_1/VDD" "a_n420_n1430#" 45.2812
+cap "tspc_r_0/Z3" "tspc_r_0/R" 13.31
 cap "tspc_r_0/VDD" "tspc_r_0/clk" 44.4444
-cap "tspc_r_0/R" "tspc_r_0/GND" 80.745
-cap "tspc_r_0/w_n290_n40#" "tspc_r_0/VDD" 41.43
-cap "tspc_r_0/R" "tspc_r_0/VDD" 66.6667
-cap "tspc_r_0/Z2" "tspc_r_0/VDD" 72
-cap "tspc_r_0/Z2" "tspc_r_0/w_n290_n40#" 12.775
-cap "tspc_r_0/GND" "tspc_r_0/z5" 6.66667
-cap "tspc_r_0/Qbar" "and_pd_0/Z1" 21.0517
-cap "and_pd_0/A" "and_pd_0/Z1" 193.89
-cap "tspc_r_0/R" "tspc_r_0/GND" 25.3883
-cap "tspc_r_0/z5" "tspc_r_1/z5" 4.86486
-cap "tspc_r_0/Qbar" "tspc_r_0/GND" 44.4044
+cap "tspc_r_0/GND" "tspc_r_0/VDD" 150.325
+cap "tspc_r_0/GND" "tspc_r_1/Z4" 13.3333
+cap "tspc_r_0/GND" "tspc_r_0/Z4" 13.3333
+cap "tspc_r_0/VDD" "tspc_r_0/R" 66.6667
+cap "tspc_r_0/Z4" "tspc_r_1/Z4" 19.4595
+cap "tspc_r_0/GND" "tspc_r_0/R" 64.2857
+cap "tspc_r_0/VDD" "tspc_r_0/Z2" 72
+cap "tspc_r_0/VDD" "tspc_r_0/Z3" 10.9091
+cap "tspc_r_0/GND" "tspc_r_1/z5" 13.3333
+cap "tspc_r_0/GND" "tspc_r_0/R" 145.652
+cap "and_pd_0/Z1" "tspc_r_0/Qbar" 21.0517
+cap "and_pd_0/Z1" "tspc_r_1/Q" 85
+cap "tspc_r_0/GND" "tspc_r_0/Qbar" 44.4044
+cap "tspc_r_0/GND" "tspc_r_0/VDD" 8.88178e-16
+cap "tspc_r_0/GND" "tspc_r_1/Q" 308.57
 cap "tspc_r_0/Qbar" "tspc_r_0/R" 31.025
-cap "tspc_r_0/VDD" "tspc_r_0/GND" 8.88178e-16
-cap "and_pd_0/A" "tspc_r_0/GND" 269.694
-cap "and_pd_0/Out1" "tspc_r_0/R" 27.725
-cap "tspc_r_0/VDD" "tspc_r_0/Qbar" 74.25
-cap "and_pd_0/Out1" "tspc_r_0/Qbar" 51.2286
-cap "and_pd_0/A" "tspc_r_0/R" 86.5
-cap "and_pd_0/A" "tspc_r_0/Qbar" 17.9186
-cap "tspc_r_0/Q" "tspc_r_0/R" 323.962
+cap "tspc_r_0/VDD" "tspc_r_0/Qbar" 68.0625
+cap "and_pd_0/Out1" "tspc_r_0/Qbar" 47.6929
+cap "tspc_r_1/Q" "tspc_r_0/R" 86.5
+cap "tspc_r_0/Q" "tspc_r_0/R" 150.845
+cap "tspc_r_1/Q" "tspc_r_0/Qbar" 17.9186
 cap "tspc_r_0/Qbar1" "tspc_r_0/R" 287.105
-cap "and_pd_0/A" "and_pd_0/Out1" 72.925
-cap "tspc_r_0/Z3" "tspc_r_0/R" 56.18
-cap "tspc_r_0/Q" "and_pd_0/Out1" 77.035
-cap "tspc_r_0/Q" "and_pd_0/A" 244.523
-cap "and_pd_0/VDD" "tspc_r_0/VDD" 30.4
-cap "tspc_r_0/GND" "tspc_r_1/z5" 6.66667
-cap "and_pd_0/Out1" "and_pd_0/Out" 11.685
-cap "and_pd_0/B" "and_pd_0/Out" 49.0118
-cap "and_pd_0/GND" "DOWN" 113.28
-cap "and_pd_0/Out" "DOWN" 90.78
-cap "and_pd_0/Out" "and_pd_0/GND" 16.129
-cap "and_pd_0/B" "and_pd_0/Out1" -216.377
-cap "and_pd_0/Out1" "DOWN" -179.782
-cap "VDD" "tspc_r_0/VDD" 5.88
-cap "and_pd_0/VDD" "tspc_r_0/VDD" 4.02
-merge "and_pd_0/VSUBS" "tspc_r_1/VSUBS" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-merge "tspc_r_1/VSUBS" "tspc_r_0/VSUBS"
-merge "tspc_r_0/VSUBS" "VSUBS"
-merge "and_pd_0/GND" "tspc_r_1/GND" -1779.31 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -112600 -9300 0 0 0 0
-merge "tspc_r_1/GND" "tspc_r_0/GND"
+cap "tspc_r_0/Z3" "tspc_r_0/R" 143.15
+cap "tspc_r_0/clk" "tspc_r_0/R" 103.99
+cap "tspc_r_0/Q" "and_pd_0/Out1" -14.35
+cap "tspc_r_0/Q" "tspc_r_1/Q" 183.938
+cap "tspc_r_0/GND" "tspc_r_0/z5" 13.3333
+cap "tspc_r_0/z5" "tspc_r_1/z5" 19.4595
+cap "tspc_r_0/GND" "a_n420_n1430#" 9.20833
+cap "and_pd_0/Out" "a_n420_n1430#" 72.7883
+cap "and_pd_0/Out" "tspc_r_0/VDD" 56.5714
+cap "tspc_r_1/Q" "and_pd_0/Out1" 105.892
+cap "tspc_r_0/Q" "and_pd_0/Out1" 70.6975
+cap "and_pd_0/Out1" "tspc_r_0/VDD" 12.375
+cap "tspc_r_1/Q" "tspc_r_0/Q" 58.428
+cap "and_pd_0/Out1" "a_n420_n1430#" 6.41667
+cap "tspc_r_0/Q" "tspc_r_0/VDD" 2.66454e-15
+cap "and_pd_0/Z1" "tspc_r_0/Qbar" 1.69231
+cap "and_pd_0/Z1" "tspc_r_1/Q" -23.46
+cap "and_pd_0/Z1" "a_n420_n1430#" 0.916667
+cap "and_pd_0/Out" "tspc_r_0/GND" 16.129
+cap "tspc_r_1/Q" "tspc_r_0/GND" 113.28
+cap "and_pd_0/Out1" "and_pd_0/Out" 137.14
+cap "tspc_r_0/Q" "and_pd_0/Out" 222.129
+cap "tspc_r_1/Q" "and_pd_0/Out" 90.78
+cap "tspc_r_0/w_n290_n40#" "tspc_r_0/Z2" 12.775
+cap "a_n420_n1430#" "tspc_r_0/Z2" 9.69375
+cap "a_n420_n1430#" "tspc_r_0/Z1" 14.4375
+cap "a_n420_n1430#" "tspc_r_0/VDD" 56.7013
+cap "tspc_r_0/w_n290_n40#" "tspc_r_0/VDD" 33.74
+cap "a_n420_n1430#" "tspc_r_0/Z3" 7.21875
+cap "tspc_r_0/Qbar" "and_pd_0/Out1" 3.53571
+cap "tspc_r_0/VDD" "tspc_r_0/Qbar" 6.1875
+cap "a_n420_n1430#" "and_pd_0/Out1" 7.21875
+cap "a_n420_n1430#" "tspc_r_0/Qbar" 7.21875
+cap "a_n420_n1430#" "tspc_r_0/Q" 7.21875
+cap "a_n420_n1430#" "tspc_r_0/Qbar1" 7.21875
+cap "and_pd_0/VDD" "tspc_r_0/VDD" 43.07
+cap "tspc_r_0/Q" "and_pd_0/A" 2.15625
+cap "a_n420_n1430#" "tspc_r_0/VDD" 54.6607
+cap "a_n420_n1430#" "and_pd_0/Out" 9.96875
+cap "a_n420_n1430#" "and_pd_0/Out1" 7.21875
+cap "a_n420_n1430#" "tspc_r_0/VDD" 18.7589
+merge "and_pd_0/VSUBS" "and_pd_0/GND" -6351.75 0 0 0 0 0 0 0 0 0 0 -55010 -7926 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 572500 -19033 0 0 0 0 0 0 -601300 -9300 0 0 0 0
+merge "and_pd_0/GND" "tspc_r_1/VSUBS"
+merge "tspc_r_1/VSUBS" "tspc_r_1/GND"
+merge "tspc_r_1/GND" "tspc_r_0/VSUBS"
+merge "tspc_r_0/VSUBS" "tspc_r_0/GND"
 merge "tspc_r_0/GND" "GND"
-merge "and_pd_0/B" "UP" 18.31 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1800 -320 0 0 0 0 0 0 0 0 0 0
+merge "GND" "a_n420_n1430#"
+merge "and_pd_0/B" "UP" -198.16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -84600 -320 0 0 0 0 0 0 0 0 0 0
 merge "UP" "tspc_r_0/Q"
 merge "tspc_r_0/Q" "m1_2010_600#"
-merge "and_pd_0/Out" "tspc_r_0/R" -905.537 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -80 0 0 17100 -460 0 0 0 0 0 0 0 0
-merge "tspc_r_0/R" "tspc_r_1/R"
-merge "tspc_r_1/R" "R"
-merge "and_pd_0/a_n60_n30#" "and_pd_0/VDD" 82.345 0 0 0 0 204200 -8150 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -3200 -320 0 0 0 0 0 0 -14400 -750 0 0 0 0
+merge "and_pd_0/a_n60_n30#" "and_pd_0/VDD" 240.86 0 0 0 0 325700 -10800 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -3200 -320 32000 0 39000 0 79000 0 83100 -1940 0 0 0 0
 merge "and_pd_0/VDD" "tspc_r_0/VDD"
-merge "tspc_r_0/VDD" "tspc_r_0/D"
+merge "tspc_r_0/VDD" "m4_1440_1280#"
+merge "m4_1440_1280#" "tspc_r_0/D"
 merge "tspc_r_0/D" "tspc_r_0/w_n290_n40#"
 merge "tspc_r_0/w_n290_n40#" "tspc_r_1/VDD"
-merge "tspc_r_1/VDD" "tspc_r_1/D"
+merge "tspc_r_1/VDD" "tspc_r_1/w_n290_n40#"
+merge "tspc_r_1/w_n290_n40#" "w_0_n1460#"
+merge "w_0_n1460#" "tspc_r_1/D"
 merge "tspc_r_1/D" "VDD"
+merge "and_pd_0/Out" "tspc_r_0/R" -951.542 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -80 0 0 25100 -460 0 0 0 0 0 0 0 0
+merge "tspc_r_0/R" "tspc_r_1/R"
+merge "tspc_r_1/R" "R"
 merge "tspc_r_1/clk" "DIV" -12.3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -60 0 0 0 0 0 0 0 0
 merge "tspc_r_0/clk" "REF" -12.3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -60 0 0 0 0 0 0 0 0
-merge "and_pd_0/A" "tspc_r_1/Q" -526.37 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13200 -160 -11100 -830 0 0 0 0 0 0 0 0 0 0
+merge "and_pd_0/A" "tspc_r_1/Q" -456.84 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5200 -160 -12900 -60 0 0 0 0 0 0 0 0 0 0
 merge "tspc_r_1/Q" "DOWN"

diff --git a/mag/pd.mag b/mag/pd.mag
index bffd95b..53c318a 100644
--- a/mag/pd.mag
+++ b/mag/pd.mag

@@ -1,14 +1,191 @@
 magic
 tech sky130A
-timestamp 1640777101
+timestamp 1640958486
 << nwell >>
-rect 0 580 1435 690
+rect 0 680 1530 690
+rect 0 580 1555 680
+rect 1430 360 1555 580
+rect 995 -615 1155 -410
+rect 0 -730 1155 -615
+<< psubdiff >>
+rect -210 790 -130 805
+rect -210 740 -195 790
+rect -145 740 -130 790
+rect -210 725 -130 740
+rect -65 790 15 805
+rect -65 740 -50 790
+rect 0 740 15 790
+rect -65 725 15 740
+rect 295 790 375 805
+rect 295 740 310 790
+rect 360 740 375 790
+rect 295 725 375 740
+rect 655 790 735 805
+rect 655 740 670 790
+rect 720 740 735 790
+rect 655 725 735 740
+rect 1015 790 1095 805
+rect 1015 740 1030 790
+rect 1080 740 1095 790
+rect 1015 725 1095 740
+rect 1375 790 1455 805
+rect 1375 740 1390 790
+rect 1440 740 1455 790
+rect 1375 725 1455 740
+rect 1600 710 1680 725
+rect 1600 660 1615 710
+rect 1665 660 1680 710
+rect 1600 645 1680 660
+rect -210 430 -130 445
+rect -210 380 -195 430
+rect -145 380 -130 430
+rect -210 365 -130 380
+rect 1600 350 1680 365
+rect 1600 300 1615 350
+rect 1665 300 1680 350
+rect 1600 285 1680 300
+rect -210 70 -130 85
+rect -210 20 -195 70
+rect -145 20 -130 70
+rect -210 5 -130 20
+rect 1365 -40 1445 -25
+rect 1365 -90 1380 -40
+rect 1430 -90 1445 -40
+rect 1365 -105 1445 -90
+rect 1230 -210 1310 -195
+rect 1230 -260 1245 -210
+rect 1295 -260 1310 -210
+rect 1230 -275 1310 -260
+rect -210 -290 -130 -275
+rect -210 -340 -195 -290
+rect -145 -340 -130 -290
+rect -210 -355 -130 -340
+rect 1230 -570 1310 -555
+rect 1230 -620 1245 -570
+rect 1295 -620 1310 -570
+rect 1230 -635 1310 -620
+rect -210 -650 -130 -635
+rect -210 -700 -195 -650
+rect -145 -700 -130 -650
+rect -210 -715 -130 -700
+rect -65 -785 15 -770
+rect -65 -835 -50 -785
+rect 0 -835 15 -785
+rect -65 -850 15 -835
+rect 295 -785 375 -770
+rect 295 -835 310 -785
+rect 360 -835 375 -785
+rect 295 -850 375 -835
+rect 655 -785 735 -770
+rect 655 -835 670 -785
+rect 720 -835 735 -785
+rect 655 -850 735 -835
+rect 1015 -785 1095 -770
+rect 1015 -835 1030 -785
+rect 1080 -835 1095 -785
+rect 1015 -850 1095 -835
+<< nsubdiff >>
+rect 1445 525 1515 540
+rect 1445 485 1460 525
+rect 1500 485 1515 525
+rect 1445 470 1515 485
+rect 1050 -515 1120 -500
+rect 1050 -555 1065 -515
+rect 1105 -555 1120 -515
+rect 1050 -570 1120 -555
+<< psubdiffcont >>
+rect -195 740 -145 790
+rect -50 740 0 790
+rect 310 740 360 790
+rect 670 740 720 790
+rect 1030 740 1080 790
+rect 1390 740 1440 790
+rect 1615 660 1665 710
+rect -195 380 -145 430
+rect 1615 300 1665 350
+rect -195 20 -145 70
+rect 1380 -90 1430 -40
+rect 1245 -260 1295 -210
+rect -195 -340 -145 -290
+rect 1245 -620 1295 -570
+rect -195 -700 -145 -650
+rect -50 -835 0 -785
+rect 310 -835 360 -785
+rect 670 -835 720 -785
+rect 1030 -835 1080 -785
+<< nsubdiffcont >>
+rect 1460 485 1500 525
+rect 1065 -555 1105 -515
+<< locali >>
+rect -215 790 1685 810
+rect -215 740 -195 790
+rect -145 740 -50 790
+rect 0 740 310 790
+rect 360 740 670 790
+rect 720 740 1030 790
+rect 1080 740 1390 790
+rect 1440 740 1685 790
+rect -215 720 1685 740
+rect -215 430 -125 720
+rect 1595 710 1685 720
+rect 1595 660 1615 710
+rect 1665 660 1685 710
+rect 1450 525 1510 535
+rect 1450 485 1460 525
+rect 1500 485 1510 525
+rect 1450 475 1510 485
+rect -215 380 -195 430
+rect -145 380 -125 430
+rect -215 70 -125 380
+rect 1595 350 1685 660
+rect 1595 300 1615 350
+rect 1665 300 1685 350
+rect -215 20 -195 70
+rect -145 50 -125 70
+rect -145 20 60 50
+rect -215 15 60 20
+rect -215 -290 -125 15
+rect 1595 -20 1685 300
+rect -215 -340 -195 -290
+rect -145 -340 -125 -290
+rect -215 -650 -125 -340
+rect 1225 -40 1685 -20
+rect 1225 -90 1380 -40
+rect 1430 -90 1685 -40
+rect 1225 -110 1685 -90
+rect 1225 -210 1315 -110
+rect 1225 -260 1245 -210
+rect 1295 -260 1315 -210
+rect 1055 -515 1115 -505
+rect 1055 -555 1065 -515
+rect 1105 -555 1115 -515
+rect 1055 -565 1115 -555
+rect -215 -700 -195 -650
+rect -145 -700 -125 -650
+rect -215 -765 -125 -700
+rect 1225 -570 1315 -260
+rect 1225 -620 1245 -570
+rect 1295 -620 1315 -570
+rect 1225 -765 1315 -620
+rect -215 -785 1315 -765
+rect -215 -835 -50 -785
+rect 0 -835 310 -785
+rect 360 -835 670 -785
+rect 720 -835 1030 -785
+rect 1080 -835 1315 -785
+rect -215 -855 1315 -835
 << viali >>
+rect 1460 485 1500 525
 rect 30 320 50 340
 rect 1080 280 1100 300
 rect 1435 280 1455 300
 rect 30 -385 50 -365
+rect 1065 -555 1105 -515
 << metal1 >>
+rect 1450 525 1510 535
+rect 1450 485 1460 525
+rect 1500 485 1510 525
+rect 1450 475 1510 485
 rect 20 345 60 350
 rect 20 315 25 345
 rect 55 315 60 345
@@ -32,7 +209,12 @@
 rect 20 -390 25 -360
 rect 55 -390 60 -360
 rect 20 -395 60 -390
+rect 1055 -515 1115 -505
+rect 1055 -555 1065 -515
+rect 1105 -555 1115 -515
+rect 1055 -565 1115 -555
 << via1 >>
+rect 1460 485 1500 525
 rect 25 340 55 345
 rect 25 320 30 340
 rect 30 320 50 340
@@ -48,7 +230,12 @@
 rect 30 -385 50 -365
 rect 50 -385 55 -365
 rect 25 -390 55 -385
+rect 1065 -555 1105 -515
 << metal2 >>
+rect 1450 525 1510 535
+rect 1450 485 1460 525
+rect 1500 485 1510 525
+rect 1450 475 1510 485
 rect -115 395 0 410
 rect 20 345 60 350
 rect 20 315 25 345
@@ -68,10 +255,20 @@
 rect 55 -390 65 -360
 rect 15 -400 65 -390
 rect -115 -455 0 -440
+rect 1055 -515 1115 -505
+rect 1055 -555 1065 -515
+rect 1105 -555 1115 -515
+rect 1055 -565 1115 -555
 << via2 >>
+rect 1460 485 1500 525
 rect 25 315 55 345
 rect 25 -390 55 -360
+rect 1065 -555 1105 -515
 << metal3 >>
+rect 1450 525 1510 535
+rect 1450 485 1460 525
+rect 1500 485 1510 525
+rect 1450 475 1510 485
 rect 15 350 65 355
 rect 15 310 20 350
 rect 60 310 65 350
@@ -80,7 +277,12 @@
 rect 15 -395 20 -355
 rect 60 -395 65 -355
 rect 15 -400 65 -395
+rect 1055 -515 1115 -505
+rect 1055 -555 1065 -515
+rect 1105 -555 1115 -515
+rect 1055 -565 1115 -555
 << via3 >>
+rect 1460 485 1500 525
 rect 20 345 60 350
 rect 20 315 25 345
 rect 25 315 55 345
@@ -91,9 +293,18 @@
 rect 25 -390 55 -360
 rect 55 -390 60 -360
 rect 20 -395 60 -390
+rect 1065 -555 1105 -515
 << metal4 >>
 rect -70 640 20 670
+rect 720 640 925 670
 rect -70 350 -40 640
+rect 1405 600 1490 630
+rect 1445 535 1490 600
+rect 1445 525 1510 535
+rect 1445 485 1460 525
+rect 1500 485 1510 525
+rect 1445 480 1510 485
+rect 1450 475 1510 480
 rect 15 350 65 355
 rect -70 320 20 350
 rect -70 -360 -40 320
@@ -108,19 +319,27 @@
 rect 15 -395 20 -390
 rect 60 -395 65 -355
 rect 15 -400 65 -395
+rect 1050 -505 1095 -500
+rect 1050 -515 1115 -505
+rect 1050 -555 1065 -515
+rect 1105 -555 1115 -515
+rect 1050 -560 1115 -555
+rect 1055 -565 1115 -560
+rect 1065 -685 1105 -565
 rect -70 -715 20 -685
-use and_pd  and_pd_0
-timestamp 1640776259
-transform 1 0 1100 0 1 395
-box -120 -375 335 275
-use tspc_r  tspc_r_1
-timestamp 1640770827
-transform 1 0 145 0 -1 -425
-box -145 -380 875 305
+rect 1020 -715 1105 -685
 use tspc_r  tspc_r_0
-timestamp 1640770827
+timestamp 1640958486
 transform 1 0 145 0 1 380
 box -145 -380 875 305
+use tspc_r  tspc_r_1
+timestamp 1640958486
+transform 1 0 145 0 -1 -425
+box -145 -380 875 305
+use and_pd  and_pd_0
+timestamp 1640958486
+transform 1 0 1100 0 1 395
+box -120 -375 335 275
 << labels >>
 rlabel nwell 980 600 1050 630 1 VDD
 rlabel nwell 980 630 1020 640 1 VDD

diff --git a/mag/prescaler.ext b/mag/prescaler.ext
index 29ec8bd..57d4478 100644
--- a/mag/prescaler.ext
+++ b/mag/prescaler.ext

@@ -1,4 +1,4 @@
-timestamp 1640902018
+timestamp 1640957762
 version 8.3
 tech sky130A
 style ngspice()
@@ -12,192 +12,186 @@
 node "m4_1970_n370#" 0 75.68 1970 -370 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8400 400 0 0 0 0
 node "GND" 0 190.26 390 -370 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 26300 1000 0 0 0 0
 node "m4_2730_1520#" 1 323.98 2730 1520 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49200 1760 0 0 0 0
-node "VDD" 0 86.96 1980 1460 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 20400 580 0 0 0 0
-node "m4_350_1060#" 0 255.36 350 1060 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 62400 1480 0 0 0 0
+node "VDD" 0 85.656 1980 1460 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 20400 580 0 0 0 0
+node "m4_350_1060#" 0 252.457 350 1060 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 62400 1480 0 0 0 0
 node "GND" 3 1703 2600 2660 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 265800 8980 0 0 0 0
 node "GND" 1 378.84 1930 3350 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 62700 1980 0 0 0 0
 node "clk" 3 379.35 -420 460 m2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 37200 1940 0 0 0 0 0 0 0 0
-node "m2_970_460#" 12 1213.01 970 460 m2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 106400 6440 0 0 0 0 0 0 0 0
+node "m2_970_460#" 12 1208.72 970 460 m2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 106400 6440 0 0 0 0 0 0 0 0
 node "m1_2700_2190#" 12 1187.47 2700 2190 m1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 84000 5660 0 0 0 0 0 0 0 0 0 0
 node "Out" 19 846.75 2120 280 v0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1600 160 6400 320 60100 3740 0 0 0 0 0 0 0 0
 node "li_3590_420#" 125 2264.03 3590 420 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15000 820 21300 1120 178400 8640 0 0 0 0 0 0 0 0
 node "li_2030_420#" 66 157.38 2030 420 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9600 540 0 0 0 0 0 0 0 0 0 0 0 0
 node "li_450_280#" 76 168.75 450 280 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 580 0 0 0 0 0 0 0 0 0 0 0 0
-node "mc1" 150 2028.09 2700 2270 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 17600 960 102600 6560 30100 1740 0 0 0 0 0 0 0 0
-node "li_1980_2130#" 199 409.697 1980 2130 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 26700 1400 0 0 0 0 0 0 0 0 0 0 0 0
+node "mc1" 150 2026.91 2700 2270 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 17600 960 102600 6560 30100 1740 0 0 0 0 0 0 0 0
+node "li_1980_2130#" 199 398.912 1980 2130 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 26700 1400 0 0 0 0 0 0 0 0 0 0 0 0
 node "li_n310_330#" 210 1594.32 -310 330 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 23700 1320 90500 5720 0 0 0 0 0 0 0 0 0 0
-node "w_490_520#" 72250 51 490 520 nw 0 0 0 0 17000 1740 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-node "w_1990_520#" 42668 312 1990 520 nw 0 0 0 0 104000 3360 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+node "w_390_530#" 14707 435.372 390 530 nw 0 0 0 0 145124 2500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+node "w_1930_2072#" 27928 716.916 1930 2072 nw 0 0 0 0 238972 4204 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 substrate "VSUBS" 0 0 -1073741817 -1073741817 space 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+cap "li_n310_330#" "li_3590_420#" 92.2845
+cap "mc1" "m4_2730_1520#" 23.175
+cap "li_n310_330#" "mc1" 37.515
+cap "mc1" "VDD" 41.675
+cap "li_3590_420#" "clk" 168.462
+cap "mc1" "m4_350_1060#" 84.575
+cap "w_1930_2072#" "mc1" 2.7456
+cap "li_3590_420#" "m2_970_460#" 183.333
+cap "w_1930_2072#" "li_1980_2130#" 10.7855
+cap "li_3590_420#" "m1_2700_2190#" 23.5
+cap "li_2030_420#" "m2_970_460#" 17.38
+cap "li_450_280#" "clk" 28.72
+cap "GND" "m4_2730_1520#" 23.6471
+cap "w_390_530#" "m4_350_1060#" 2.9032
+cap "w_1930_2072#" "VDD" 1.964
+cap "li_3590_420#" "Out" 716.418
 cap "mc1" "m2_970_460#" 37.515
 cap "li_2030_420#" "Out" 197.97
 cap "li_n310_330#" "clk" 28.72
 cap "mc1" "m1_2700_2190#" 63.2343
 cap "li_1980_2130#" "m2_970_460#" 138.025
-cap "li_n310_330#" "li_3590_420#" 92.2845
-cap "li_n310_330#" "mc1" 37.515
-cap "GND" "m4_2730_1520#" 23.6471
-cap "w_1990_520#" "VDD" 0.66
 cap "m2_970_460#" "VDD" 42
-cap "w_1990_520#" "m2_970_460#" 33.345
+cap "w_1930_2072#" "m2_970_460#" 42.9324
 cap "Out" "GND" 27.9
-cap "mc1" "m4_2730_1520#" 23.175
-cap "mc1" "VDD" 41.675
-cap "li_3590_420#" "clk" 168.462
-cap "mc1" "m4_350_1060#" 84.575
-cap "li_3590_420#" "m2_970_460#" 183.333
 cap "Out" "m1_2700_2190#" 27.465
-cap "w_1990_520#" "mc1" 1.56
-cap "li_3590_420#" "m1_2700_2190#" 23.5
-cap "li_2030_420#" "m2_970_460#" 17.38
-cap "li_450_280#" "clk" 28.72
-cap "li_3590_420#" "Out" 716.418
-cap "nand_0/A" "nand_0/a_280_n230#" 13.02
-cap "tspc_0/Z1" "nand_0/vdd!" 10.56
-cap "tspc_0/a_300_n150#" "nand_0/a_280_n230#" 94.1074
-cap "tspc_0/D" "nand_0/A" 29.5549
-cap "tspc_0/D" "nand_0/a_280_n230#" 165.278
-cap "tspc_0/a_300_n150#" "nand_0/A" 17.42
-cap "tspc_0/D" "tspc_0/a_n60_n20#" 34.1786
-cap "nand_0/a_280_n230#" "tspc_0/Z4" 106.442
-cap "tspc_0/a_n60_n20#" "nand_0/vdd!" 20.3077
-cap "tspc_0/D" "tspc_0/a_300_n150#" 127.12
-cap "tspc_0/D" "nand_0/gnd!" 15.6873
-cap "tspc_0/Z4" "nand_0/gnd!" 12.1
-cap "tspc_0/D" "tspc_0/Z4" 12.3811
-cap "nand_0/a_280_n230#" "nand_0/z1" 153.26
-cap "nand_0/a_280_n230#" "tspc_0/GND" 124.422
 cap "nand_0/a_280_n230#" "tspc_0/Z3" 75.9225
 cap "nand_0/a_280_n230#" "tspc_0/Z2" 56.16
 cap "tspc_0/D" "nand_0/z1" 2.11538
-cap "nand_0/A" "nand_0/a_n20_20#" 44.8462
-cap "tspc_1/Z2" "tspc_0/GND" 16.9342
-cap "tspc_1/Z4" "li_3590_420#" 55.1
-cap "tspc_0/Q" "tspc_0/GND" 51.0882
+cap "tspc_0/D" "nand_0/A" 29.5549
+cap "tspc_0/a_300_n150#" "nand_0/A" 17.42
+cap "nand_0/a_280_n230#" "tspc_0/Z4" 106.442
+cap "tspc_0/D" "tspc_0/vdd!" 45.9643
+cap "tspc_0/D" "tspc_0/a_300_n150#" 127.12
+cap "nand_0/a_280_n230#" "nand_0/z1" 153.26
+cap "nand_0/a_280_n230#" "tspc_0/GND" 124.422
+cap "tspc_0/D" "tspc_0/Z4" 12.3811
+cap "nand_0/A" "nand_0/vdd!" 44.8462
+cap "nand_0/A" "nand_0/a_280_n230#" 13.02
+cap "tspc_0/a_300_n150#" "nand_0/a_280_n230#" 94.1074
+cap "tspc_0/D" "nand_0/a_280_n230#" 165.278
 cap "tspc_0/a_740_n680#" "tspc_1/Z2" 5.4
-cap "tspc_0/Q" "tspc_1/Z1" 26.5569
-cap "tspc_0/Q" "tspc_1/Z2" 85.89
-cap "tspc_0/Q" "tspc_1/a_n60_n20#" 40.081
-cap "tspc_0/a_n60_n20#" "tspc_1/a_n60_n20#" 25.1842
-cap "tspc_0/a_740_n680#" "tspc_0/Q" 32.1861
 cap "tspc_0/a_300_n150#" "tspc_0/Q" 177.533
-cap "tspc_0/a_300_n150#" "tspc_0/a_740_n680#" 129.16
-cap "tspc_0/a_300_n150#" "tspc_0/Z3" 198.42
+cap "tspc_0/a_740_n680#" "tspc_0/a_300_n150#" 129.16
 cap "tspc_0/GND" "li_3590_420#" 198.939
-cap "tspc_0/Z4" "li_3590_420#" 107.677
-cap "tspc_1/Z2" "li_3590_420#" 43.32
+cap "tspc_1/Z4" "li_3590_420#" 55.1
 cap "tspc_0/Q" "li_3590_420#" 142.71
 cap "tspc_0/a_740_n680#" "li_3590_420#" 150.46
+cap "tspc_0/a_300_n150#" "tspc_0/Z3" 198.42
+cap "tspc_0/a_630_n680#" "tspc_0/GND" 17.3347
+cap "tspc_0/Z4" "li_3590_420#" 107.677
+cap "tspc_0/Q" "tspc_0/GND" 51.0882
+cap "tspc_1/Z2" "li_3590_420#" 43.32
+cap "tspc_1/Z3" "tspc_0/Q" 3.50402
+cap "tspc_1/Z4" "tspc_0/Q" 102.17
+cap "tspc_0/Q" "tspc_1/Z1" 39.5832
+cap "tspc_0/Q" "tspc_1/vdd!" 59.1194
+cap "tspc_1/Z4" "tspc_0/a_740_n680#" 4.09091
+cap "tspc_0/vdd!" "tspc_1/vdd!" 38.2105
 cap "tspc_0/Z3" "li_3590_420#" 57.62
-cap "tspc_0/Q" "tspc_1/Z3" 3.50402
-cap "tspc_0/a_740_n680#" "tspc_1/Z4" 4.09091
-cap "tspc_0/Q" "tspc_1/Z4" 102.17
+cap "tspc_0/a_740_n680#" "tspc_0/Q" 32.1861
 cap "tspc_0/a_300_n150#" "li_3590_420#" 83.0378
-cap "tspc_0/GND" "tspc_0/a_630_n680#" 17.3347
-cap "tspc_1/Z3" "tspc_0/Q" 59.529
-cap "tspc_0/a_740_n680#" "tspc_1/Z4" 1.92857
-cap "tspc_1/Z2" "tspc_0/Q" 9.99
-cap "tspc_1/GND" "tspc_1/Q" 218.86
-cap "tspc_1/a_300_n150#" "tspc_0/Q" 179.587
-cap "tspc_1/GND" "tspc_0/Q" 39.1
+cap "tspc_1/Z2" "tspc_0/GND" 16.9342
+cap "tspc_0/Q" "tspc_1/Z2" 85.89
 cap "tspc_1/Q" "tspc_1/Z4" 104.585
-cap "tspc_1/a_740_n680#" "tspc_1/Q" 175.043
+cap "tspc_0/Q" "tspc_1/a_300_n150#" 179.587
+cap "tspc_1/a_740_n680#" "tspc_0/Q" 82.65
+cap "tspc_0/Q" "tspc_1/GND" 39.1
 cap "tspc_1/Z3" "tspc_1/Q" 156.507
 cap "tspc_1/Z2" "tspc_1/Q" 12.84
+cap "tspc_1/Z4" "tspc_0/a_740_n680#" 1.92857
+cap "tspc_0/Q" "tspc_1/Z4" 78.2567
 cap "tspc_1/a_300_n150#" "tspc_1/Q" 68.7785
-cap "tspc_1/Q" "tspc_0/Q" 50.6
-cap "tspc_1/Z4" "tspc_0/Q" 78.2567
-cap "tspc_1/a_740_n680#" "tspc_0/Q" 82.65
-cap "tspc_0/a_n60_n20#" "tspc_0/Z2" 10
-cap "tspc_0/w_n140_n70#" "mc1" 9.165
-cap "tspc_0/a_n60_n20#" "nand_0/OUT" 11.7857
+cap "tspc_0/Q" "tspc_1/Q" 50.6
+cap "tspc_1/a_740_n680#" "tspc_1/Q" 175.043
+cap "tspc_1/Q" "tspc_1/GND" 218.86
+cap "tspc_0/Q" "tspc_1/Z3" 59.529
+cap "tspc_0/Q" "tspc_1/Z2" 9.99
+cap "tspc_0/vdd!" "mc1" 162.542
+cap "tspc_0/vdd!" "tspc_0/Z2" 10
 cap "tspc_0/Z2" "mc1" 46.8
-cap "tspc_2/Q" "tspc_0/a_n60_n20#" 32.5248
-cap "tspc_0/a_n60_n20#" "mc1" 162.542
-cap "tspc_0/w_n140_n70#" "tspc_0/a_n60_n20#" -2.82
-cap "tspc_1/a_n60_n20#" "tspc_2/Z2" 10
+cap "tspc_2/Q" "tspc_0/vdd!" 32.5248
+cap "tspc_0/w_n140_n70#" "tspc_0/vdd!" -3.656
+cap "tspc_0/w_n140_n70#" "mc1" 9.165
 cap "tspc_0/Z2" "mc1" 17.4522
-cap "tspc_0/Q" "tspc_1/a_n60_n20#" 63.106
-cap "tspc_2/Z1" "nand_1/OUT" 42
-cap "tspc_1/a_n60_n20#" "nand_1/OUT" 145.242
-cap "tspc_1/a_n60_n20#" "nand_1/a_280_n230#" 2.75
-cap "tspc_1/a_n60_n20#" "tspc_0/a_300_n150#" 166.667
-cap "tspc_1/w_n140_n70#" "mc1" 25.74
-cap "nand_1/vdd!" "tspc_2/Z1" 2.44444
-cap "tspc_1/a_n60_n20#" "tspc_1/w_n140_n70#" -7.56
-cap "nand_1/vdd!" "tspc_1/a_n60_n20#" 16.775
+cap "tspc_0/vdd!" "tspc_2/Z2" 10
+cap "tspc_0/vdd!" "tspc_0/Q" 44.0676
+cap "tspc_2/D" "tspc_2/Z1" 99.6765
+cap "nand_1/a_280_n230#" "tspc_0/vdd!" 7.33333
+cap "tspc_2/D" "tspc_0/vdd!" 272.242
+cap "tspc_2/w_n140_n70#" "tspc_0/vdd!" -11.884
+cap "tspc_2/D" "nand_1/a_280_n230#" 9.77778
+cap "tspc_2/w_n140_n70#" "tspc_2/D" 8.1659
 cap "tspc_1/Z2" "mc1" 18
-cap "tspc_1/Z2" "tspc_1/a_n60_n20#" 4.35484
-cap "nand_1/a_280_n230#" "nand_1/OUT" 3.66667
-cap "tspc_0/a_300_n150#" "nand_1/OUT" -6.9
-cap "tspc_0/Q" "tspc_1/Z1" 23.4474
-cap "tspc_1/w_n140_n70#" "nand_1/OUT" 3.6075
-cap "tspc_1/w_n140_n70#" "tspc_0/a_300_n150#" 11.59
+cap "tspc_2/a_300_n150#" "tspc_0/vdd!" 166.667
+cap "tspc_2/w_n140_n70#" "tspc_2/a_300_n150#" 2.0976
+cap "tspc_2/a_300_n150#" "tspc_2/D" -6.9
+cap "tspc_2/D" "nand_1/z1" 6
 cap "tspc_2/Z2" "mc1" 53.3571
-cap "tspc_1/a_n60_n20#" "mc1" 414.897
-cap "tspc_1/w_n140_n70#" "tspc_1/a_n60_n20#" -2.94
-cap "nand_1/a_280_n230#" "tspc_1/a_740_n680#" 21.8182
+cap "tspc_0/vdd!" "mc1" 414.897
+cap "tspc_0/vdd!" "tspc_1/Z2" 4.35484
+cap "tspc_2/w_n140_n70#" "mc1" 24.5544
+cap "tspc_0/Q" "tspc_1/Z1" 10.4211
+cap "nand_1/A" "tspc_1/vdd!" 227.695
+cap "nand_1/a_280_n230#" "tspc_1/vdd!" 13.125
+cap "tspc_2/w_n140_n70#" "tspc_1/vdd!" -6.44
+cap "nand_1/a_280_n230#" "tspc_1/a_740_n680#" 1.36364
 cap "nand_1/A" "tspc_1/Z2" 46.2522
-cap "nand_1/GND" "tspc_1/a_n60_n20#" 39.5155
-cap "tspc_1/a_n60_n20#" "tspc_1/Z2" 11.9132
-cap "tspc_1/a_n60_n20#" "tspc_1/a_300_n150#" 1.38889
-cap "nand_1/OUT" "tspc_1/vdd!" 7.61538
+cap "nand_1/OUT" "nand_1/z1" 1.83333
 cap "nand_1/A" "nand_1/OUT" 22.3793
-cap "tspc_1/w_n140_n70#" "nand_1/A" 9.555
-cap "nand_1/A" "tspc_1/a_n60_n20#" 227.695
-cap "nand_1/a_280_n230#" "tspc_1/a_n60_n20#" 13.125
+cap "tspc_2/w_n140_n70#" "nand_1/A" 9.555
+cap "nand_1/GND" "tspc_1/vdd!" 39.5155
+cap "tspc_1/vdd!" "tspc_2/a_300_n150#" 1.38889
+cap "tspc_1/vdd!" "tspc_1/Z2" 11.9132
 cap "tspc_2/Q" "tspc_2/a_740_n680#" 18.4737
-cap "tspc_2/D" "nand_1/a_280_n230#" 6.11111
 cap "tspc_2/D" "tspc_2/Z4" 7.71692
-cap "nand_1/a_280_n230#" "tspc_2/a_n60_n20#" 4.58333
-cap "tspc_2/D" "tspc_2/GND" 7.10543e-15
 cap "tspc_2/a_300_n150#" "tspc_2/D" 0.18
 cap "tspc_2/Z3" "tspc_2/D" 5.25747
-cap "tspc_2/w_n140_n70#" "tspc_2/D" 7.215
-cap "tspc_2/D" "nand_1/gnd!" 111.733
-cap "tspc_2/D" "nand_1/z1" 20
-cap "tspc_2/D" "tspc_2/Z1" 78.2353
-cap "tspc_2/D" "tspc_2/a_n60_n20#" 174.4
-cap "nand_1/OUT" "nand_1/z1" 4.58333
-merge "tspc_2/GND" "nand_1/GND" -652.42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 67900 -3600 0 0 0 0
+cap "tspc_2/w_n140_n70#" "tspc_2/D" 3.0525
+cap "nand_1/z1" "tspc_2/D" 14
+cap "tspc_2/vdd!" "tspc_2/D" 47.4
+cap "tspc_2/Z1" "tspc_2/D" 20.5588
+cap "nand_1/OUT" "nand_1/z1" 2.75
+merge "tspc_2/gnd!" "tspc_2/GND" -681.99 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -218700 -3450 0 0 0 0
+merge "tspc_2/GND" "nand_1/GND"
 merge "nand_1/GND" "tspc_1/GND"
-merge "tspc_1/GND" "nand_0/GND"
+merge "tspc_1/GND" "tspc_1/gnd!"
+merge "tspc_1/gnd!" "nand_0/GND"
 merge "nand_0/GND" "m4_1970_n370#"
 merge "m4_1970_n370#" "tspc_0/GND"
 merge "tspc_0/GND" "GND"
-merge "nand_1/a_490_n530#" "tspc_2/a_540_n1120#" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-merge "tspc_2/a_540_n1120#" "tspc_1/a_540_n1120#"
-merge "tspc_1/a_540_n1120#" "nand_0/a_490_n530#"
-merge "nand_0/a_490_n530#" "tspc_0/a_540_n1120#"
-merge "tspc_0/a_540_n1120#" "VSUBS"
-merge "tspc_2/a_300_n150#" "tspc_1/a_300_n150#" -511.112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -53200 -500 0 0 0 0 0 0 0 0
+merge "nand_1/VSUBS" "tspc_2/VSUBS" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+merge "tspc_2/VSUBS" "tspc_1/VSUBS"
+merge "tspc_1/VSUBS" "nand_0/VSUBS"
+merge "nand_0/VSUBS" "tspc_0/VSUBS"
+merge "tspc_0/VSUBS" "VSUBS"
+merge "nand_1/VDD" "tspc_2/w_n140_n70#" 790.044 0 0 0 0 263348 -15264 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+merge "tspc_2/w_n140_n70#" "tspc_1/w_n140_n70#"
+merge "tspc_1/w_n140_n70#" "nand_0/VDD"
+merge "nand_0/VDD" "w_1930_2072#"
+merge "w_1930_2072#" "tspc_0/w_n140_n70#"
+merge "tspc_0/w_n140_n70#" "w_390_530#"
+merge "nand_1/vdd!" "tspc_1/vdd!" -1180.25 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 53200 -7520 0 0 0 0
+merge "tspc_1/vdd!" "m4_2730_1520#"
+merge "m4_2730_1520#" "tspc_2/vdd!"
+merge "tspc_2/vdd!" "VDD"
+merge "VDD" "tspc_0/vdd!"
+merge "tspc_0/vdd!" "nand_0/vdd!"
+merge "nand_0/vdd!" "m4_350_1060#"
+merge "tspc_2/a_300_n150#" "tspc_1/a_300_n150#" -475.331 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 21000 -500 0 0 0 0 0 0 0 0
 merge "tspc_1/a_300_n150#" "tspc_0/a_300_n150#"
 merge "tspc_0/a_300_n150#" "clk"
 merge "clk" "m2_970_460#"
-merge "nand_1/VDD" "tspc_2/w_n140_n70#" 2406.6 0 0 0 0 802200 -13620 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-merge "tspc_2/w_n140_n70#" "tspc_1/w_n140_n70#"
-merge "tspc_1/w_n140_n70#" "nand_0/VDD"
-merge "nand_0/VDD" "w_1990_520#"
-merge "w_1990_520#" "tspc_0/w_n140_n70#"
-merge "tspc_0/w_n140_n70#" "w_490_520#"
-merge "nand_1/a_n20_20#" "tspc_1/a_n60_n20#" -1138.04 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 94800 -7300 0 0 0 0
-merge "tspc_1/a_n60_n20#" "m4_2730_1520#"
-merge "m4_2730_1520#" "tspc_2/a_n60_n20#"
-merge "tspc_2/a_n60_n20#" "VDD"
-merge "VDD" "tspc_0/a_n60_n20#"
-merge "tspc_0/a_n60_n20#" "nand_0/a_n20_20#"
-merge "nand_0/a_n20_20#" "m4_350_1060#"
-merge "nand_1/a_280_n230#" "tspc_1/a_740_n680#" 178.92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 349300 -180 0 0 0 0 0 0 0 0 0 0
+merge "nand_1/a_280_n230#" "tspc_1/a_740_n680#" 110.67 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 244300 -180 0 0 0 0 0 0 0 0 0 0
 merge "tspc_1/a_740_n680#" "m1_2700_2190#"
 merge "tspc_2/Q" "nand_0/A" -49.5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -180 0 0 0 0 0 0 0 0 0 0 0 0
 merge "nand_0/A" "li_n310_330#"
-merge "tspc_1/Q" "nand_0/a_280_n230#" -1550.83 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -64600 -100 0 -60 -56000 -2800 0 0 0 0 0 0 0 0
+merge "tspc_1/Q" "nand_0/a_280_n230#" -1482.29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9500 -100 0 -60 -56000 -2800 0 0 0 0 0 0 0 0
 merge "nand_0/a_280_n230#" "li_3590_420#"
-merge "nand_0/OUT" "tspc_0/D" -75.2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -4000 -260 0 0 0 0 0 0 0 0 0 0 0 0
+merge "nand_0/OUT" "tspc_0/D" -73.35 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -2000 -260 0 0 0 0 0 0 0 0 0 0 0 0
 merge "tspc_0/D" "li_450_280#"
-merge "tspc_2/D" "nand_1/OUT" -73.4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3700 -240 0 0 0 0 0 0 0 0 0 0 0 0
-merge "nand_1/OUT" "li_1980_2130#"
-merge "nand_1/A" "mc1" -622.415 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9600 -80 -42000 -2800 0 0 0 0 0 0 0 0 0 0
-merge "tspc_1/D" "Out" -597.162 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -121800 -420 0 0 -2400 -190 0 0 0 0 0 0 0 0
+merge "nand_1/A" "mc1" -647.869 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -19200 -80 -42000 -2800 0 0 0 0 0 0 0 0 0 0
+merge "nand_1/OUT" "tspc_2/D" -125.318 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -52000 -240 0 0 0 0 0 0 0 0 0 0 0 0
+merge "tspc_2/D" "li_1980_2130#"
+merge "tspc_1/D" "Out" -470.9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14700 -420 0 0 -2400 -190 0 0 0 0 0 0 0 0
 merge "Out" "tspc_0/Q"
 merge "tspc_0/Q" "li_2030_420#"

diff --git a/mag/prescaler.mag b/mag/prescaler.mag
index d39dcbe..32c8698 100644
--- a/mag/prescaler.mag
+++ b/mag/prescaler.mag

@@ -1,10 +1,17 @@
 magic
 tech sky130A
-timestamp 1640629925
+timestamp 1640957100
 << nwell >>
-rect 1005 760 1025 1060
-rect 245 260 255 685
-rect 995 260 1035 760
+rect 965 1061 1081 1192
+rect 965 1036 1082 1061
+rect 997 760 1073 1036
+rect 995 743 1073 760
+rect 201 527 277 721
+rect 195 459 277 527
+rect 195 271 271 459
+rect 195 265 353 271
+rect 208 260 353 265
+rect 995 260 1035 743
 << locali >>
 rect 225 1285 245 1310
 rect 990 1090 1010 1380
@@ -118,26 +125,26 @@
 rect 195 -185 270 -160
 rect 985 -185 1055 -155
 rect 1750 -185 1890 -155
-use tspc  tspc_0
-timestamp 1640628874
-transform 1 0 325 0 1 295
-box -70 -565 690 465
-use tspc  tspc_1
-timestamp 1640628874
-transform 1 0 1105 0 1 295
-box -70 -565 690 465
-use tspc  tspc_2
-timestamp 1640628874
-transform -1 0 935 0 -1 1225
-box -70 -565 690 465
 use nand  nand_1
-timestamp 1640608660
+timestamp 1640957032
 transform -1 0 1325 0 -1 1050
-box -40 -310 300 290
+box -40 -310 300 315
 use nand  nand_0
-timestamp 1640608660
+timestamp 1640957032
 transform 1 0 -55 0 1 270
-box -40 -310 300 290
+box -40 -310 300 315
+use tspc  tspc_0
+timestamp 1640956963
+transform 1 0 325 0 1 295
+box -70 -490 690 465
+use tspc  tspc_1
+timestamp 1640956963
+transform 1 0 1105 0 1 295
+box -70 -490 690 465
+use tspc  tspc_2
+timestamp 1640956963
+transform -1 0 935 0 -1 1225
+box -70 -490 690 465
 << labels >>
 rlabel metal2 -210 740 170 755 1 mc1
 rlabel metal1 170 740 1430 755 1 mc1

diff --git a/mag/ro_complete.ext b/mag/ro_complete.ext
index 822041a..e004783 100644
--- a/mag/ro_complete.ext
+++ b/mag/ro_complete.ext

@@ -1,4 +1,4 @@
-timestamp 1640901950
+timestamp 1640956319
 version 8.3
 tech sky130A
 style ngspice()
@@ -21,53 +21,53 @@
 cap "li_4080_1390#" "a5" 77.72
 cap "li_7140_1400#" "a5" 100.96
 cap "cbank_2/a0" "cbank_2/switch_0/vout" 46.5385
-cap "cbank_2/a2" "cbank_2/switch_2/vout" 46.5385
 cap "cbank_2/a1" "cbank_2/switch_1/vout" 46.5385
-cap "cbank_2/switch_3/vout" "cbank_2/a3" 46.5385
-cap "cbank_2/a4" "cbank_2/switch_4/vout" 46.5385
+cap "cbank_2/a2" "cbank_2/switch_2/vout" 46.5385
+cap "cbank_2/a3" "cbank_2/switch_3/vout" 46.5385
 cap "cbank_2/a5" "cbank_2/switch_5/vout" 12.6923
-cap "cbank_2/a5" "cbank_2/switch_5/vout" 33.8462
-cap "cbank_2/switch_5/vin" "li_7140_1400#" 24
+cap "cbank_2/a4" "cbank_2/switch_4/vout" 46.5385
+cap "li_7140_1400#" "cbank_2/switch_5/vin" 24
+cap "cbank_2/switch_5/vout" "cbank_2/a5" 33.8462
 cap "cbank_2/v" "cbank_1/gnd!" 86.7059
-cap "a0" "cbank_2/v" 53.41
 cap "cbank_1/switch_1/vin" "a0" 21.8167
-cap "cbank_2/v" "cbank_1/switch_0/vout" 275.882
-cap "a0" "cbank_1/switch_0/vout" 181.38
-cap "cbank_1/switch_2/vin" "a1" 23.6566
-cap "cbank_1/switch_1/vout" "a1" 209.96
+cap "cbank_1/switch_0/vout" "a0" 181.38
+cap "a0" "cbank_2/v" 53.41
+cap "cbank_1/switch_0/vout" "cbank_2/v" 275.882
 cap "a1" "cbank_2/v" 53.41
 cap "cbank_1/switch_1/vout" "cbank_2/v" 275.882
-cap "a2" "cbank_1/switch_1/vout" 60.0024
-cap "a3" "cbank_2/v" 53.41
-cap "a2" "cbank_2/v" 53.41
-cap "cbank_1/switch_4/vin" "a3" 11.4157
+cap "cbank_1/switch_2/vin" "a1" 23.6566
+cap "cbank_1/switch_1/vout" "a1" 209.96
+cap "cbank_1/switch_1/vout" "a2" 60.0024
 cap "cbank_1/gnd!" "cbank_2/v" 275.882
-cap "cbank_1/switch_3/vin" "a2" 23.515
 cap "cbank_1/gnd!" "a3" 192.323
 cap "cbank_1/gnd!" "a2" 124.302
+cap "cbank_1/switch_4/vin" "a3" 11.4157
+cap "a3" "cbank_2/v" 53.41
+cap "a2" "cbank_2/v" 53.41
+cap "cbank_1/switch_3/vin" "a2" 23.515
+cap "a3" "cbank_1/switch_4/vin" 11.4157
 cap "a4" "li_7140_1400#" 53.41
 cap "cbank_1/switch_4/vout" "li_7140_1400#" 275.882
 cap "cbank_1/switch_5/vin" "a4" 20.5602
 cap "cbank_1/switch_4/vout" "a4" 190.632
-cap "cbank_1/switch_4/vin" "a3" 11.4157
-cap "cbank_1/switch_5/vout" "a_7790_n10640#" 162.097
+cap "a_7790_n10640#" "cbank_1/switch_5/vout" 162.097
+cap "li_7140_1400#" "cbank_1/switch_5/vout" 233.936
+cap "a5" "cbank_1/switch_5/vout" 124.931
 cap "li_7140_1400#" "cbank_2/a_6660_n30#" 126
-cap "cbank_1/switch_5/vout" "li_7140_1400#" 233.936
-cap "cbank_1/switch_5/vout" "a5" 124.931
 cap "cbank_1/gnd!" "a_7790_n10640#" 45.6818
-cap "cbank_1/a0" "cbank_1/switch_1/vin" 106.517
-cap "cbank_1/a0" "cbank_1/switch_0/vout" 248.36
+cap "cbank_1/switch_1/vin" "cbank_1/a0" 106.517
+cap "cbank_1/switch_0/vout" "cbank_1/a0" 248.36
 cap "cbank_1/a2" "cbank_1/switch_1/vout" 149.619
 cap "cbank_1/a1" "cbank_1/switch_2/vin" 115.5
 cap "cbank_1/a1" "cbank_1/switch_1/vout" 289.235
+cap "cbank_1/a3" "cbank_1/gnd!" 264.413
+cap "cbank_1/a2" "cbank_1/gnd!" 103.081
 cap "cbank_1/a3" "cbank_1/switch_4/vin" 55.7355
 cap "cbank_1/a2" "cbank_1/switch_3/vin" 114.808
-cap "cbank_1/gnd!" "cbank_1/a3" 264.413
-cap "cbank_1/gnd!" "cbank_1/a2" 103.081
+cap "cbank_1/switch_5/vin" "cbank_1/a4" 100.382
+cap "cbank_1/switch_4/vout" "cbank_1/a4" 261.965
 cap "cbank_1/switch_4/vin" "a3" 55.7355
 cap "cbank_1/a5" "cbank_1/switch_4/vout" 12.6923
-cap "cbank_1/a4" "cbank_1/switch_5/vin" 100.382
-cap "cbank_1/a4" "cbank_1/switch_4/vout" 261.965
 cap "cbank_1/a5" "cbank_1/switch_5/vout" 143.406
 cap "cbank_1/v" "cbank_0/gnd!" 47.5484
 cap "cbank_0/gnd!" "cbank_1/v" 151.29
@@ -75,13 +75,13 @@
 cap "cbank_1/v" "cbank_1/a1" 53.41
 cap "cbank_0/gnd!" "cbank_1/v" 151.29
 cap "cbank_1/v" "cbank_1/a3" 53.41
-cap "cbank_1/v" "cbank_0/gnd!" 151.29
 cap "cbank_1/v" "cbank_1/a2" 53.41
+cap "cbank_1/v" "cbank_0/gnd!" 151.29
+cap "li_4080_1390#" "cbank_0/gnd!" 151.29
 cap "li_4080_1390#" "cbank_1/a4" 53.41
-cap "cbank_0/gnd!" "li_4080_1390#" 151.29
 cap "cbank_0/gnd!" "li_4080_1390#" 41.6979
-cap "cbank_1/switch_5/vin" "li_4080_1390#" 133.875
-cap "cbank_0/gnd!" "cbank_1/v" 47.5484
+cap "li_4080_1390#" "cbank_1/switch_5/vin" 133.875
+cap "cbank_1/v" "cbank_0/gnd!" 47.5484
 cap "cbank_0/switch_0/vout" "cbank_1/v" 151.29
 cap "cbank_0/switch_1/vin" "a0" 82.3167
 cap "cbank_0/switch_0/vout" "a0" 296.011
@@ -89,46 +89,51 @@
 cap "cbank_0/switch_1/vout" "a2" 118.551
 cap "cbank_0/switch_2/vin" "a1" 89.259
 cap "cbank_0/switch_1/vout" "a1" 347.808
+cap "cbank_0/gnd!" "a2" 182.851
 cap "cbank_0/switch_4/vin" "a3" 43.0727
 cap "cbank_0/switch_3/vin" "a2" 88.7246
 cap "cbank_0/gnd!" "cbank_1/v" 151.29
 cap "cbank_0/gnd!" "a3" 316.073
-cap "cbank_0/gnd!" "a2" 182.851
-cap "cbank_0/switch_4/vout" "li_4080_1390#" 151.29
-cap "cbank_0/switch_5/vin" "a4" 77.5759
-cap "cbank_0/switch_4/vout" "a4" 312.991
 cap "cbank_0/switch_4/vin" "a3" 43.0727
-cap "cbank_0/switch_5/vout" "a_7790_n10640#" 193.269
+cap "cbank_0/switch_4/vout" "li_4080_1390#" 151.29
+cap "cbank_0/switch_4/vout" "a4" 312.991
+cap "cbank_0/switch_5/vin" "a4" 77.5759
+cap "a_7790_n10640#" "cbank_0/switch_5/vout" 193.269
 cap "cbank_0/switch_5/vout" "li_4080_1390#" 438.698
 cap "cbank_0/switch_5/vout" "li_7140_1400#" 142.26
 cap "cbank_0/switch_5/vout" "a5" 187.16
 cap "cbank_0/gnd!" "a_7790_n10640#" 45.6818
-cap "cbank_0/a0" "cbank_0/switch_1/vin" 46.0167
-cap "cbank_0/a0" "cbank_0/switch_0/vout" 133.728
+cap "cbank_0/switch_1/vin" "cbank_0/a0" 46.0167
+cap "cbank_0/switch_0/vout" "cbank_0/a0" 133.728
 cap "cbank_0/a2" "cbank_0/switch_2/vout" 91.0707
 cap "cbank_0/a1" "cbank_0/switch_2/vin" 49.8976
 cap "cbank_0/a1" "cbank_0/switch_1/vout" 151.387
-cap "cbank_0/a3" "cbank_0/switch_4/vin" 24.0785
-cap "cbank_0/a3" "cbank_0/switch_3/vout" 140.663
 cap "cbank_0/a2" "cbank_0/switch_3/vin" 49.5988
 cap "cbank_0/a2" "cbank_0/switch_2/vout" 44.5323
+cap "cbank_0/switch_4/vin" "cbank_0/a3" 24.0785
+cap "cbank_0/switch_3/vout" "cbank_0/a3" 140.663
+cap "cbank_0/switch_5/vout" "cbank_0/a5" 12.6923
+cap "cbank_0/switch_5/vin" "cbank_0/a4" 43.3665
+cap "cbank_0/switch_4/vout" "cbank_0/a4" 139.606
 cap "cbank_0/switch_4/vin" "a3" 24.0785
-cap "cbank_0/a5" "cbank_0/switch_5/vout" 12.6923
-cap "cbank_0/a4" "cbank_0/switch_5/vin" 43.3665
-cap "cbank_0/a4" "cbank_0/switch_4/vout" 139.606
 cap "cbank_0/a5" "cbank_0/switch_5/vout" 81.1776
-cap "ro_var_extend_0/gnd" "ro_var_extend_0/out1" 69.0462
-cap "ro_var_extend_0/out1" "ro_var_extend_0/out1" 120.023
-cap "ro_var_extend_0/out1" "ro_var_extend_0/out3" 116.667
-cap "ro_var_extend_0/w_n120_n750#" "ro_var_extend_0/out1" 100.15
+cap "cbank_0/v" "ro_var_extend_0/gnd" 151.9
+cap "ro_var_extend_0/gnd" "li_4080_1390#" 796.97
+cap "li_4080_1390#" "ro_var_extend_0/gnd" 769.58
+cap "li_4080_1390#" "ro_var_extend_0/w_n120_n750#" 415.935
+cap "li_7140_1400#" "ro_var_extend_0/w_n120_n750#" 294.59
+cap "ro_var_extend_0/out1" "ro_var_extend_0/gnd" 69.0462
 cap "ro_var_extend_0/gnd" "ro_var_extend_0/out1" 129.703
+cap "ro_var_extend_0/out1" "ro_var_extend_0/w_n120_n750#" 100.15
+cap "ro_var_extend_0/out1" "ro_var_extend_0/out3" 116.667
+cap "ro_var_extend_0/out1" "ro_var_extend_0/out1" 120.023
+cap "ro_var_extend_0/w_n120_n750#" "ro_var_extend_0/out2" 184.5
 cap "ro_var_extend_0/out2" "ro_var_extend_0/out3" 100
 cap "ro_var_extend_0/out2" "ro_var_extend_0/out2" 113.031
-cap "ro_var_extend_0/w_n120_n750#" "ro_var_extend_0/out2" 184.5
 cap "ro_var_extend_0/gnd" "ro_var_extend_0/out2" 259.55
-cap "ro_var_extend_0/w_n120_n750#" "ro_var_extend_0/vcont" 214.76
-cap "ro_var_extend_0/vcont" "ro_var_extend_0/w_n120_n750#" -11.167
-cap "ro_var_extend_0/out3" "ro_var_extend_0/gnd" 12.1846
+cap "ro_var_extend_0/vcont" "ro_var_extend_0/w_n120_n750#" 214.76
+cap "ro_var_extend_0/vcont" "ro_var_extend_0/gnd" -11.167
+cap "ro_var_extend_0/out3" "ro_var_extend_0/gnd" 392.251
 merge "cbank_0/a4" "cbank_1/a4" -1801.69 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -154480 -6032 0 0 0 0 0 0 0 0 0 0 0 0
 merge "cbank_1/a4" "cbank_2/a4"
 merge "cbank_2/a4" "a4"
@@ -137,11 +142,11 @@
 merge "cbank_0/a5" "cbank_1/a5" -1833.47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -192400 -6020 0 0 0 0 0 0 0 0 0 0 0 0
 merge "cbank_1/a5" "cbank_2/a5"
 merge "cbank_2/a5" "a5"
-merge "ro_var_extend_0/out3" "cbank_2/v" -4640.75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14880 -132 0 0 -1324370 -18788 33000 -960 33000 -960 0 0 0 0
+merge "ro_var_extend_0/out3" "cbank_2/v" -4733.08 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14880 -132 0 0 -1007200 -18788 33000 -960 33000 -960 0 0 0 0
 merge "cbank_2/v" "li_7140_1400#"
-merge "ro_var_extend_0/out2" "cbank_1/v" -3894.94 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -480 -136 0 0 0 0 -666880 -17168 448800 -960 0 0 0 0
+merge "ro_var_extend_0/out2" "cbank_1/v" -3879.76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -480 -136 0 0 0 0 -616280 -17168 448800 -960 0 0 0 0
 merge "cbank_1/v" "li_4080_1390#"
-merge "ro_var_extend_0/w_n120_n750#" "ro_var_extend_0/gnd" -801.625 0 0 0 0 0 0 0 0 0 0 114560 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112240 0 183420 -1330 112240 0 112240 0 -36020 -4694 0 0 0 0
+merge "ro_var_extend_0/w_n120_n750#" "ro_var_extend_0/gnd" -1380.6 0 0 0 0 0 0 0 0 0 0 337340 -2080 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 314620 -1920 161380 -3848 142140 -2800 142140 -2800 -31640 -8574 0 0 0 0
 merge "ro_var_extend_0/gnd" "cbank_0/gnd!"
 merge "cbank_0/gnd!" "cbank_1/gnd!"
 merge "cbank_1/gnd!" "cbank_2/switch_5/vout"

diff --git a/mag/ro_complete.mag b/mag/ro_complete.mag
index 446673e..a213b17 100644
--- a/mag/ro_complete.mag
+++ b/mag/ro_complete.mag

@@ -1,696 +1,693 @@
 magic
 tech sky130A
-magscale 1 2
-timestamp 1640901950
+timestamp 1640956319
 << error_s >>
-rect 764 1710 855 2110
-rect 7081 1710 7154 2110
-rect 1616 -3178 1796 -2353
-rect 1616 -6718 1796 -5278
-rect 1616 -10288 1796 -8848
+rect 808 -1589 898 -1180
+rect 808 -3359 898 -2639
+rect 808 -5144 898 -4424
 << psubdiff >>
-rect 8630 150 8890 180
-rect 8630 -50 8660 150
-rect 8860 -50 8890 150
-rect 8630 -80 8890 -50
-rect 8630 -510 8890 -480
-rect 8630 -710 8660 -510
-rect 8860 -710 8890 -510
-rect 8630 -740 8890 -710
-rect 8630 -1170 8890 -1140
-rect 8630 -1370 8660 -1170
-rect 8860 -1370 8890 -1170
-rect 8630 -1400 8890 -1370
-rect 8630 -1830 8890 -1800
-rect 8630 -2030 8660 -1830
-rect 8860 -2030 8890 -1830
-rect 8630 -2060 8890 -2030
-rect 8630 -2490 8890 -2460
-rect 8630 -2690 8660 -2490
-rect 8860 -2690 8890 -2490
-rect 8630 -2720 8890 -2690
-rect 8630 -3150 8890 -3120
-rect 8630 -3350 8660 -3150
-rect 8860 -3350 8890 -3150
-rect 8630 -3380 8890 -3350
-rect 8630 -3810 8890 -3780
-rect 8630 -4010 8660 -3810
-rect 8860 -4010 8890 -3810
-rect 8630 -4040 8890 -4010
-rect 8630 -4470 8890 -4440
-rect 8630 -4670 8660 -4470
-rect 8860 -4670 8890 -4470
-rect 8630 -4700 8890 -4670
-rect 8630 -5130 8890 -5100
-rect 8630 -5330 8660 -5130
-rect 8860 -5330 8890 -5130
-rect 8630 -5360 8890 -5330
-rect 8630 -5790 8890 -5760
-rect 8630 -5990 8660 -5790
-rect 8860 -5990 8890 -5790
-rect 8630 -6020 8890 -5990
-rect 8630 -6450 8890 -6420
-rect 8630 -6650 8660 -6450
-rect 8860 -6650 8890 -6450
-rect 8630 -6680 8890 -6650
-rect 8630 -7110 8890 -7080
-rect 8630 -7310 8660 -7110
-rect 8860 -7310 8890 -7110
-rect 8630 -7340 8890 -7310
-rect 8630 -7770 8890 -7740
-rect 8630 -7970 8660 -7770
-rect 8860 -7970 8890 -7770
-rect 8630 -8000 8890 -7970
-rect 8630 -8430 8890 -8400
-rect 8630 -8630 8660 -8430
-rect 8860 -8630 8890 -8430
-rect 8630 -8660 8890 -8630
-rect 8630 -9090 8890 -9060
-rect 8630 -9290 8660 -9090
-rect 8860 -9290 8890 -9090
-rect 8630 -9320 8890 -9290
-rect 8630 -9750 8890 -9720
-rect 8630 -9950 8660 -9750
-rect 8860 -9950 8890 -9750
-rect 8630 -9980 8890 -9950
-rect 7790 -10410 8050 -10380
-rect 7790 -10610 7820 -10410
-rect 8020 -10610 8050 -10410
-rect 7790 -10640 8050 -10610
-rect 8630 -10410 8890 -10380
-rect 8630 -10610 8660 -10410
-rect 8860 -10610 8890 -10410
-rect 8630 -10640 8890 -10610
+rect 4315 75 4445 90
+rect 4315 -25 4330 75
+rect 4430 -25 4445 75
+rect 4315 -40 4445 -25
+rect 4315 -255 4445 -240
+rect 4315 -355 4330 -255
+rect 4430 -355 4445 -255
+rect 4315 -370 4445 -355
+rect 4315 -585 4445 -570
+rect 4315 -685 4330 -585
+rect 4430 -685 4445 -585
+rect 4315 -700 4445 -685
+rect 4315 -915 4445 -900
+rect 4315 -1015 4330 -915
+rect 4430 -1015 4445 -915
+rect 4315 -1030 4445 -1015
+rect 4315 -1245 4445 -1230
+rect 4315 -1345 4330 -1245
+rect 4430 -1345 4445 -1245
+rect 4315 -1360 4445 -1345
+rect 4315 -1575 4445 -1560
+rect 4315 -1675 4330 -1575
+rect 4430 -1675 4445 -1575
+rect 4315 -1690 4445 -1675
+rect 4315 -1905 4445 -1890
+rect 4315 -2005 4330 -1905
+rect 4430 -2005 4445 -1905
+rect 4315 -2020 4445 -2005
+rect 4315 -2235 4445 -2220
+rect 4315 -2335 4330 -2235
+rect 4430 -2335 4445 -2235
+rect 4315 -2350 4445 -2335
+rect 4315 -2565 4445 -2550
+rect 4315 -2665 4330 -2565
+rect 4430 -2665 4445 -2565
+rect 4315 -2680 4445 -2665
+rect 4315 -2895 4445 -2880
+rect 4315 -2995 4330 -2895
+rect 4430 -2995 4445 -2895
+rect 4315 -3010 4445 -2995
+rect 4315 -3225 4445 -3210
+rect 4315 -3325 4330 -3225
+rect 4430 -3325 4445 -3225
+rect 4315 -3340 4445 -3325
+rect 4315 -3555 4445 -3540
+rect 4315 -3655 4330 -3555
+rect 4430 -3655 4445 -3555
+rect 4315 -3670 4445 -3655
+rect 4315 -3885 4445 -3870
+rect 4315 -3985 4330 -3885
+rect 4430 -3985 4445 -3885
+rect 4315 -4000 4445 -3985
+rect 4315 -4215 4445 -4200
+rect 4315 -4315 4330 -4215
+rect 4430 -4315 4445 -4215
+rect 4315 -4330 4445 -4315
+rect 4315 -4545 4445 -4530
+rect 4315 -4645 4330 -4545
+rect 4430 -4645 4445 -4545
+rect 4315 -4660 4445 -4645
+rect 4315 -4875 4445 -4860
+rect 4315 -4975 4330 -4875
+rect 4430 -4975 4445 -4875
+rect 4315 -4990 4445 -4975
+rect 3895 -5205 4025 -5190
+rect 3895 -5305 3910 -5205
+rect 4010 -5305 4025 -5205
+rect 3895 -5320 4025 -5305
+rect 4315 -5205 4445 -5190
+rect 4315 -5305 4330 -5205
+rect 4430 -5305 4445 -5205
+rect 4315 -5320 4445 -5305
 << psubdiffcont >>
-rect 8660 -50 8860 150
-rect 8660 -710 8860 -510
-rect 8660 -1370 8860 -1170
-rect 8660 -2030 8860 -1830
-rect 8660 -2690 8860 -2490
-rect 8660 -3350 8860 -3150
-rect 8660 -4010 8860 -3810
-rect 8660 -4670 8860 -4470
-rect 8660 -5330 8860 -5130
-rect 8660 -5990 8860 -5790
-rect 8660 -6650 8860 -6450
-rect 8660 -7310 8860 -7110
-rect 8660 -7970 8860 -7770
-rect 8660 -8630 8860 -8430
-rect 8660 -9290 8860 -9090
-rect 8660 -9950 8860 -9750
-rect 7820 -10610 8020 -10410
-rect 8660 -10610 8860 -10410
+rect 4330 -25 4430 75
+rect 4330 -355 4430 -255
+rect 4330 -685 4430 -585
+rect 4330 -1015 4430 -915
+rect 4330 -1345 4430 -1245
+rect 4330 -1675 4430 -1575
+rect 4330 -2005 4430 -1905
+rect 4330 -2335 4430 -2235
+rect 4330 -2665 4430 -2565
+rect 4330 -2995 4430 -2895
+rect 4330 -3325 4430 -3225
+rect 4330 -3655 4430 -3555
+rect 4330 -3985 4430 -3885
+rect 4330 -4315 4430 -4215
+rect 4330 -4645 4430 -4545
+rect 4330 -4975 4430 -4875
+rect 3910 -5305 4010 -5205
+rect 4330 -5305 4430 -5205
 << locali >>
-rect 7440 1500 7620 1520
-rect 1330 1480 1470 1500
-rect 1330 1460 1350 1480
-rect 1010 1400 1350 1460
-rect 1330 1380 1350 1400
-rect 1450 1380 1470 1480
-rect 4420 1470 4560 1490
-rect 4420 1450 4440 1470
-rect 4080 1390 4440 1450
-rect 1330 1360 1470 1380
-rect 4420 1370 4440 1390
-rect 4540 1370 4560 1470
-rect 7440 1460 7460 1500
-rect 7140 1400 7460 1460
-rect 4420 1350 4560 1370
-rect 7440 1360 7460 1400
-rect 7600 1360 7620 1500
-rect 7440 1340 7620 1360
-rect 8640 150 8880 170
-rect 8640 -50 8660 150
-rect 8860 -50 8880 150
-rect 8640 -70 8880 -50
-rect 8640 -510 8880 -490
-rect 8640 -710 8660 -510
-rect 8860 -710 8880 -510
-rect 8640 -730 8880 -710
-rect 8640 -1170 8880 -1150
-rect 8640 -1370 8660 -1170
-rect 8860 -1370 8880 -1170
-rect 8640 -1390 8880 -1370
-rect 1916 -1680 2286 -1610
-rect 2924 -1680 3264 -1610
-rect 3872 -1680 4242 -1610
-rect 4852 -1680 5212 -1610
-rect 5834 -1680 6194 -1610
-rect 6856 -1680 7386 -1610
-rect 2216 -5150 2286 -1680
-rect 3194 -5150 3264 -1680
-rect 4172 -5150 4242 -1680
-rect 5142 -5150 5212 -1680
-rect 6124 -5150 6194 -1680
-rect 7316 -5150 7386 -1680
-rect 8640 -1830 8880 -1810
-rect 8640 -2030 8660 -1830
-rect 8860 -2030 8880 -1830
-rect 8640 -2050 8880 -2030
-rect 8640 -2490 8880 -2470
-rect 8640 -2690 8660 -2490
-rect 8860 -2690 8880 -2490
-rect 8640 -2710 8880 -2690
-rect 8640 -3150 8880 -3130
-rect 8640 -3350 8660 -3150
-rect 8860 -3350 8880 -3150
-rect 8640 -3370 8880 -3350
-rect 8640 -3810 8880 -3790
-rect 8640 -4010 8660 -3810
-rect 8860 -4010 8880 -3810
-rect 8640 -4030 8880 -4010
-rect 8640 -4470 8880 -4450
-rect 8640 -4670 8660 -4470
-rect 8860 -4670 8880 -4470
-rect 8640 -4690 8880 -4670
-rect 1916 -5220 2286 -5150
-rect 2924 -5220 3264 -5150
-rect 3872 -5220 4242 -5150
-rect 4852 -5220 5212 -5150
-rect 5834 -5220 6194 -5150
-rect 6856 -5220 7386 -5150
-rect 2216 -8720 2286 -5220
-rect 3194 -8720 3264 -5220
-rect 4172 -8720 4242 -5220
-rect 5142 -8720 5212 -5220
-rect 6124 -8720 6194 -5220
-rect 7316 -8720 7386 -5220
-rect 8640 -5130 8880 -5110
-rect 8640 -5330 8660 -5130
-rect 8860 -5330 8880 -5130
-rect 8640 -5350 8880 -5330
-rect 8640 -5790 8880 -5770
-rect 8640 -5990 8660 -5790
-rect 8860 -5990 8880 -5790
-rect 8640 -6010 8880 -5990
-rect 8640 -6450 8880 -6430
-rect 8640 -6650 8660 -6450
-rect 8860 -6650 8880 -6450
-rect 8640 -6670 8880 -6650
-rect 8640 -7110 8880 -7090
-rect 8640 -7310 8660 -7110
-rect 8860 -7310 8880 -7110
-rect 8640 -7330 8880 -7310
-rect 8640 -7770 8880 -7750
-rect 8640 -7970 8660 -7770
-rect 8860 -7970 8880 -7770
-rect 8640 -7990 8880 -7970
-rect 8640 -8430 8880 -8410
-rect 8640 -8630 8660 -8430
-rect 8860 -8630 8880 -8430
-rect 8640 -8650 8880 -8630
-rect 1916 -8790 2286 -8720
-rect 2924 -8790 3264 -8720
-rect 3872 -8790 4242 -8720
-rect 4852 -8790 5212 -8720
-rect 5834 -8790 6194 -8720
-rect 6856 -8790 7386 -8720
-rect 8640 -9090 8880 -9070
-rect 8640 -9290 8660 -9090
-rect 8860 -9290 8880 -9090
-rect 8640 -9310 8880 -9290
-rect 8640 -9750 8880 -9730
-rect 8640 -9950 8660 -9750
-rect 8860 -9950 8880 -9750
-rect 8640 -9970 8880 -9950
-rect 7800 -10410 8040 -10390
-rect 7800 -10610 7820 -10410
-rect 8020 -10610 8040 -10410
-rect 7800 -10630 8040 -10610
-rect 8640 -10410 8880 -10390
-rect 8640 -10610 8660 -10410
-rect 8860 -10610 8880 -10410
-rect 8640 -10630 8880 -10610
+rect 3720 750 3810 760
+rect 665 740 735 750
+rect 665 730 675 740
+rect 505 700 675 730
+rect 665 690 675 700
+rect 725 690 735 740
+rect 2210 735 2280 745
+rect 2210 725 2220 735
+rect 2040 695 2220 725
+rect 665 680 735 690
+rect 2210 685 2220 695
+rect 2270 685 2280 735
+rect 3720 730 3730 750
+rect 3570 700 3730 730
+rect 2210 675 2280 685
+rect 3720 680 3730 700
+rect 3800 680 3810 750
+rect 3720 670 3810 680
+rect 4320 75 4440 85
+rect 4320 -25 4330 75
+rect 4430 -25 4440 75
+rect 4320 -35 4440 -25
+rect 4320 -255 4440 -245
+rect 4320 -355 4330 -255
+rect 4430 -355 4440 -255
+rect 4320 -365 4440 -355
+rect 4320 -585 4440 -575
+rect 4320 -685 4330 -585
+rect 4430 -685 4440 -585
+rect 4320 -695 4440 -685
+rect 958 -840 1143 -805
+rect 1462 -840 1632 -805
+rect 1936 -840 2121 -805
+rect 2426 -840 2606 -805
+rect 2917 -840 3097 -805
+rect 3428 -840 3693 -805
+rect 1108 -2575 1143 -840
+rect 1597 -2575 1632 -840
+rect 2086 -2575 2121 -840
+rect 2571 -2575 2606 -840
+rect 3062 -2575 3097 -840
+rect 3658 -2575 3693 -840
+rect 4320 -915 4440 -905
+rect 4320 -1015 4330 -915
+rect 4430 -1015 4440 -915
+rect 4320 -1025 4440 -1015
+rect 4320 -1245 4440 -1235
+rect 4320 -1345 4330 -1245
+rect 4430 -1345 4440 -1245
+rect 4320 -1355 4440 -1345
+rect 4320 -1575 4440 -1565
+rect 4320 -1675 4330 -1575
+rect 4430 -1675 4440 -1575
+rect 4320 -1685 4440 -1675
+rect 4320 -1905 4440 -1895
+rect 4320 -2005 4330 -1905
+rect 4430 -2005 4440 -1905
+rect 4320 -2015 4440 -2005
+rect 4320 -2235 4440 -2225
+rect 4320 -2335 4330 -2235
+rect 4430 -2335 4440 -2235
+rect 4320 -2345 4440 -2335
+rect 958 -2610 1143 -2575
+rect 1462 -2610 1632 -2575
+rect 1936 -2610 2121 -2575
+rect 2426 -2610 2606 -2575
+rect 2917 -2610 3097 -2575
+rect 3428 -2610 3693 -2575
+rect 1108 -4360 1143 -2610
+rect 1597 -4360 1632 -2610
+rect 2086 -4360 2121 -2610
+rect 2571 -4360 2606 -2610
+rect 3062 -4360 3097 -2610
+rect 3658 -4360 3693 -2610
+rect 4320 -2565 4440 -2555
+rect 4320 -2665 4330 -2565
+rect 4430 -2665 4440 -2565
+rect 4320 -2675 4440 -2665
+rect 4320 -2895 4440 -2885
+rect 4320 -2995 4330 -2895
+rect 4430 -2995 4440 -2895
+rect 4320 -3005 4440 -2995
+rect 4320 -3225 4440 -3215
+rect 4320 -3325 4330 -3225
+rect 4430 -3325 4440 -3225
+rect 4320 -3335 4440 -3325
+rect 4320 -3555 4440 -3545
+rect 4320 -3655 4330 -3555
+rect 4430 -3655 4440 -3555
+rect 4320 -3665 4440 -3655
+rect 4320 -3885 4440 -3875
+rect 4320 -3985 4330 -3885
+rect 4430 -3985 4440 -3885
+rect 4320 -3995 4440 -3985
+rect 4320 -4215 4440 -4205
+rect 4320 -4315 4330 -4215
+rect 4430 -4315 4440 -4215
+rect 4320 -4325 4440 -4315
+rect 958 -4395 1143 -4360
+rect 1462 -4395 1632 -4360
+rect 1936 -4395 2121 -4360
+rect 2426 -4395 2606 -4360
+rect 2917 -4395 3097 -4360
+rect 3428 -4395 3693 -4360
+rect 4320 -4545 4440 -4535
+rect 4320 -4645 4330 -4545
+rect 4430 -4645 4440 -4545
+rect 4320 -4655 4440 -4645
+rect 4320 -4875 4440 -4865
+rect 4320 -4975 4330 -4875
+rect 4430 -4975 4440 -4875
+rect 4320 -4985 4440 -4975
+rect 3900 -5205 4020 -5195
+rect 3900 -5305 3910 -5205
+rect 4010 -5305 4020 -5205
+rect 3900 -5315 4020 -5305
+rect 4320 -5205 4440 -5195
+rect 4320 -5305 4330 -5205
+rect 4430 -5305 4440 -5205
+rect 4320 -5315 4440 -5305
 << viali >>
-rect 1350 1380 1450 1480
-rect 4440 1370 4540 1470
-rect 7460 1360 7600 1500
-rect 8660 -50 8860 150
-rect 8660 -710 8860 -510
-rect 8660 -1370 8860 -1170
-rect 8660 -2030 8860 -1830
-rect 8660 -2690 8860 -2490
-rect 8660 -3350 8860 -3150
-rect 8660 -4010 8860 -3810
-rect 8660 -4670 8860 -4470
-rect 8660 -5330 8860 -5130
-rect 8660 -5990 8860 -5790
-rect 8660 -6650 8860 -6450
-rect 8660 -7310 8860 -7110
-rect 8660 -7970 8860 -7770
-rect 8660 -8630 8860 -8430
-rect 8660 -9290 8860 -9090
-rect 8660 -9950 8860 -9750
-rect 7820 -10610 8020 -10410
-rect 8660 -10610 8860 -10410
+rect 675 690 725 740
+rect 2220 685 2270 735
+rect 3730 680 3800 750
+rect 4330 -25 4430 75
+rect 4330 -355 4430 -255
+rect 4330 -685 4430 -585
+rect 4330 -1015 4430 -915
+rect 4330 -1345 4430 -1245
+rect 4330 -1675 4430 -1575
+rect 4330 -2005 4430 -1905
+rect 4330 -2335 4430 -2235
+rect 4330 -2665 4430 -2565
+rect 4330 -2995 4430 -2895
+rect 4330 -3325 4430 -3225
+rect 4330 -3655 4430 -3555
+rect 4330 -3985 4430 -3885
+rect 4330 -4315 4430 -4215
+rect 4330 -4645 4430 -4545
+rect 4330 -4975 4430 -4875
+rect 3910 -5305 4010 -5205
+rect 4330 -5305 4430 -5205
 << metal1 >>
-rect 7440 1500 7620 1520
-rect 1330 1480 1470 1500
-rect 1330 1380 1350 1480
-rect 1450 1380 1470 1480
-rect 1330 1360 1470 1380
-rect 4420 1470 4560 1490
-rect 4420 1370 4440 1470
-rect 4540 1370 4560 1470
-rect 4420 1350 4560 1370
-rect 7440 1360 7460 1500
-rect 7600 1360 7620 1500
-rect 7440 1340 7620 1360
-rect 8650 860 8870 870
-rect 8650 850 8660 860
-rect 7180 670 8660 850
-rect 8650 660 8660 670
-rect 8860 660 8870 860
-rect 8650 650 8870 660
-rect 8640 150 8880 170
-rect 8640 -50 8660 150
-rect 8860 -50 8880 150
-rect 8640 -70 8880 -50
-rect 8640 -510 8880 -490
-rect 8640 -710 8660 -510
-rect 8860 -710 8880 -510
-rect 8640 -730 8880 -710
-rect 8640 -1170 8880 -1150
-rect 8640 -1370 8660 -1170
-rect 8860 -1370 8880 -1170
-rect 8640 -1390 8880 -1370
-rect 8640 -1830 8880 -1810
-rect 8640 -2030 8660 -1830
-rect 8860 -2030 8880 -1830
-rect 8640 -2050 8880 -2030
-rect 8640 -2490 8880 -2470
-rect 8640 -2690 8660 -2490
-rect 8860 -2690 8880 -2490
-rect 8640 -2710 8880 -2690
-rect 8640 -3150 8880 -3130
-rect 8640 -3350 8660 -3150
-rect 8860 -3350 8880 -3150
-rect 8640 -3370 8880 -3350
-rect 8640 -3810 8880 -3790
-rect 8640 -4010 8660 -3810
-rect 8860 -4010 8880 -3810
-rect 8640 -4030 8880 -4010
-rect 8640 -4470 8880 -4450
-rect 8640 -4670 8660 -4470
-rect 8860 -4670 8880 -4470
-rect 8640 -4690 8880 -4670
-rect 8640 -5130 8880 -5110
-rect 8640 -5330 8660 -5130
-rect 8860 -5330 8880 -5130
-rect 8640 -5350 8880 -5330
-rect 8640 -5790 8880 -5770
-rect 8640 -5990 8660 -5790
-rect 8860 -5990 8880 -5790
-rect 8640 -6010 8880 -5990
-rect 8640 -6450 8880 -6430
-rect 8640 -6650 8660 -6450
-rect 8860 -6650 8880 -6450
-rect 8640 -6670 8880 -6650
-rect 8640 -7110 8880 -7090
-rect 8640 -7310 8660 -7110
-rect 8860 -7310 8880 -7110
-rect 8640 -7330 8880 -7310
-rect 8640 -7770 8880 -7750
-rect 8640 -7970 8660 -7770
-rect 8860 -7970 8880 -7770
-rect 8640 -7990 8880 -7970
-rect 8640 -8430 8880 -8410
-rect 8640 -8630 8660 -8430
-rect 8860 -8630 8880 -8430
-rect 8640 -8650 8880 -8630
-rect 8640 -9090 8880 -9070
-rect 8640 -9290 8660 -9090
-rect 8860 -9290 8880 -9090
-rect 8640 -9310 8880 -9290
-rect 8640 -9750 8880 -9730
-rect 8640 -9950 8660 -9750
-rect 8860 -9950 8880 -9750
-rect 8640 -9970 8880 -9950
-rect 7800 -10410 8040 -10390
-rect 7800 -10610 7820 -10410
-rect 8020 -10610 8040 -10410
-rect 7800 -10630 8040 -10610
-rect 8640 -10410 8880 -10390
-rect 8640 -10610 8660 -10410
-rect 8860 -10610 8880 -10410
-rect 8640 -10630 8880 -10610
+rect 3720 750 3810 760
+rect 665 740 735 750
+rect 665 690 675 740
+rect 725 690 735 740
+rect 665 680 735 690
+rect 2210 735 2280 745
+rect 2210 685 2220 735
+rect 2270 685 2280 735
+rect 2210 675 2280 685
+rect 3720 680 3730 750
+rect 3800 680 3810 750
+rect 3720 670 3810 680
+rect 4325 430 4435 435
+rect 4325 425 4330 430
+rect 3590 335 4330 425
+rect 4325 330 4330 335
+rect 4430 330 4435 430
+rect 4325 325 4435 330
+rect 4320 75 4440 85
+rect 4320 -25 4330 75
+rect 4430 -25 4440 75
+rect 4320 -35 4440 -25
+rect 4320 -255 4440 -245
+rect 4320 -355 4330 -255
+rect 4430 -355 4440 -255
+rect 4320 -365 4440 -355
+rect 4320 -585 4440 -575
+rect 4320 -685 4330 -585
+rect 4430 -685 4440 -585
+rect 4320 -695 4440 -685
+rect 4320 -915 4440 -905
+rect 4320 -1015 4330 -915
+rect 4430 -1015 4440 -915
+rect 4320 -1025 4440 -1015
+rect 4320 -1245 4440 -1235
+rect 4320 -1345 4330 -1245
+rect 4430 -1345 4440 -1245
+rect 4320 -1355 4440 -1345
+rect 4320 -1575 4440 -1565
+rect 4320 -1675 4330 -1575
+rect 4430 -1675 4440 -1575
+rect 4320 -1685 4440 -1675
+rect 4320 -1905 4440 -1895
+rect 4320 -2005 4330 -1905
+rect 4430 -2005 4440 -1905
+rect 4320 -2015 4440 -2005
+rect 4320 -2235 4440 -2225
+rect 4320 -2335 4330 -2235
+rect 4430 -2335 4440 -2235
+rect 4320 -2345 4440 -2335
+rect 4320 -2565 4440 -2555
+rect 4320 -2665 4330 -2565
+rect 4430 -2665 4440 -2565
+rect 4320 -2675 4440 -2665
+rect 4320 -2895 4440 -2885
+rect 4320 -2995 4330 -2895
+rect 4430 -2995 4440 -2895
+rect 4320 -3005 4440 -2995
+rect 4320 -3225 4440 -3215
+rect 4320 -3325 4330 -3225
+rect 4430 -3325 4440 -3225
+rect 4320 -3335 4440 -3325
+rect 4320 -3555 4440 -3545
+rect 4320 -3655 4330 -3555
+rect 4430 -3655 4440 -3555
+rect 4320 -3665 4440 -3655
+rect 4320 -3885 4440 -3875
+rect 4320 -3985 4330 -3885
+rect 4430 -3985 4440 -3885
+rect 4320 -3995 4440 -3985
+rect 4320 -4215 4440 -4205
+rect 4320 -4315 4330 -4215
+rect 4430 -4315 4440 -4215
+rect 4320 -4325 4440 -4315
+rect 4320 -4545 4440 -4535
+rect 4320 -4645 4330 -4545
+rect 4430 -4645 4440 -4545
+rect 4320 -4655 4440 -4645
+rect 4320 -4875 4440 -4865
+rect 4320 -4975 4330 -4875
+rect 4430 -4975 4440 -4875
+rect 4320 -4985 4440 -4975
+rect 3900 -5205 4020 -5195
+rect 3900 -5305 3910 -5205
+rect 4010 -5305 4020 -5205
+rect 3900 -5315 4020 -5305
+rect 4320 -5205 4440 -5195
+rect 4320 -5305 4330 -5205
+rect 4430 -5305 4440 -5205
+rect 4320 -5315 4440 -5305
 << via1 >>
-rect 1350 1380 1450 1480
-rect 4440 1370 4540 1470
-rect 7460 1360 7600 1500
-rect 8660 660 8860 860
-rect 8660 -50 8860 150
-rect 8660 -710 8860 -510
-rect 8660 -1370 8860 -1170
-rect 8660 -2030 8860 -1830
-rect 8660 -2690 8860 -2490
-rect 8660 -3350 8860 -3150
-rect 8660 -4010 8860 -3810
-rect 8660 -4670 8860 -4470
-rect 8660 -5330 8860 -5130
-rect 8660 -5990 8860 -5790
-rect 8660 -6650 8860 -6450
-rect 8660 -7310 8860 -7110
-rect 8660 -7970 8860 -7770
-rect 8660 -8630 8860 -8430
-rect 8660 -9290 8860 -9090
-rect 8660 -9950 8860 -9750
-rect 7820 -10610 8020 -10410
-rect 8660 -10610 8860 -10410
+rect 675 690 725 740
+rect 2220 685 2270 735
+rect 3730 680 3800 750
+rect 4330 330 4430 430
+rect 4330 -25 4430 75
+rect 4330 -355 4430 -255
+rect 4330 -685 4430 -585
+rect 4330 -1015 4430 -915
+rect 4330 -1345 4430 -1245
+rect 4330 -1675 4430 -1575
+rect 4330 -2005 4430 -1905
+rect 4330 -2335 4430 -2235
+rect 4330 -2665 4430 -2565
+rect 4330 -2995 4430 -2895
+rect 4330 -3325 4430 -3225
+rect 4330 -3655 4430 -3555
+rect 4330 -3985 4430 -3885
+rect 4330 -4315 4430 -4215
+rect 4330 -4645 4430 -4545
+rect 4330 -4975 4430 -4875
+rect 3910 -5305 4010 -5205
+rect 4330 -5305 4430 -5205
 << metal2 >>
-rect 7420 1500 8240 1550
-rect 1330 1480 1470 1500
-rect 1330 1380 1350 1480
-rect 1450 1380 1470 1480
-rect 1330 1360 1470 1380
-rect 4420 1470 4560 1490
-rect 4420 1370 4440 1470
-rect 4540 1370 4560 1470
-rect 4420 1350 4560 1370
-rect 7420 1360 7460 1500
-rect 7600 1360 8240 1500
-rect 7420 1310 8240 1360
-rect 8000 -7410 8240 1310
-rect 8650 860 8870 870
-rect 8650 660 8660 860
-rect 8860 660 8870 860
-rect 8650 650 8870 660
-rect 8640 150 8880 170
-rect 8640 -50 8660 150
-rect 8860 -50 8880 150
-rect 8640 -70 8880 -50
-rect 8640 -510 8880 -490
-rect 8640 -710 8660 -510
-rect 8860 -710 8880 -510
-rect 8640 -730 8880 -710
-rect 8640 -1170 8880 -1150
-rect 8640 -1370 8660 -1170
-rect 8860 -1370 8880 -1170
-rect 8640 -1390 8880 -1370
-rect 8640 -1830 8880 -1810
-rect 8640 -2030 8660 -1830
-rect 8860 -2030 8880 -1830
-rect 8640 -2050 8880 -2030
-rect 8640 -2490 8880 -2470
-rect 8640 -2690 8660 -2490
-rect 8860 -2690 8880 -2490
-rect 8640 -2710 8880 -2690
-rect 8640 -3150 8880 -3130
-rect 8640 -3350 8660 -3150
-rect 8860 -3350 8880 -3150
-rect 8640 -3370 8880 -3350
-rect 8640 -3810 8880 -3790
-rect 8640 -4010 8660 -3810
-rect 8860 -4010 8880 -3810
-rect 8640 -4030 8880 -4010
-rect 8640 -4470 8880 -4450
-rect 8640 -4670 8660 -4470
-rect 8860 -4670 8880 -4470
-rect 8640 -4690 8880 -4670
-rect 8640 -5130 8880 -5110
-rect 8640 -5330 8660 -5130
-rect 8860 -5330 8880 -5130
-rect 8640 -5350 8880 -5330
-rect 8640 -5790 8880 -5770
-rect 8640 -5990 8660 -5790
-rect 8860 -5990 8880 -5790
-rect 8640 -6010 8880 -5990
-rect 8640 -6450 8880 -6430
-rect 8640 -6650 8660 -6450
-rect 8860 -6650 8880 -6450
-rect 8640 -6670 8880 -6650
-rect 8640 -7110 8880 -7090
-rect 8640 -7310 8660 -7110
-rect 8860 -7310 8880 -7110
-rect 8640 -7330 8880 -7310
-rect 6916 -7430 8240 -7410
-rect 6916 -7630 6936 -7430
-rect 7136 -7630 8240 -7430
-rect 6916 -7650 8240 -7630
-rect 8640 -7770 8880 -7750
-rect 8640 -7970 8660 -7770
-rect 8860 -7970 8880 -7770
-rect 8640 -7990 8880 -7970
-rect 8640 -8430 8880 -8410
-rect 8640 -8630 8660 -8430
-rect 8860 -8630 8880 -8430
-rect 8640 -8650 8880 -8630
-rect 8640 -9090 8880 -9070
-rect 8640 -9290 8660 -9090
-rect 8860 -9290 8880 -9090
-rect 8640 -9310 8880 -9290
-rect 8640 -9750 8880 -9730
-rect 8640 -9950 8660 -9750
-rect 8860 -9950 8880 -9750
-rect 8640 -9970 8880 -9950
-rect 7800 -10410 8040 -10390
-rect 7800 -10610 7820 -10410
-rect 8020 -10610 8040 -10410
-rect 7800 -10630 8040 -10610
-rect 8640 -10410 8880 -10390
-rect 8640 -10610 8660 -10410
-rect 8860 -10610 8880 -10410
-rect 8640 -10630 8880 -10610
+rect 3710 750 4120 775
+rect 665 740 735 750
+rect 665 690 675 740
+rect 725 690 735 740
+rect 665 680 735 690
+rect 2210 735 2280 745
+rect 2210 685 2220 735
+rect 2270 685 2280 735
+rect 2210 675 2280 685
+rect 3710 680 3730 750
+rect 3800 680 4120 750
+rect 3710 655 4120 680
+rect 4000 -3705 4120 655
+rect 4325 430 4435 435
+rect 4325 330 4330 430
+rect 4430 330 4435 430
+rect 4325 325 4435 330
+rect 4320 75 4440 85
+rect 4320 -25 4330 75
+rect 4430 -25 4440 75
+rect 4320 -35 4440 -25
+rect 4320 -255 4440 -245
+rect 4320 -355 4330 -255
+rect 4430 -355 4440 -255
+rect 4320 -365 4440 -355
+rect 4320 -585 4440 -575
+rect 4320 -685 4330 -585
+rect 4430 -685 4440 -585
+rect 4320 -695 4440 -685
+rect 4320 -915 4440 -905
+rect 4320 -1015 4330 -915
+rect 4430 -1015 4440 -915
+rect 4320 -1025 4440 -1015
+rect 4320 -1245 4440 -1235
+rect 4320 -1345 4330 -1245
+rect 4430 -1345 4440 -1245
+rect 4320 -1355 4440 -1345
+rect 4320 -1575 4440 -1565
+rect 4320 -1675 4330 -1575
+rect 4430 -1675 4440 -1575
+rect 4320 -1685 4440 -1675
+rect 4320 -1905 4440 -1895
+rect 4320 -2005 4330 -1905
+rect 4430 -2005 4440 -1905
+rect 4320 -2015 4440 -2005
+rect 4320 -2235 4440 -2225
+rect 4320 -2335 4330 -2235
+rect 4430 -2335 4440 -2235
+rect 4320 -2345 4440 -2335
+rect 4320 -2565 4440 -2555
+rect 4320 -2665 4330 -2565
+rect 4430 -2665 4440 -2565
+rect 4320 -2675 4440 -2665
+rect 4320 -2895 4440 -2885
+rect 4320 -2995 4330 -2895
+rect 4430 -2995 4440 -2895
+rect 4320 -3005 4440 -2995
+rect 4320 -3225 4440 -3215
+rect 4320 -3325 4330 -3225
+rect 4430 -3325 4440 -3225
+rect 4320 -3335 4440 -3325
+rect 4320 -3555 4440 -3545
+rect 4320 -3655 4330 -3555
+rect 4430 -3655 4440 -3555
+rect 4320 -3665 4440 -3655
+rect 3458 -3715 4120 -3705
+rect 3458 -3815 3468 -3715
+rect 3568 -3815 4120 -3715
+rect 3458 -3825 4120 -3815
+rect 4320 -3885 4440 -3875
+rect 4320 -3985 4330 -3885
+rect 4430 -3985 4440 -3885
+rect 4320 -3995 4440 -3985
+rect 4320 -4215 4440 -4205
+rect 4320 -4315 4330 -4215
+rect 4430 -4315 4440 -4215
+rect 4320 -4325 4440 -4315
+rect 4320 -4545 4440 -4535
+rect 4320 -4645 4330 -4545
+rect 4430 -4645 4440 -4545
+rect 4320 -4655 4440 -4645
+rect 4320 -4875 4440 -4865
+rect 4320 -4975 4330 -4875
+rect 4430 -4975 4440 -4875
+rect 4320 -4985 4440 -4975
+rect 3900 -5205 4020 -5195
+rect 3900 -5305 3910 -5205
+rect 4010 -5305 4020 -5205
+rect 3900 -5315 4020 -5305
+rect 4320 -5205 4440 -5195
+rect 4320 -5305 4330 -5205
+rect 4430 -5305 4440 -5205
+rect 4320 -5315 4440 -5305
 << via2 >>
-rect 1350 1380 1450 1480
-rect 4440 1370 4540 1470
-rect 8660 660 8860 860
-rect 8660 -50 8860 150
-rect 8660 -710 8860 -510
-rect 8660 -1370 8860 -1170
-rect 8660 -2030 8860 -1830
-rect 8660 -2690 8860 -2490
-rect 8660 -3350 8860 -3150
-rect 8660 -4010 8860 -3810
-rect 8660 -4670 8860 -4470
-rect 8660 -5330 8860 -5130
-rect 8660 -5990 8860 -5790
-rect 8660 -6650 8860 -6450
-rect 8660 -7310 8860 -7110
-rect 6936 -7630 7136 -7430
-rect 8660 -7970 8860 -7770
-rect 8660 -8630 8860 -8430
-rect 8660 -9290 8860 -9090
-rect 8660 -9950 8860 -9750
-rect 7820 -10610 8020 -10410
-rect 8660 -10610 8860 -10410
+rect 675 690 725 740
+rect 2220 685 2270 735
+rect 4330 330 4430 430
+rect 4330 -25 4430 75
+rect 4330 -355 4430 -255
+rect 4330 -685 4430 -585
+rect 4330 -1015 4430 -915
+rect 4330 -1345 4430 -1245
+rect 4330 -1675 4430 -1575
+rect 4330 -2005 4430 -1905
+rect 4330 -2335 4430 -2235
+rect 4330 -2665 4430 -2565
+rect 4330 -2995 4430 -2895
+rect 4330 -3325 4430 -3225
+rect 4330 -3655 4430 -3555
+rect 3468 -3815 3568 -3715
+rect 4330 -3985 4430 -3885
+rect 4330 -4315 4430 -4215
+rect 4330 -4645 4430 -4545
+rect 4330 -4975 4430 -4875
+rect 3910 -5305 4010 -5205
+rect 4330 -5305 4430 -5205
 << metal3 >>
-rect 1330 1480 1470 1500
-rect 1330 1380 1350 1480
-rect 1450 1380 1470 1480
-rect 1330 1360 1470 1380
-rect 4390 1470 4590 1520
-rect 4390 1370 4440 1470
-rect 4540 1370 4590 1470
-rect 4390 420 4590 1370
-rect 8650 860 8870 870
-rect 8650 660 8660 860
-rect 8860 660 8870 860
-rect 8650 650 8870 660
-rect 4390 220 7780 420
-rect 7580 -3840 7780 220
-rect 8640 150 8880 170
-rect 8640 -50 8660 150
-rect 8860 -50 8880 150
-rect 8640 -70 8880 -50
-rect 8640 -510 8880 -490
-rect 8640 -710 8660 -510
-rect 8860 -710 8880 -510
-rect 8640 -730 8880 -710
-rect 8640 -1170 8880 -1150
-rect 8640 -1370 8660 -1170
-rect 8860 -1370 8880 -1170
-rect 8640 -1390 8880 -1370
-rect 8640 -1830 8880 -1810
-rect 8640 -2030 8660 -1830
-rect 8860 -2030 8880 -1830
-rect 8640 -2050 8880 -2030
-rect 8640 -2490 8880 -2470
-rect 8640 -2690 8660 -2490
-rect 8860 -2690 8880 -2490
-rect 8640 -2710 8880 -2690
-rect 8640 -3150 8880 -3130
-rect 8640 -3350 8660 -3150
-rect 8860 -3350 8880 -3150
-rect 8640 -3370 8880 -3350
-rect 6906 -3860 7780 -3840
-rect 6906 -4060 6926 -3860
-rect 7126 -4060 7780 -3860
-rect 8640 -3810 8880 -3790
-rect 8640 -4010 8660 -3810
-rect 8860 -4010 8880 -3810
-rect 8640 -4030 8880 -4010
-rect 6906 -4080 7780 -4060
-rect 8640 -4470 8880 -4450
-rect 8640 -4670 8660 -4470
-rect 8860 -4670 8880 -4470
-rect 8640 -4690 8880 -4670
-rect 8640 -5130 8880 -5110
-rect 8640 -5330 8660 -5130
-rect 8860 -5330 8880 -5130
-rect 8640 -5350 8880 -5330
-rect 8640 -5790 8880 -5770
-rect 8640 -5990 8660 -5790
-rect 8860 -5990 8880 -5790
-rect 8640 -6010 8880 -5990
-rect 8640 -6450 8880 -6430
-rect 8640 -6650 8660 -6450
-rect 8860 -6650 8880 -6450
-rect 8640 -6670 8880 -6650
-rect 8640 -7110 8880 -7090
-rect 8640 -7310 8660 -7110
-rect 8860 -7310 8880 -7110
-rect 8640 -7330 8880 -7310
-rect 6916 -7430 7156 -7410
-rect 6916 -7630 6936 -7430
-rect 7136 -7630 7156 -7430
-rect 6916 -7650 7156 -7630
-rect 8640 -7770 8880 -7750
-rect 8640 -7970 8660 -7770
-rect 8860 -7970 8880 -7770
-rect 8640 -7990 8880 -7970
-rect 8640 -8430 8880 -8410
-rect 8640 -8630 8660 -8430
-rect 8860 -8630 8880 -8430
-rect 8640 -8650 8880 -8630
-rect 8640 -9090 8880 -9070
-rect 8640 -9290 8660 -9090
-rect 8860 -9290 8880 -9090
-rect 8640 -9310 8880 -9290
-rect 8640 -9750 8880 -9730
-rect 8640 -9950 8660 -9750
-rect 8860 -9950 8880 -9750
-rect 8640 -9970 8880 -9950
-rect 7800 -10410 8040 -10390
-rect 7800 -10610 7820 -10410
-rect 8020 -10610 8040 -10410
-rect 7800 -10630 8040 -10610
-rect 8640 -10410 8880 -10390
-rect 8640 -10610 8660 -10410
-rect 8860 -10610 8880 -10410
-rect 8640 -10630 8880 -10610
+rect 665 740 735 750
+rect 665 690 675 740
+rect 725 690 735 740
+rect 665 680 735 690
+rect 2195 735 2295 760
+rect 2195 685 2220 735
+rect 2270 685 2295 735
+rect 2195 210 2295 685
+rect 4325 430 4435 435
+rect 4325 330 4330 430
+rect 4430 330 4435 430
+rect 4325 325 4435 330
+rect 2195 110 3890 210
+rect 3790 -1920 3890 110
+rect 4320 75 4440 85
+rect 4320 -25 4330 75
+rect 4430 -25 4440 75
+rect 4320 -35 4440 -25
+rect 4320 -255 4440 -245
+rect 4320 -355 4330 -255
+rect 4430 -355 4440 -255
+rect 4320 -365 4440 -355
+rect 4320 -585 4440 -575
+rect 4320 -685 4330 -585
+rect 4430 -685 4440 -585
+rect 4320 -695 4440 -685
+rect 4320 -915 4440 -905
+rect 4320 -1015 4330 -915
+rect 4430 -1015 4440 -915
+rect 4320 -1025 4440 -1015
+rect 4320 -1245 4440 -1235
+rect 4320 -1345 4330 -1245
+rect 4430 -1345 4440 -1245
+rect 4320 -1355 4440 -1345
+rect 4320 -1575 4440 -1565
+rect 4320 -1675 4330 -1575
+rect 4430 -1675 4440 -1575
+rect 4320 -1685 4440 -1675
+rect 3453 -1930 3890 -1920
+rect 3453 -2030 3463 -1930
+rect 3563 -2030 3890 -1930
+rect 4320 -1905 4440 -1895
+rect 4320 -2005 4330 -1905
+rect 4430 -2005 4440 -1905
+rect 4320 -2015 4440 -2005
+rect 3453 -2040 3890 -2030
+rect 4320 -2235 4440 -2225
+rect 4320 -2335 4330 -2235
+rect 4430 -2335 4440 -2235
+rect 4320 -2345 4440 -2335
+rect 4320 -2565 4440 -2555
+rect 4320 -2665 4330 -2565
+rect 4430 -2665 4440 -2565
+rect 4320 -2675 4440 -2665
+rect 4320 -2895 4440 -2885
+rect 4320 -2995 4330 -2895
+rect 4430 -2995 4440 -2895
+rect 4320 -3005 4440 -2995
+rect 4320 -3225 4440 -3215
+rect 4320 -3325 4330 -3225
+rect 4430 -3325 4440 -3225
+rect 4320 -3335 4440 -3325
+rect 4320 -3555 4440 -3545
+rect 4320 -3655 4330 -3555
+rect 4430 -3655 4440 -3555
+rect 4320 -3665 4440 -3655
+rect 3458 -3715 3578 -3705
+rect 3458 -3815 3468 -3715
+rect 3568 -3815 3578 -3715
+rect 3458 -3825 3578 -3815
+rect 4320 -3885 4440 -3875
+rect 4320 -3985 4330 -3885
+rect 4430 -3985 4440 -3885
+rect 4320 -3995 4440 -3985
+rect 4320 -4215 4440 -4205
+rect 4320 -4315 4330 -4215
+rect 4430 -4315 4440 -4215
+rect 4320 -4325 4440 -4315
+rect 4320 -4545 4440 -4535
+rect 4320 -4645 4330 -4545
+rect 4430 -4645 4440 -4545
+rect 4320 -4655 4440 -4645
+rect 4320 -4875 4440 -4865
+rect 4320 -4975 4330 -4875
+rect 4430 -4975 4440 -4875
+rect 4320 -4985 4440 -4975
+rect 3900 -5205 4020 -5195
+rect 3900 -5305 3910 -5205
+rect 4010 -5305 4020 -5205
+rect 3900 -5315 4020 -5305
+rect 4320 -5205 4440 -5195
+rect 4320 -5305 4330 -5205
+rect 4430 -5305 4440 -5205
+rect 4320 -5315 4440 -5305
 << via3 >>
-rect 1350 1380 1450 1480
-rect 8660 660 8860 860
-rect 8660 -50 8860 150
-rect 8660 -710 8860 -510
-rect 8660 -1370 8860 -1170
-rect 8660 -2030 8860 -1830
-rect 8660 -2690 8860 -2490
-rect 8660 -3350 8860 -3150
-rect 6926 -4060 7126 -3860
-rect 8660 -4010 8860 -3810
-rect 8660 -4670 8860 -4470
-rect 8660 -5330 8860 -5130
-rect 8660 -5990 8860 -5790
-rect 8660 -6650 8860 -6450
-rect 8660 -7310 8860 -7110
-rect 6936 -7630 7136 -7430
-rect 8660 -7970 8860 -7770
-rect 8660 -8630 8860 -8430
-rect 8660 -9290 8860 -9090
-rect 8660 -9950 8860 -9750
-rect 7820 -10610 8020 -10410
-rect 8660 -10610 8860 -10410
+rect 675 690 725 740
+rect 4330 330 4430 430
+rect 4330 -25 4430 75
+rect 4330 -355 4430 -255
+rect 4330 -685 4430 -585
+rect 4330 -1015 4430 -915
+rect 4330 -1345 4430 -1245
+rect 4330 -1675 4430 -1575
+rect 3463 -2030 3563 -1930
+rect 4330 -2005 4430 -1905
+rect 4330 -2335 4430 -2235
+rect 4330 -2665 4430 -2565
+rect 4330 -2995 4430 -2895
+rect 4330 -3325 4430 -3225
+rect 4330 -3655 4430 -3555
+rect 3468 -3815 3568 -3715
+rect 4330 -3985 4430 -3885
+rect 4330 -4315 4430 -4215
+rect 4330 -4645 4430 -4545
+rect 4330 -4975 4430 -4875
+rect 3910 -5305 4010 -5205
+rect 4330 -5305 4430 -5205
 << metal4 >>
-rect 1330 1480 1470 1500
-rect 1330 1380 1350 1480
-rect 1450 1380 1470 1480
-rect 1330 1360 1470 1380
-rect 1350 -410 1450 1360
-rect 8610 860 8910 930
-rect 8610 660 8660 860
-rect 8860 660 8910 860
-rect 8610 150 8910 660
-rect 8610 -50 8660 150
-rect 8860 -50 8910 150
-rect 8610 -510 8910 -50
-rect 8610 -710 8660 -510
-rect 8860 -710 8910 -510
-rect 8610 -1170 8910 -710
-rect 8610 -1370 8660 -1170
-rect 8860 -1370 8910 -1170
-rect 8610 -1830 8910 -1370
-rect 8610 -2030 8660 -1830
-rect 8860 -2030 8910 -1830
-rect 8610 -2490 8910 -2030
-rect 8610 -2690 8660 -2490
-rect 8860 -2690 8910 -2490
-rect 8610 -3150 8910 -2690
-rect 8610 -3250 8660 -3150
-rect 8170 -3350 8660 -3250
-rect 8860 -3350 8910 -3150
-rect 8170 -3550 8910 -3350
-rect 8610 -3810 8910 -3550
-rect 6906 -3860 7146 -3840
-rect 6906 -4060 6926 -3860
-rect 7126 -4060 7146 -3860
-rect 6906 -4080 7146 -4060
-rect 8610 -4010 8660 -3810
-rect 8860 -4010 8910 -3810
-rect 8610 -4470 8910 -4010
-rect 8610 -4670 8660 -4470
-rect 8860 -4670 8910 -4470
-rect 8610 -5130 8910 -4670
-rect 8610 -5330 8660 -5130
-rect 8860 -5330 8910 -5130
-rect 8610 -5790 8910 -5330
-rect 8610 -5990 8660 -5790
-rect 8860 -5990 8910 -5790
-rect 8610 -6450 8910 -5990
-rect 8610 -6650 8660 -6450
-rect 8860 -6650 8910 -6450
-rect 8610 -6790 8910 -6650
-rect 8190 -7090 8910 -6790
-rect 8610 -7110 8910 -7090
-rect 8610 -7310 8660 -7110
-rect 8860 -7310 8910 -7110
-rect 6916 -7430 7156 -7410
-rect 6916 -7630 6936 -7430
-rect 7136 -7630 7156 -7430
-rect 6916 -7650 7156 -7630
-rect 8610 -7770 8910 -7310
-rect 8610 -7970 8660 -7770
-rect 8860 -7970 8910 -7770
-rect 8610 -8430 8910 -7970
-rect 8610 -8630 8660 -8430
-rect 8860 -8630 8910 -8430
-rect 8610 -9090 8910 -8630
-rect 8610 -9290 8660 -9090
-rect 8860 -9290 8910 -9090
-rect 8610 -9750 8910 -9290
-rect 8610 -9950 8660 -9750
-rect 8860 -9950 8910 -9750
-rect 8610 -10360 8910 -9950
-rect 7770 -10410 8070 -10360
-rect 7770 -10610 7820 -10410
-rect 8020 -10610 8070 -10410
-rect 7770 -10660 8070 -10610
-rect 8190 -10410 8910 -10360
-rect 8190 -10610 8660 -10410
-rect 8860 -10610 8910 -10410
-rect 8190 -10660 8910 -10610
-use cbank  cbank_0
-timestamp 1640901595
-transform 1 0 -84 0 1 -1870
-box -30 -1680 8150 1550
-use cbank  cbank_2
-timestamp 1640901595
-transform 1 0 -84 0 1 -8980
-box -30 -1680 8150 1550
+rect 665 740 735 750
+rect 665 690 675 740
+rect 725 690 735 740
+rect 665 680 735 690
+rect 675 -205 725 680
+rect 4305 430 4455 465
+rect 4305 330 4330 430
+rect 4430 330 4455 430
+rect 4305 75 4455 330
+rect 4305 -25 4330 75
+rect 4430 -25 4455 75
+rect 4305 -255 4455 -25
+rect 4305 -355 4330 -255
+rect 4430 -355 4455 -255
+rect 4305 -585 4455 -355
+rect 4305 -685 4330 -585
+rect 4430 -685 4455 -585
+rect 4305 -915 4455 -685
+rect 4305 -1015 4330 -915
+rect 4430 -1015 4455 -915
+rect 4305 -1245 4455 -1015
+rect 4305 -1345 4330 -1245
+rect 4430 -1345 4455 -1245
+rect 4305 -1575 4455 -1345
+rect 4305 -1625 4330 -1575
+rect 4085 -1675 4330 -1625
+rect 4430 -1675 4455 -1575
+rect 4085 -1775 4455 -1675
+rect 4305 -1905 4455 -1775
+rect 3453 -1930 3573 -1920
+rect 3453 -2030 3463 -1930
+rect 3563 -2030 3573 -1930
+rect 3453 -2040 3573 -2030
+rect 4305 -2005 4330 -1905
+rect 4430 -2005 4455 -1905
+rect 4305 -2235 4455 -2005
+rect 4305 -2335 4330 -2235
+rect 4430 -2335 4455 -2235
+rect 4305 -2565 4455 -2335
+rect 4305 -2665 4330 -2565
+rect 4430 -2665 4455 -2565
+rect 4305 -2895 4455 -2665
+rect 4305 -2995 4330 -2895
+rect 4430 -2995 4455 -2895
+rect 4305 -3225 4455 -2995
+rect 4305 -3325 4330 -3225
+rect 4430 -3325 4455 -3225
+rect 4305 -3395 4455 -3325
+rect 4095 -3545 4455 -3395
+rect 4305 -3555 4455 -3545
+rect 4305 -3655 4330 -3555
+rect 4430 -3655 4455 -3555
+rect 3458 -3715 3578 -3705
+rect 3458 -3815 3468 -3715
+rect 3568 -3815 3578 -3715
+rect 3458 -3825 3578 -3815
+rect 4305 -3885 4455 -3655
+rect 4305 -3985 4330 -3885
+rect 4430 -3985 4455 -3885
+rect 4305 -4215 4455 -3985
+rect 4305 -4315 4330 -4215
+rect 4430 -4315 4455 -4215
+rect 4305 -4545 4455 -4315
+rect 4305 -4645 4330 -4545
+rect 4430 -4645 4455 -4545
+rect 4305 -4875 4455 -4645
+rect 4305 -4975 4330 -4875
+rect 4430 -4975 4455 -4875
+rect 4305 -5180 4455 -4975
+rect 3885 -5205 4035 -5180
+rect 3885 -5305 3910 -5205
+rect 4010 -5305 4035 -5205
+rect 3885 -5330 4035 -5305
+rect 4095 -5205 4455 -5180
+rect 4095 -5305 4330 -5205
+rect 4430 -5305 4455 -5205
+rect 4095 -5330 4455 -5305
+use ro_var_extend  ro_var_extend_0
+timestamp 1640956303
+transform 1 0 487 0 1 675
+box -375 -595 3780 765
 use cbank  cbank_1
 timestamp 1640901595
-transform 1 0 -84 0 1 -5410
-box -30 -1680 8150 1550
-use ro_var_extend  ro_var_extend_0
-timestamp 1640901061
-transform 1 0 974 0 1 1350
-box -250 -800 6290 1010
+transform 1 0 -42 0 1 -2705
+box -15 -840 4075 775
+use cbank  cbank_2
+timestamp 1640901595
+transform 1 0 -42 0 1 -4490
+box -15 -840 4075 775
+use cbank  cbank_0
+timestamp 1640901595
+transform 1 0 -42 0 1 -935
+box -15 -840 4075 775
 << labels >>
-rlabel locali 2246 -1650 2246 -1650 1 a0
-rlabel locali 3234 -1660 3234 -1660 1 a1
-rlabel locali 7346 -1650 7346 -1650 1 a5
-rlabel locali 6144 -1650 6144 -1650 1 a4
-rlabel locali 5182 -1650 5182 -1650 1 a3
-rlabel locali 4202 -1670 4202 -1670 1 a2
+rlabel locali 1123 -825 1123 -825 1 a0
+rlabel locali 1617 -830 1617 -830 1 a1
+rlabel locali 3673 -825 3673 -825 1 a5
+rlabel locali 3072 -825 3072 -825 1 a4
+rlabel locali 2591 -825 2591 -825 1 a3
+rlabel locali 2101 -835 2101 -835 1 a2
 << end >>

diff --git a/mag/ro_var_extend.ext b/mag/ro_var_extend.ext
index 5ad4d81..4a57b02 100644
--- a/mag/ro_var_extend.ext
+++ b/mag/ro_var_extend.ext

@@ -1,4 +1,4 @@
-timestamp 1640901061
+timestamp 1640956303
 version 8.3
 tech sky130A
 style ngspice()
@@ -7,23 +7,23 @@
 parameters sky130_fd_pr__nfet_01v8 l=l w=w a1=as p1=ps a2=ad p2=pd
 parameters sky130_fd_pr__pfet_01v8 l=l w=w a1=as p1=ps a2=ad p2=pd
 parameters sky130_fd_pr__cap_var_lvt l=l w=w a1=as a2=ad p1=ps p2=pd
-node "vcont" 61 117.546 6256 -680 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5780 408 0 0 0 0 0 0 0 0 0 0 0 0
+node "vcont" 61 123.78 6256 -680 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5780 408 0 0 0 0 0 0 0 0 0 0 0 0
 node "out2" 2945 4489.03 2976 -468 p 0 0 0 0 0 0 0 0 20000 600 40000 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 70084 2720 0 0 240124 7740 240088 7712 0 0 0 0 0 0 0 0 0 0
-node "out1" 2948 5587.45 -50 -20 ndif 0 0 0 0 0 0 0 0 20000 600 40000 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 70084 2720 0 0 240084 7768 367400 7548 0 0 0 0 0 0 0 0 0 0
-node "out3" 2411 3978.99 -190 220 p 0 0 0 0 0 0 0 0 20000 600 40000 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 70084 2720 0 0 76164 2368 111640 2644 647000 13140 0 0 0 0 0 0 0 0
-node "w_n120_n750#" 20671 4290.8 -120 -750 nw 0 0 0 0 363304 4204 0 0 116400 3564 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 37536 2616 1153264 13180 0 0 0 0 0 0 0 0 0 0
-node "vdd" 20170 17140.2 -250 320 nw 0 0 0 0 4464300 14320 0 0 35200 860 120000 3000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1276520 16068 0 0 0 0 0 0 0 0 0 0 0 0
-substrate "gnd" 0 0 -210 -20 ndif 0 0 0 0 0 0 0 0 60000 1800 117400 3220 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1050720 15848 0 0 0 0 0 0 0 0 0 0 0 0
-cap "out1" "out2" 40.8506
+node "out1" 2948 5653.45 -50 -20 ndif 0 0 0 0 0 0 0 0 20000 600 40000 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 70084 2720 0 0 240084 7768 367400 7548 0 0 0 0 0 0 0 0 0 0
+node "out3" 2411 3990.47 -190 220 p 0 0 0 0 0 0 0 0 20000 600 40000 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 70084 2720 0 0 76164 2368 111640 2644 647000 13140 0 0 0 0 0 0 0 0
+node "w_n120_n750#" 20671 4346.02 -120 -750 nw 0 0 0 0 363304 4204 0 0 116400 3564 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 37536 2616 1153264 13180 0 0 0 0 0 0 0 0 0 0
+node "vdd" 20170 18367.8 -250 320 nw 0 0 0 0 4464300 14320 0 0 35200 860 120000 3000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1276520 16068 0 0 0 0 0 0 0 0 0 0 0 0
+substrate "gnd" 0 0 -710 -890 ppd 0 0 0 0 0 0 0 0 60000 1800 1604600 26100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7902720 57188 0 0 0 0 0 0 0 0 0 0 0 0
 cap "out3" "out2" 1263.05
+cap "w_n120_n750#" "out2" 789.263
 cap "out3" "out1" 1156.32
-cap "vcont" "w_n120_n750#" 140.194
-cap "out2" "w_n120_n750#" 789.263
-cap "out1" "w_n120_n750#" 569.035
-cap "out2" "vdd" 235.622
-cap "out3" "w_n120_n750#" 215.464
-cap "out1" "vdd" 230.66
-cap "out3" "vdd" 230.554
+cap "w_n120_n750#" "out1" 569.035
+cap "vdd" "out2" 235.622
+cap "vdd" "out1" 230.66
+cap "w_n120_n750#" "out3" 215.464
+cap "vdd" "out3" 230.554
+cap "w_n120_n750#" "vcont" 140.194
+cap "out1" "out2" 40.8506
 device subckt sky130_fd_pr__cap_var_lvt 5955 -694 5956 -693 l=36 w=200 "w_n120_n750#" "out3" 72 0 "w_n120_n750#" 400 0
 device subckt sky130_fd_pr__cap_var_lvt 2991 -690 2992 -689 l=36 w=200 "w_n120_n750#" "out2" 72 0 "w_n120_n750#" 400 0
 device subckt sky130_fd_pr__cap_var_lvt 17 -688 18 -687 l=36 w=200 "w_n120_n750#" "out1" 72 0 "w_n120_n750#" 400 0

diff --git a/mag/ro_var_extend.mag b/mag/ro_var_extend.mag
index 7b0da5b..4afb2cd 100644
--- a/mag/ro_var_extend.mag
+++ b/mag/ro_var_extend.mag

@@ -1,10 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1640901061
-<< error_p >>
-rect -210 360 -119 760
-rect 6107 360 6180 760
+timestamp 1640956303
 << nwell >>
 rect -250 320 6220 1010
 rect -120 -750 190 -360
@@ -184,6 +181,54 @@
 rect 6112 500 6152 540
 rect 6112 400 6152 440
 << psubdiff >>
+rect -350 1470 -90 1500
+rect -710 1300 -450 1330
+rect -710 1100 -680 1300
+rect -480 1100 -450 1300
+rect -350 1270 -320 1470
+rect -120 1270 -90 1470
+rect -350 1240 -90 1270
+rect 630 1470 890 1500
+rect 630 1270 660 1470
+rect 860 1270 890 1470
+rect 630 1240 890 1270
+rect 1610 1470 1870 1500
+rect 1610 1270 1640 1470
+rect 1840 1270 1870 1470
+rect 1610 1240 1870 1270
+rect 2590 1470 2850 1500
+rect 2590 1270 2620 1470
+rect 2820 1270 2850 1470
+rect 2590 1240 2850 1270
+rect 3570 1470 3830 1500
+rect 3570 1270 3600 1470
+rect 3800 1270 3830 1470
+rect 3570 1240 3830 1270
+rect 4550 1470 4810 1500
+rect 4550 1270 4580 1470
+rect 4780 1270 4810 1470
+rect 4550 1240 4810 1270
+rect 5530 1470 5790 1500
+rect 5530 1270 5560 1470
+rect 5760 1270 5790 1470
+rect 5530 1240 5790 1270
+rect 6510 1470 6770 1500
+rect 6510 1270 6540 1470
+rect 6740 1270 6770 1470
+rect 6510 1240 6770 1270
+rect 7270 1300 7530 1330
+rect -710 1070 -450 1100
+rect 7270 1100 7300 1300
+rect 7500 1100 7530 1300
+rect 7270 1070 7530 1100
+rect -710 320 -450 350
+rect -710 120 -680 320
+rect -480 120 -450 320
+rect 7270 320 7530 350
+rect -710 90 -450 120
+rect 7270 120 7300 320
+rect 7500 120 7530 320
+rect 7270 90 7530 120
 rect 0 -120 230 -90
 rect 0 -170 30 -120
 rect 200 -170 230 -120
@@ -200,10 +245,50 @@
 rect 2624 -340 2654 -270
 rect 2724 -340 2754 -270
 rect 2624 -370 2754 -340
+rect -710 -660 -450 -630
+rect -710 -860 -680 -660
+rect -480 -860 -450 -660
 rect 2624 -650 2754 -620
 rect 2624 -720 2654 -650
 rect 2724 -720 2754 -650
+rect 7270 -660 7530 -630
 rect 2624 -750 2754 -720
+rect -710 -890 -450 -860
+rect 7270 -860 7300 -660
+rect 7500 -860 7530 -660
+rect 7270 -890 7530 -860
+rect -320 -920 -60 -890
+rect -320 -1120 -290 -920
+rect -90 -1120 -60 -920
+rect -320 -1150 -60 -1120
+rect 660 -920 920 -890
+rect 660 -1120 690 -920
+rect 890 -1120 920 -920
+rect 660 -1150 920 -1120
+rect 1640 -920 1900 -890
+rect 1640 -1120 1670 -920
+rect 1870 -1120 1900 -920
+rect 1640 -1150 1900 -1120
+rect 2620 -920 2880 -890
+rect 2620 -1120 2650 -920
+rect 2850 -1120 2880 -920
+rect 2620 -1150 2880 -1120
+rect 3600 -920 3860 -890
+rect 3600 -1120 3630 -920
+rect 3830 -1120 3860 -920
+rect 3600 -1150 3860 -1120
+rect 4580 -920 4840 -890
+rect 4580 -1120 4610 -920
+rect 4810 -1120 4840 -920
+rect 4580 -1150 4840 -1120
+rect 5560 -920 5820 -890
+rect 5560 -1120 5590 -920
+rect 5790 -1120 5820 -920
+rect 5560 -1150 5820 -1120
+rect 6540 -920 6800 -890
+rect 6540 -1120 6570 -920
+rect 6770 -1120 6800 -920
+rect 6540 -1150 6800 -1120
 << nsubdiff >>
 rect 2834 950 3154 970
 rect 2834 880 2864 950
@@ -234,11 +319,33 @@
 rect 6076 -670 6088 -518
 rect 5991 -694 6088 -670
 << psubdiffcont >>
+rect -680 1100 -480 1300
+rect -320 1270 -120 1470
+rect 660 1270 860 1470
+rect 1640 1270 1840 1470
+rect 2620 1270 2820 1470
+rect 3600 1270 3800 1470
+rect 4580 1270 4780 1470
+rect 5560 1270 5760 1470
+rect 6540 1270 6740 1470
+rect 7300 1100 7500 1300
+rect -680 120 -480 320
+rect 7300 120 7500 320
 rect 30 -170 200 -120
 rect 2854 -180 3094 -120
 rect 5700 -170 5870 -120
 rect 2654 -340 2724 -270
+rect -680 -860 -480 -660
 rect 2654 -720 2724 -650
+rect 7300 -860 7500 -660
+rect -290 -1120 -90 -920
+rect 690 -1120 890 -920
+rect 1670 -1120 1870 -920
+rect 2650 -1120 2850 -920
+rect 3630 -1120 3830 -920
+rect 4610 -1120 4810 -920
+rect 5590 -1120 5790 -920
+rect 6570 -1120 6770 -920
 << nsubdiffcont >>
 rect 2864 880 3124 950
 rect -68 -664 -34 -512
@@ -298,6 +405,24 @@
 rect 2992 -452 3026 -418
 rect 5956 -456 5990 -422
 << locali >>
+rect -750 1470 7560 1530
+rect -750 1300 -320 1470
+rect -750 1100 -680 1300
+rect -480 1270 -320 1300
+rect -120 1270 660 1470
+rect 860 1270 1640 1470
+rect 1840 1270 2620 1470
+rect 2820 1270 3600 1470
+rect 3800 1270 4580 1470
+rect 4780 1270 5560 1470
+rect 5760 1270 6540 1470
+rect 6740 1300 7560 1470
+rect 6740 1270 7300 1300
+rect -480 1200 7300 1270
+rect -480 1100 -420 1200
+rect -750 320 -420 1100
+rect 7230 1100 7300 1200
+rect 7500 1100 7560 1300
 rect -250 950 6220 1010
 rect -250 880 2864 950
 rect 3124 880 6220 950
@@ -329,6 +454,8 @@
 rect -40 440 40 500
 rect -40 400 -20 440
 rect 20 400 40 440
+rect -750 120 -680 320
+rect -480 120 -420 320
 rect -190 290 -110 300
 rect -190 230 -180 290
 rect -120 230 -110 290
@@ -387,6 +514,7 @@
 rect 6152 400 6172 440
 rect 6090 370 6172 400
 rect -40 230 2884 290
+rect -750 -660 -420 120
 rect -200 150 -120 170
 rect -200 110 -180 150
 rect -140 110 -120 150
@@ -397,6 +525,7 @@
 rect -40 150 40 230
 rect 3034 290 3114 370
 rect 6090 310 6170 370
+rect 7230 320 7560 1100
 rect 3034 230 5940 290
 rect 3034 170 3114 230
 rect 6090 210 6190 310
@@ -435,6 +564,8 @@
 rect 6090 10 6112 50
 rect 6152 10 6172 50
 rect 6090 -10 6172 10
+rect 7230 120 7300 320
+rect 7500 120 7560 320
 rect 2874 -80 2954 -10
 rect 5930 -80 6010 -10
 rect -230 -120 6220 -80
@@ -450,6 +581,8 @@
 rect 2724 -340 2764 -270
 rect 2 -450 18 -416
 rect 52 -450 68 -416
+rect -750 -860 -680 -660
+rect -480 -860 -420 -660
 rect -68 -512 -34 -496
 rect -68 -680 -34 -664
 rect 104 -512 138 -496
@@ -470,7 +603,22 @@
 rect 6042 -518 6076 -502
 rect 6042 -686 6076 -670
 rect 6256 -680 6290 -510
+rect 7230 -660 7560 120
 rect 2614 -800 2764 -720
+rect 2620 -860 2750 -800
+rect 7230 -860 7300 -660
+rect 7500 -860 7560 -660
+rect -750 -920 7560 -860
+rect -750 -1120 -290 -920
+rect -90 -1120 690 -920
+rect 890 -1120 1670 -920
+rect 1870 -1120 2650 -920
+rect 2850 -1120 3630 -920
+rect 3830 -1120 4610 -920
+rect 4810 -1120 5590 -920
+rect 5790 -1120 6570 -920
+rect 6770 -1120 7560 -920
+rect -750 -1190 7560 -1120
 << viali >>
 rect -180 280 -120 290
 rect -180 240 -170 280

diff --git a/mag/switch.ext b/mag/switch.ext
index fadf98e..b5399a5 100644
--- a/mag/switch.ext
+++ b/mag/switch.ext

@@ -9,7 +9,7 @@
 node "vin" 1082 0 -190 0 ndif 0 0 0 0 0 0 0 0 259200 3240 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 196000 3080 0 0 0 0 0 0 0 0 0 0 0 0
 node "vcont" 1139 384.82 -40 1460 p 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124600 3560 0 0 19600 560 0 0 0 0 0 0 0 0 0 0 0 0
 substrate "VSUBS" 0 0 -1073741817 -1073741817 space 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-cap "vin" "vout" 420
 cap "vcont" "vout" 16.5
 cap "vcont" "vin" 8.25
+cap "vin" "vout" 420
 device msubckt sky130_fd_pr__nfet_01v8 -10 0 -9 1 l=70 w=1440 "VSUBS" "vcont" 140 0 "vin" 1440 0 "vout" 1440 0

diff --git a/mag/tspc.ext b/mag/tspc.ext
index 0e565d8..2f7fa47 100644
--- a/mag/tspc.ext
+++ b/mag/tspc.ext

@@ -1,4 +1,4 @@
-timestamp 1640710665
+timestamp 1640957762
 version 8.3
 tech sky130A
 style ngspice()
@@ -6,10 +6,8 @@
 resistclasses 4400000 2200000 1700000 3050000 120000 197000 114000 191000 120000 197000 114000 191000 48200 319800 2000000 48200 48200 12200 125 125 47 47 29 5
 parameters sky130_fd_pr__nfet_01v8 l=l w=w a1=as p1=ps a2=ad p2=pd
 parameters sky130_fd_pr__pfet_01v8 l=l w=w a1=as p1=ps a2=ad p2=pd
-node "gnd!" 12 145.32 540 -1130 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14400 480 0 0 0 0 0 0 0 0 0 0 0 0
-node "vdd!" 12 132 210 710 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14400 480 0 0 0 0 0 0 0 0 0 0 0 0
 node "a_630_n680#" 1081 523.53 630 -680 ndif 0 0 0 0 0 0 0 0 32000 1120 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 38200 1520 21000 1160 0 0 0 0 0 0 0 0 0 0
-node "GND" 2907 2347.63 -120 -680 ndif 0 0 0 0 0 0 0 0 84000 2740 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 114900 4300 25600 1280 25600 1280 40000 1600 124600 3800 0 0 0 0
+node "gnd!" 2907 2360.79 -120 -680 ndif 0 0 0 0 0 0 0 0 84000 2740 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 114900 4300 25600 1280 25600 1280 40000 1600 153400 3840 0 0 0 0
 node "Z4" 1570 408.187 130 -680 ndif 0 0 0 0 0 0 0 0 57600 1760 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 58700 2100 33400 1820 0 0 0 0 0 0 0 0 0 0
 node "Q" 2876 612.45 1160 -20 pdif 0 0 0 0 0 0 0 0 32000 960 64000 1760 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 105400 3380 0 0 0 0 0 0 0 0 0 0 0 0
 node "Z3" 3758 1322.86 240 -680 ndif 0 0 0 0 0 0 0 0 28800 880 46400 1320 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 33200 2000 0 0 108400 4040 24200 1240 0 0 0 0 0 0 0 0 0 0
@@ -17,71 +15,66 @@
 node "Z1" 3420 407 50 -20 pdif 0 0 0 0 0 0 0 0 0 0 89600 2560 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 82900 2600 0 0 0 0 0 0 0 0 0 0 0 0
 node "a_300_n150#" 4405 1377.57 300 -150 p 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89700 5660 0 0 37800 1660 6400 320 27200 1260 0 0 0 0 0 0 0 0
 node "D" 1793 737.785 -40 -720 p 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 38000 2320 0 0 32000 1480 0 0 0 0 0 0 0 0 0 0 0 0
-node "a_n60_n20#" 7516 2851.75 -60 -20 pdif 0 0 0 0 0 0 0 0 0 0 179200 5120 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 203700 6980 22400 1200 32000 1440 43200 1680 147600 4620 0 0 0 0
+node "vdd!" 7516 2851.75 -60 -20 pdif 0 0 0 0 0 0 0 0 0 0 179200 5120 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 203700 6980 22400 1200 32000 1440 43200 1680 147600 4620 0 0 0 0
 node "a_740_n680#" 3851 1353.54 740 -680 ndif 0 0 0 0 0 0 0 0 16000 560 24000 760 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 53200 3440 0 0 51300 2040 67500 3960 0 0 0 0 0 0 0 0 0 0
-node "w_n140_n70#" 2649 4440 -140 -70 nw 0 0 0 0 1480000 4960 0 0 9000 380 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-substrate "a_540_n1120#" 0 0 540 -1120 ppd 0 0 0 0 0 0 0 0 0 0 13200 460 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-cap "a_300_n150#" "GND" 22.7597
-cap "Z1" "Z4" 3.38462
-cap "a_n60_n20#" "vdd!" 16.7381
-cap "D" "GND" 27.9314
-cap "a_300_n150#" "Z4" 118.945
+node "w_n140_n70#" 2516 4440 -140 -70 nw 0 0 0 0 1480000 4960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+substrate "VSUBS" 0 0 -1073741817 -1073741817 space 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 cap "Z2" "Z3" 161.5
-cap "D" "Z4" 97.7372
 cap "Z1" "Z3" 62.0085
-cap "a_n60_n20#" "Z4" 7.7
 cap "Z1" "Z2" 1068.12
 cap "a_300_n150#" "Z3" 446.312
 cap "D" "Z3" 46.1286
-cap "a_n60_n20#" "Q" 607.82
 cap "a_300_n150#" "Z2" 110.226
-cap "a_n60_n20#" "Z3" 671.367
+cap "vdd!" "Z3" 671.367
 cap "D" "Z2" 91.0218
 cap "D" "Z1" 26.4
-cap "a_n60_n20#" "Z2" 359.159
-cap "a_n60_n20#" "Z1" 583.229
-cap "D" "a_300_n150#" 132.679
-cap "a_n60_n20#" "a_300_n150#" 20.3736
-cap "a_n60_n20#" "D" 19.4229
-cap "w_n140_n70#" "a_740_n680#" 18.5775
-cap "a_740_n680#" "a_630_n680#" 190.867
-cap "w_n140_n70#" "vdd!" 13.32
-cap "a_630_n680#" "gnd!" 4
-cap "a_740_n680#" "GND" 224.895
-cap "a_740_n680#" "Z4" 82.0167
-cap "Z4" "gnd!" 3
-cap "a_740_n680#" "Q" 178.823
-cap "GND" "a_630_n680#" 610.469
-cap "w_n140_n70#" "Q" 6.845
+cap "vdd!" "Z2" 359.159
 cap "a_740_n680#" "Z3" 334.495
-cap "Z4" "a_630_n680#" 121.707
+cap "vdd!" "Z1" 583.229
 cap "w_n140_n70#" "Z3" 2.3125
-cap "Q" "a_630_n680#" 36.6667
-cap "Z4" "GND" 441.644
+cap "D" "a_300_n150#" 132.679
+cap "vdd!" "a_300_n150#" 20.3736
 cap "w_n140_n70#" "Z2" 14.44
-cap "Z3" "a_630_n680#" 54.2903
-cap "Q" "GND" 289.808
 cap "a_740_n680#" "a_300_n150#" 12.4103
+cap "vdd!" "D" 19.4229
 cap "w_n140_n70#" "Z1" 4.1625
-cap "Z2" "a_630_n680#" 6.6
-cap "Z3" "GND" 265.176
-cap "Z1" "vdd!" 13.5882
 cap "w_n140_n70#" "a_300_n150#" 0.665
+cap "Z3" "a_630_n680#" 54.2903
+cap "Z2" "a_630_n680#" 6.6
+cap "Z3" "gnd!" 265.176
+cap "a_740_n680#" "vdd!" 515.003
 cap "Z3" "Z4" 651.52
-cap "Z2" "GND" 156.712
-cap "a_740_n680#" "a_n60_n20#" 515.003
+cap "Z2" "gnd!" 156.712
+cap "w_n140_n70#" "vdd!" 85.4425
 cap "Z2" "Z4" 361.112
 cap "a_300_n150#" "a_630_n680#" 9.625
 cap "Z3" "Q" 52.8649
-cap "w_n140_n70#" "a_n60_n20#" 85.4425
-device msubckt sky130_fd_pr__nfet_01v8 1210 -680 1211 -679 l=30 w=400 "a_540_n1120#" "a_740_n680#" 60 0 "GND" 400 0 "Q" 400 0
-device msubckt sky130_fd_pr__nfet_01v8 960 -680 961 -679 l=30 w=200 "a_540_n1120#" "Z3" 60 0 "GND" 200 0 "a_630_n680#" 200 0
-device msubckt sky130_fd_pr__nfet_01v8 710 -680 711 -679 l=30 w=200 "a_540_n1120#" "a_300_n150#" 60 0 "a_630_n680#" 200 0 "a_740_n680#" 200 0
-device msubckt sky130_fd_pr__nfet_01v8 460 -680 461 -679 l=30 w=360 "a_540_n1120#" "a_300_n150#" 60 0 "GND" 360 0 "Z4" 360 0
-device msubckt sky130_fd_pr__nfet_01v8 210 -680 211 -679 l=30 w=360 "a_540_n1120#" "Z2" 60 0 "Z4" 360 0 "Z3" 360 0
-device msubckt sky130_fd_pr__nfet_01v8 -40 -680 -39 -679 l=30 w=90 "a_540_n1120#" "D" 60 0 "GND" 90 0 "Z2" 90 0
-device msubckt sky130_fd_pr__pfet_01v8 1130 -20 1131 -19 l=30 w=800 "w_n140_n70#" "a_740_n680#" 60 0 "a_n60_n20#" 800 0 "Q" 800 0
-device msubckt sky130_fd_pr__pfet_01v8 860 -20 861 -19 l=30 w=300 "w_n140_n70#" "Z3" 60 0 "a_n60_n20#" 300 0 "a_740_n680#" 300 0
-device msubckt sky130_fd_pr__pfet_01v8 580 -20 581 -19 l=30 w=580 "w_n140_n70#" "a_300_n150#" 60 0 "a_n60_n20#" 580 0 "Z3" 580 0
+cap "w_n140_n70#" "a_740_n680#" 18.5775
+cap "a_300_n150#" "gnd!" 22.7597
+cap "Z1" "Z4" 3.38462
+cap "D" "gnd!" 27.9314
+cap "a_300_n150#" "Z4" 118.945
+cap "a_740_n680#" "a_630_n680#" 190.867
+cap "D" "Z4" 97.7372
+cap "a_740_n680#" "gnd!" 224.895
+cap "vdd!" "Z4" 7.7
+cap "a_740_n680#" "Z4" 82.0167
+cap "vdd!" "Q" 607.82
+cap "a_740_n680#" "Q" 178.823
+cap "w_n140_n70#" "Q" 6.845
+cap "gnd!" "a_630_n680#" 610.469
+cap "Z4" "a_630_n680#" 121.707
+cap "Q" "a_630_n680#" 36.6667
+cap "Z4" "gnd!" 441.644
+cap "Q" "gnd!" 289.808
+device msubckt sky130_fd_pr__nfet_01v8 1210 -680 1211 -679 l=30 w=400 "VSUBS" "a_740_n680#" 60 0 "gnd!" 400 0 "Q" 400 0
+device msubckt sky130_fd_pr__nfet_01v8 960 -680 961 -679 l=30 w=200 "VSUBS" "Z3" 60 0 "gnd!" 200 0 "a_630_n680#" 200 0
+device msubckt sky130_fd_pr__nfet_01v8 710 -680 711 -679 l=30 w=200 "VSUBS" "a_300_n150#" 60 0 "a_630_n680#" 200 0 "a_740_n680#" 200 0
+device msubckt sky130_fd_pr__nfet_01v8 460 -680 461 -679 l=30 w=360 "VSUBS" "a_300_n150#" 60 0 "gnd!" 360 0 "Z4" 360 0
+device msubckt sky130_fd_pr__nfet_01v8 210 -680 211 -679 l=30 w=360 "VSUBS" "Z2" 60 0 "Z4" 360 0 "Z3" 360 0
+device msubckt sky130_fd_pr__nfet_01v8 -40 -680 -39 -679 l=30 w=90 "VSUBS" "D" 60 0 "gnd!" 90 0 "Z2" 90 0
+device msubckt sky130_fd_pr__pfet_01v8 1130 -20 1131 -19 l=30 w=800 "w_n140_n70#" "a_740_n680#" 60 0 "vdd!" 800 0 "Q" 800 0
+device msubckt sky130_fd_pr__pfet_01v8 860 -20 861 -19 l=30 w=300 "w_n140_n70#" "Z3" 60 0 "vdd!" 300 0 "a_740_n680#" 300 0
+device msubckt sky130_fd_pr__pfet_01v8 580 -20 581 -19 l=30 w=580 "w_n140_n70#" "a_300_n150#" 60 0 "vdd!" 580 0 "Z3" 580 0
 device msubckt sky130_fd_pr__pfet_01v8 300 -20 301 -19 l=30 w=560 "w_n140_n70#" "a_300_n150#" 60 0 "Z1" 560 0 "Z2" 560 0
-device msubckt sky130_fd_pr__pfet_01v8 20 -20 21 -19 l=30 w=560 "w_n140_n70#" "D" 60 0 "a_n60_n20#" 560 0 "Z1" 560 0
+device msubckt sky130_fd_pr__pfet_01v8 20 -20 21 -19 l=30 w=560 "w_n140_n70#" "D" 60 0 "vdd!" 560 0 "Z1" 560 0

diff --git a/mag/tspc.mag b/mag/tspc.mag
index 84d9fdb..7c4fb1f 100644
--- a/mag/tspc.mag
+++ b/mag/tspc.mag

@@ -1,6 +1,6 @@
 magic
 tech sky130A
-timestamp 1640710665
+timestamp 1640956963
 << nwell >>
 rect -70 -35 670 465
 << nmos >>
@@ -418,10 +418,6 @@
 rect 590 90 615 115
 rect 590 45 615 70
 rect 590 0 615 25
-<< psubdiff >>
-rect 270 -560 330 -505
-<< nsubdiff >>
-rect 110 360 160 405
 << poly >>
 rect 565 390 580 410
 rect 10 270 25 290
@@ -496,10 +492,9 @@
 rect 490 -205 510 -185
 rect 115 -390 135 -370
 << locali >>
-rect -25 270 0 360
-rect 105 355 165 415
 rect 525 390 550 400
 rect 525 380 560 390
+rect -25 270 0 360
 rect 175 300 180 320
 rect 175 270 200 300
 rect 255 280 280 360
@@ -875,10 +870,9 @@
 rect 595 -435 600 -415
 rect 445 -440 470 -435
 rect 570 -440 595 -435
-rect 270 -565 330 -505
 << viali >>
-rect -25 360 -5 380
 rect 525 400 545 420
+rect -25 360 -5 380
 rect 255 360 275 380
 rect 395 365 415 385
 rect 180 300 200 320
@@ -1187,7 +1181,7 @@
 rect 605 -445 610 -405
 rect 560 -450 610 -445
 rect -70 -455 660 -450
-rect -60 -480 660 -455
+rect -60 -490 660 -455
 << labels >>
 rlabel locali -10 -255 10 -45 1 D
 rlabel locali -10 -65 40 -45 1 D
@@ -1203,6 +1197,6 @@
 rlabel space 70 -160 95 -95 1 Z4
 rlabel space 285 -180 335 -160 1 Z4
 rlabel metal4 -55 -470 660 -455 1 GND
-rlabel locali 140 380 140 380 1 vdd!
-rlabel locali 300 -535 300 -535 1 gnd!
+rlabel locali 269 336 269 336 1 vdd!
+rlabel locali 202 -379 202 -379 1 gnd!
 << end >>

diff --git a/mag/tspc_r.ext b/mag/tspc_r.ext
index a7d9b63..b127324 100644
--- a/mag/tspc_r.ext
+++ b/mag/tspc_r.ext

@@ -1,4 +1,4 @@
-timestamp 1640770827
+timestamp 1640958486
 version 8.3
 tech sky130A
 style ngspice()
@@ -21,61 +21,61 @@
 node "D" 1470 418.74 -250 -140 p 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 34600 2100 0 0 8000 400 0 0 0 0 0 0 0 0 0 0 0 0
 node "w_n290_n40#" 7882 2692.8 -290 -40 nw 0 0 0 0 897600 4960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 substrate "VSUBS" 0 0 -1073741817 -1073741817 space 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-cap "Qbar" "GND" 138.6
-cap "w_n290_n40#" "Z2" 3.04
-cap "w_n290_n40#" "Z1" 7.4
-cap "w_n290_n40#" "VDD" 7.4
-cap "w_n290_n40#" "Q" 1.85
-cap "w_n290_n40#" "Qbar1" 1.82
-cap "w_n290_n40#" "Z3" 11.56
-cap "w_n290_n40#" "clk" 10.355
-cap "VDD" "z5" 6.6
-cap "w_n290_n40#" "Qbar" 1.85
-cap "Q" "z5" 33
-cap "Qbar1" "z5" 203.056
-cap "Z3" "z5" 110
-cap "clk" "z5" 38.3774
 cap "Z1" "Z2" 709.991
-cap "VDD" "Z2" 95.0921
-cap "VDD" "Z1" 316.564
-cap "Q" "VDD" 334.95
+cap "VDD" "GND" 17.6
+cap "GND" "Z4" 527.304
+cap "Qbar1" "R" 11.3571
+cap "Q" "Qbar" 213.204
+cap "Qbar1" "Qbar" 7.54286
+cap "Z3" "R" 137.379
+cap "clk" "R" 508.778
 cap "Z3" "Z2" 249.04
-cap "Z4" "z5" 42.0885
-cap "Qbar1" "VDD" 315.732
+cap "D" "R" 16.14
 cap "Z3" "Z1" 85.3
 cap "clk" "Z2" 187.91
-cap "GND" "z5" 558.112
-cap "Z3" "VDD" 509.325
 cap "clk" "Z1" 170.927
+cap "w_n290_n40#" "Qbar" 1.85
 cap "D" "Z2" 47.3222
+cap "w_n290_n40#" "Z2" 3.04
+cap "w_n290_n40#" "Z1" 7.4
+cap "VDD" "Qbar" 237.6
+cap "Q" "z5" 33
+cap "VDD" "Z2" 95.0921
+cap "Qbar1" "z5" 203.056
 cap "Qbar1" "Q" 109.835
-cap "clk" "VDD" 129.37
+cap "VDD" "Z1" 316.564
+cap "Z3" "z5" 110
 cap "Z3" "Q" 28.6775
-cap "D" "VDD" 38.5
+cap "clk" "z5" 38.3774
 cap "Z3" "Qbar1" 379.384
 cap "clk" "Qbar1" 121.715
+cap "R" "GND" 35.3744
+cap "w_n290_n40#" "Q" 1.85
 cap "clk" "Z3" 652.716
+cap "Qbar" "GND" 138.6
 cap "Z2" "Z4" 137.657
+cap "w_n290_n40#" "Qbar1" 1.82
 cap "Z2" "GND" 142.361
+cap "w_n290_n40#" "Z3" 11.56
 cap "D" "clk" 31.5485
-cap "Z2" "R" 208.97
-cap "VDD" "GND" 17.6
+cap "w_n290_n40#" "clk" 10.355
+cap "VDD" "z5" 6.6
+cap "Q" "VDD" 334.95
+cap "Qbar1" "VDD" 315.732
+cap "Z3" "VDD" 509.325
+cap "clk" "VDD" 129.37
+cap "D" "VDD" 38.5
+cap "Z4" "z5" 42.0885
+cap "w_n290_n40#" "VDD" 7.4
+cap "GND" "z5" 558.112
 cap "Q" "GND" 263.95
 cap "Z3" "Z4" 201.943
 cap "Qbar1" "GND" 157.761
-cap "VDD" "Qbar" 237.6
-cap "Qbar1" "R" 11.3571
 cap "Z3" "GND" 324.951
 cap "clk" "Z4" 18.15
-cap "Q" "Qbar" 213.204
-cap "Qbar1" "Qbar" 7.54286
 cap "clk" "GND" 37.5833
-cap "Z3" "R" 137.379
 cap "D" "GND" 14.4375
-cap "clk" "R" 508.778
-cap "D" "R" 16.14
-cap "GND" "Z4" 527.304
-cap "R" "GND" 35.3744
+cap "Z2" "R" 208.97
 device msubckt sky130_fd_pr__nfet_01v8 1580 -480 1581 -479 l=30 w=180 "VSUBS" "Q" 60 0 "GND" 180 0 "Qbar" 180 0
 device msubckt sky130_fd_pr__nfet_01v8 1330 -480 1331 -479 l=30 w=180 "VSUBS" "Qbar1" 60 0 "GND" 180 0 "Q" 180 0
 device msubckt sky130_fd_pr__nfet_01v8 1080 -480 1081 -479 l=30 w=180 "VSUBS" "Z3" 60 0 "GND" 180 0 "z5" 180 0
commit	b08d313a9ca2fefcafa4ddf68879b574f54873a0	[log] [tgz]
author	adithyasunil26 <adithyasunil26@gmail.com>	Fri Dec 31 19:20:34 2021 +0530
committer	adithyasunil26 <adithyasunil26@gmail.com>	Fri Dec 31 19:20:34 2021 +0530
tree	bc7e93cde840a943fd44c3347a6874f24da82b30
parent	c7aa6febc534176bd3de6185a4e0fcffbb206bfb [diff]