cleaning up -in progress
diff --git a/mag/c4_1.mag b/mag/c4_1.mag
deleted file mode 100644
index 74b15ed..0000000
--- a/mag/c4_1.mag
+++ /dev/null
@@ -1,264 +0,0 @@
-magic
-tech sky130B
-magscale 1 2
-timestamp 1654490084
-<< nwell >>
-rect 8 166 208 585
-<< nmos >>
-rect -144 400 -60 430
-rect -133 -27 -49 3
-rect 66 -27 150 3
-<< pmos >>
-rect 44 260 172 290
-<< ndiff >>
-rect -144 501 -60 513
-rect -144 442 -133 501
-rect -72 442 -60 501
-rect -144 430 -60 442
-rect -144 388 -60 400
-rect -144 329 -132 388
-rect -71 329 -60 388
-rect -144 317 -60 329
-rect -133 74 -49 86
-rect -133 15 -122 74
-rect -61 15 -49 74
-rect -133 3 -49 15
-rect 66 74 150 86
-rect 66 15 77 74
-rect 138 15 150 74
-rect 66 3 150 15
-rect -133 -39 -49 -27
-rect -133 -98 -121 -39
-rect -60 -98 -49 -39
-rect -133 -110 -49 -98
-rect 66 -39 150 -27
-rect 66 -98 78 -39
-rect 139 -98 150 -39
-rect 66 -110 150 -98
-<< pdiff >>
-rect 44 336 172 348
-rect 44 302 56 336
-rect 160 302 172 336
-rect 44 290 172 302
-rect 44 248 172 260
-rect 44 214 56 248
-rect 160 214 172 248
-rect 44 202 172 214
-<< ndiffc >>
-rect -133 442 -72 501
-rect -132 329 -71 388
-rect -122 15 -61 74
-rect 77 15 138 74
-rect -121 -98 -60 -39
-rect 78 -98 139 -39
-<< pdiffc >>
-rect 56 302 160 336
-rect 56 214 160 248
-<< psubdiff >>
-rect -145 228 -118 262
-rect -84 228 -60 262
-rect -134 -199 -107 -165
-rect -73 -199 -49 -165
-rect 66 -199 93 -165
-rect 127 -199 151 -165
-<< nsubdiff >>
-rect 56 499 162 535
-rect 56 465 92 499
-rect 126 465 162 499
-rect 56 429 162 465
-<< psubdiffcont >>
-rect -118 228 -84 262
-rect -107 -199 -73 -165
-rect 93 -199 127 -165
-<< nsubdiffcont >>
-rect 92 465 126 499
-<< poly >>
-rect -324 432 -258 448
-rect -324 398 -308 432
-rect -274 430 -258 432
-rect -274 400 -144 430
-rect -60 400 -34 430
-rect -274 398 -258 400
-rect -324 382 -258 398
-rect 210 292 276 308
-rect 210 290 226 292
-rect 18 260 44 290
-rect 172 260 226 290
-rect 210 258 226 260
-rect 260 258 276 292
-rect 210 242 276 258
-rect -124 161 -60 177
-rect -124 127 -108 161
-rect -74 153 -60 161
-rect -74 127 49 153
-rect -124 119 49 127
-rect -124 111 -60 119
-rect -263 5 -197 21
-rect -263 -29 -247 5
-rect -213 3 -197 5
-rect 19 3 49 119
-rect -213 -27 -133 3
-rect -49 -27 -23 3
-rect 19 -27 66 3
-rect 150 -27 176 3
-rect -213 -29 -197 -27
-rect -263 -45 -197 -29
-<< polycont >>
-rect -308 398 -274 432
-rect 226 258 260 292
-rect -108 127 -74 161
-rect -247 -29 -213 5
-<< locali >>
-rect -135 501 -71 513
-rect 76 501 142 515
-rect -324 433 -258 448
-rect -172 442 -133 501
-rect -72 499 142 501
-rect -72 465 92 499
-rect 126 465 142 499
-rect -72 442 142 465
-rect -324 397 -309 433
-rect -273 397 -258 433
-rect -324 382 -258 397
-rect -209 329 -132 388
-rect -71 329 -33 388
-rect 76 336 142 442
-rect -325 234 -255 247
-rect -209 234 -168 329
-rect 40 302 56 336
-rect 160 302 176 336
-rect 210 293 276 308
-rect -325 231 -168 234
-rect -325 197 -309 231
-rect -273 197 -168 231
-rect -134 262 -67 277
-rect -134 228 -119 262
-rect -84 228 -67 262
-rect 210 257 225 293
-rect 261 257 276 293
-rect -134 211 -67 228
-rect 40 214 56 248
-rect 160 214 176 248
-rect 210 242 276 257
-rect -325 193 -168 197
-rect -325 180 -255 193
-rect -209 177 -168 193
-rect -209 161 -60 177
-rect -209 127 -108 161
-rect -74 127 -60 161
-rect -209 111 -60 127
-rect -124 74 -60 111
-rect 77 148 138 214
-rect 211 148 277 152
-rect 77 137 277 148
-rect 77 101 226 137
-rect 262 101 277 137
-rect 77 89 277 101
-rect 77 74 177 89
-rect 211 86 277 89
-rect -263 6 -197 21
-rect -161 15 -122 74
-rect -61 15 -21 74
-rect 39 15 77 74
-rect 138 15 177 74
-rect -263 -30 -248 6
-rect -212 -30 -197 6
-rect -263 -45 -197 -30
-rect -160 -98 -121 -39
-rect -60 -98 -22 -39
-rect 39 -98 78 -39
-rect 139 -98 177 -39
-rect -123 -165 -57 -98
-rect -123 -199 -107 -165
-rect -73 -199 -57 -165
-rect -123 -216 -57 -199
-rect 77 -165 144 -98
-rect 77 -199 93 -165
-rect 127 -199 144 -165
-rect 77 -216 144 -199
-<< viali >>
-rect 92 465 126 499
-rect -309 432 -273 433
-rect -309 398 -308 432
-rect -308 398 -274 432
-rect -274 398 -273 432
-rect -309 397 -273 398
-rect -309 197 -273 231
-rect -119 228 -118 262
-rect -118 228 -84 262
-rect 225 292 261 293
-rect 225 258 226 292
-rect 226 258 260 292
-rect 260 258 261 292
-rect 225 257 261 258
-rect 226 101 262 137
-rect -248 5 -212 6
-rect -248 -29 -247 5
-rect -247 -29 -213 5
-rect -213 -29 -212 5
-rect -248 -30 -212 -29
-rect -107 -199 -73 -165
-rect 93 -199 127 -165
-<< metal1 >>
-rect 80 499 138 511
-rect 80 465 92 499
-rect 126 465 138 499
-rect 80 453 138 465
-rect -15 448 51 449
-rect -325 433 51 448
-rect -325 397 -309 433
-rect -273 397 51 433
-rect -325 382 51 397
-rect -135 262 -67 277
-rect -325 242 -255 247
-rect -325 187 -318 242
-rect -261 187 -255 242
-rect -325 180 -255 187
-rect -135 228 -119 262
-rect -84 228 -67 262
-rect -260 6 -200 18
-rect -260 -30 -248 6
-rect -212 -30 -200 6
-rect -260 -33 -200 -30
-rect -260 -42 -203 -33
-rect -135 -151 -67 228
-rect -5 149 51 382
-rect 213 293 273 305
-rect 213 257 225 293
-rect 261 257 273 293
-rect 213 245 273 257
-rect -5 137 274 149
-rect -5 101 226 137
-rect 262 101 274 137
-rect -5 89 274 101
-rect -135 -165 139 -151
-rect -135 -199 -107 -165
-rect -73 -199 93 -165
-rect 127 -199 139 -165
-rect -135 -212 139 -199
-<< via1 >>
-rect -318 231 -261 242
-rect -318 197 -309 231
-rect -309 197 -273 231
-rect -273 197 -261 231
-rect -318 187 -261 197
-<< metal2 >>
-rect -329 242 -251 251
-rect -329 185 -320 242
-rect -260 185 -251 242
-rect -329 176 -251 185
-<< via2 >>
-rect -320 187 -318 242
-rect -318 187 -261 242
-rect -261 187 -260 242
-rect -320 185 -260 187
-<< metal3 >>
-rect -363 242 -243 278
-rect -363 185 -320 242
-rect -260 185 -243 242
-rect -363 158 -243 185
-use sky130_fd_pr__cap_mim_m3_1_5NP42Z  sky130_fd_pr__cap_mim_m3_1_5NP42Z_0
-timestamp 1654490084
-transform 1 0 -1036 0 1 178
-box -613 -400 794 400
-<< end >>
diff --git a/mag/sky130_sc_ams__ota_1.mag b/mag/sky130_sc_ams__ota_1.mag
index 5ce666e..4185189 100644
--- a/mag/sky130_sc_ams__ota_1.mag
+++ b/mag/sky130_sc_ams__ota_1.mag
@@ -1,9 +1,9 @@
 magic
 tech sky130B
 magscale 1 2
-timestamp 1654541479
+timestamp 1654556429
 << nwell >>
-rect -398 414 6394 582
+rect -398 414 6394 687
 rect -398 339 3942 414
 rect 5002 339 6394 414
 << pwell >>
@@ -11,8 +11,7 @@
 rect 775 213 954 221
 rect 1684 213 1870 221
 rect 3988 213 4956 361
-rect -360 -17 6356 213
-rect 4574 -48 4601 -17
+rect -360 -153 6356 213
 << nmos >>
 rect 921 55 951 195
 rect 1007 55 1037 195
@@ -931,6 +930,370 @@
 rect 5948 383 5982 417
 rect 6034 451 6068 485
 rect 6034 383 6068 417
+<< psubdiff >>
+rect -355 -48 -272 -24
+rect -355 -82 -331 -48
+rect -297 -82 -272 -48
+rect -355 -105 -272 -82
+rect -171 -48 -88 -24
+rect -171 -82 -147 -48
+rect -113 -82 -88 -48
+rect -171 -105 -88 -82
+rect 13 -48 96 -24
+rect 13 -82 37 -48
+rect 71 -82 96 -48
+rect 13 -105 96 -82
+rect 197 -48 280 -24
+rect 197 -82 221 -48
+rect 255 -82 280 -48
+rect 197 -105 280 -82
+rect 381 -48 464 -24
+rect 381 -82 405 -48
+rect 439 -82 464 -48
+rect 381 -105 464 -82
+rect 565 -48 648 -24
+rect 565 -82 589 -48
+rect 623 -82 648 -48
+rect 565 -105 648 -82
+rect 749 -48 832 -24
+rect 749 -82 773 -48
+rect 807 -82 832 -48
+rect 749 -105 832 -82
+rect 933 -48 1016 -24
+rect 933 -82 957 -48
+rect 991 -82 1016 -48
+rect 933 -105 1016 -82
+rect 1117 -48 1200 -24
+rect 1117 -82 1141 -48
+rect 1175 -82 1200 -48
+rect 1117 -105 1200 -82
+rect 1301 -48 1384 -24
+rect 1301 -82 1325 -48
+rect 1359 -82 1384 -48
+rect 1301 -105 1384 -82
+rect 1485 -48 1568 -24
+rect 1485 -82 1509 -48
+rect 1543 -82 1568 -48
+rect 1485 -105 1568 -82
+rect 1669 -48 1752 -24
+rect 1669 -82 1693 -48
+rect 1727 -82 1752 -48
+rect 1669 -105 1752 -82
+rect 1853 -48 1936 -24
+rect 1853 -82 1877 -48
+rect 1911 -82 1936 -48
+rect 1853 -105 1936 -82
+rect 2037 -48 2120 -24
+rect 2037 -82 2061 -48
+rect 2095 -82 2120 -48
+rect 2037 -105 2120 -82
+rect 2221 -48 2304 -24
+rect 2221 -82 2245 -48
+rect 2279 -82 2304 -48
+rect 2221 -105 2304 -82
+rect 2405 -48 2488 -24
+rect 2405 -82 2429 -48
+rect 2463 -82 2488 -48
+rect 2405 -105 2488 -82
+rect 2589 -48 2672 -24
+rect 2589 -82 2613 -48
+rect 2647 -82 2672 -48
+rect 2589 -105 2672 -82
+rect 2773 -48 2856 -24
+rect 2773 -82 2797 -48
+rect 2831 -82 2856 -48
+rect 2773 -105 2856 -82
+rect 2957 -48 3040 -24
+rect 2957 -82 2981 -48
+rect 3015 -82 3040 -48
+rect 2957 -105 3040 -82
+rect 3141 -48 3224 -24
+rect 3141 -82 3165 -48
+rect 3199 -82 3224 -48
+rect 3141 -105 3224 -82
+rect 3325 -48 3408 -24
+rect 3325 -82 3349 -48
+rect 3383 -82 3408 -48
+rect 3325 -105 3408 -82
+rect 3509 -48 3592 -24
+rect 3509 -82 3533 -48
+rect 3567 -82 3592 -48
+rect 3509 -105 3592 -82
+rect 3693 -48 3776 -24
+rect 3693 -82 3717 -48
+rect 3751 -82 3776 -48
+rect 3693 -105 3776 -82
+rect 3877 -48 3960 -24
+rect 3877 -82 3901 -48
+rect 3935 -82 3960 -48
+rect 3877 -105 3960 -82
+rect 4061 -48 4144 -24
+rect 4061 -82 4085 -48
+rect 4119 -82 4144 -48
+rect 4061 -105 4144 -82
+rect 4245 -48 4328 -24
+rect 4245 -82 4269 -48
+rect 4303 -82 4328 -48
+rect 4521 -48 4604 -24
+rect 4521 -82 4545 -48
+rect 4579 -82 4604 -48
+rect 4245 -105 4328 -82
+rect 4521 -105 4604 -82
+rect 4705 -48 4788 -24
+rect 4705 -82 4729 -48
+rect 4763 -82 4788 -48
+rect 4705 -105 4788 -82
+rect 4889 -48 4972 -24
+rect 4889 -82 4913 -48
+rect 4947 -82 4972 -48
+rect 4889 -105 4972 -82
+rect 5073 -48 5156 -24
+rect 5073 -82 5097 -48
+rect 5131 -82 5156 -48
+rect 5073 -105 5156 -82
+rect 5257 -48 5340 -24
+rect 5257 -82 5281 -48
+rect 5315 -82 5340 -48
+rect 5257 -105 5340 -82
+rect 5441 -48 5524 -24
+rect 5441 -82 5465 -48
+rect 5499 -82 5524 -48
+rect 5441 -105 5524 -82
+rect 5625 -48 5708 -24
+rect 5625 -82 5649 -48
+rect 5683 -82 5708 -48
+rect 5625 -105 5708 -82
+rect 5809 -48 5892 -24
+rect 5809 -82 5833 -48
+rect 5867 -82 5892 -48
+rect 5809 -105 5892 -82
+rect 5993 -48 6076 -24
+rect 5993 -82 6017 -48
+rect 6051 -82 6076 -48
+rect 5993 -105 6076 -82
+rect 6177 -48 6260 -24
+rect 6177 -82 6201 -48
+rect 6235 -82 6260 -48
+rect 6177 -105 6260 -82
+<< nsubdiff >>
+rect -355 626 -273 651
+rect -355 592 -331 626
+rect -297 592 -273 626
+rect -355 568 -273 592
+rect -171 626 -89 651
+rect -171 592 -147 626
+rect -113 592 -89 626
+rect -171 568 -89 592
+rect 13 626 95 651
+rect 13 592 37 626
+rect 71 592 95 626
+rect 13 568 95 592
+rect 197 626 279 651
+rect 197 592 221 626
+rect 255 592 279 626
+rect 197 568 279 592
+rect 381 626 463 651
+rect 381 592 405 626
+rect 439 592 463 626
+rect 381 568 463 592
+rect 565 626 647 651
+rect 565 592 589 626
+rect 623 592 647 626
+rect 565 568 647 592
+rect 749 626 831 651
+rect 749 592 773 626
+rect 807 592 831 626
+rect 749 568 831 592
+rect 933 626 1015 651
+rect 933 592 957 626
+rect 991 592 1015 626
+rect 933 568 1015 592
+rect 1117 626 1199 651
+rect 1117 592 1141 626
+rect 1175 592 1199 626
+rect 1117 568 1199 592
+rect 1301 626 1383 651
+rect 1301 592 1325 626
+rect 1359 592 1383 626
+rect 1301 568 1383 592
+rect 1485 626 1567 651
+rect 1485 592 1509 626
+rect 1543 592 1567 626
+rect 1485 568 1567 592
+rect 1669 626 1751 651
+rect 1669 592 1693 626
+rect 1727 592 1751 626
+rect 1669 568 1751 592
+rect 1853 626 1935 651
+rect 1853 592 1877 626
+rect 1911 592 1935 626
+rect 1853 568 1935 592
+rect 2037 626 2119 651
+rect 2037 592 2061 626
+rect 2095 592 2119 626
+rect 2037 568 2119 592
+rect 2221 626 2303 651
+rect 2221 592 2245 626
+rect 2279 592 2303 626
+rect 2221 568 2303 592
+rect 2405 626 2487 651
+rect 2405 592 2429 626
+rect 2463 592 2487 626
+rect 2405 568 2487 592
+rect 2589 626 2671 651
+rect 2589 592 2613 626
+rect 2647 592 2671 626
+rect 2589 568 2671 592
+rect 2773 626 2855 651
+rect 2773 592 2797 626
+rect 2831 592 2855 626
+rect 2773 568 2855 592
+rect 2957 626 3039 651
+rect 2957 592 2981 626
+rect 3015 592 3039 626
+rect 2957 568 3039 592
+rect 3141 626 3223 651
+rect 3141 592 3165 626
+rect 3199 592 3223 626
+rect 3141 568 3223 592
+rect 3325 626 3407 651
+rect 3325 592 3349 626
+rect 3383 592 3407 626
+rect 3325 568 3407 592
+rect 3509 626 3591 651
+rect 3509 592 3533 626
+rect 3567 592 3591 626
+rect 3509 568 3591 592
+rect 3693 626 3775 651
+rect 3693 592 3717 626
+rect 3751 592 3775 626
+rect 3693 568 3775 592
+rect 3877 626 3959 651
+rect 3877 592 3901 626
+rect 3935 592 3959 626
+rect 3877 568 3959 592
+rect 4061 626 4143 651
+rect 4061 592 4085 626
+rect 4119 592 4143 626
+rect 4061 568 4143 592
+rect 4245 626 4327 651
+rect 4245 592 4269 626
+rect 4303 592 4327 626
+rect 4521 626 4603 651
+rect 4245 568 4327 592
+rect 4521 592 4545 626
+rect 4579 592 4603 626
+rect 4521 568 4603 592
+rect 4705 626 4787 651
+rect 4705 592 4729 626
+rect 4763 592 4787 626
+rect 4705 568 4787 592
+rect 4889 626 4971 651
+rect 4889 592 4913 626
+rect 4947 592 4971 626
+rect 4889 568 4971 592
+rect 5073 626 5155 651
+rect 5073 592 5097 626
+rect 5131 592 5155 626
+rect 5073 568 5155 592
+rect 5257 626 5339 651
+rect 5257 592 5281 626
+rect 5315 592 5339 626
+rect 5257 568 5339 592
+rect 5441 626 5523 651
+rect 5441 592 5465 626
+rect 5499 592 5523 626
+rect 5441 568 5523 592
+rect 5625 626 5707 651
+rect 5625 592 5649 626
+rect 5683 592 5707 626
+rect 5625 568 5707 592
+rect 5809 626 5891 651
+rect 5809 592 5833 626
+rect 5867 592 5891 626
+rect 5809 568 5891 592
+rect 5993 626 6075 651
+rect 5993 592 6017 626
+rect 6051 592 6075 626
+rect 5993 568 6075 592
+rect 6177 626 6259 651
+rect 6177 592 6201 626
+rect 6235 592 6259 626
+rect 6177 568 6259 592
+<< psubdiffcont >>
+rect -331 -82 -297 -48
+rect -147 -82 -113 -48
+rect 37 -82 71 -48
+rect 221 -82 255 -48
+rect 405 -82 439 -48
+rect 589 -82 623 -48
+rect 773 -82 807 -48
+rect 957 -82 991 -48
+rect 1141 -82 1175 -48
+rect 1325 -82 1359 -48
+rect 1509 -82 1543 -48
+rect 1693 -82 1727 -48
+rect 1877 -82 1911 -48
+rect 2061 -82 2095 -48
+rect 2245 -82 2279 -48
+rect 2429 -82 2463 -48
+rect 2613 -82 2647 -48
+rect 2797 -82 2831 -48
+rect 2981 -82 3015 -48
+rect 3165 -82 3199 -48
+rect 3349 -82 3383 -48
+rect 3533 -82 3567 -48
+rect 3717 -82 3751 -48
+rect 3901 -82 3935 -48
+rect 4085 -82 4119 -48
+rect 4269 -82 4303 -48
+rect 4545 -82 4579 -48
+rect 4729 -82 4763 -48
+rect 4913 -82 4947 -48
+rect 5097 -82 5131 -48
+rect 5281 -82 5315 -48
+rect 5465 -82 5499 -48
+rect 5649 -82 5683 -48
+rect 5833 -82 5867 -48
+rect 6017 -82 6051 -48
+rect 6201 -82 6235 -48
+<< nsubdiffcont >>
+rect -331 592 -297 626
+rect -147 592 -113 626
+rect 37 592 71 626
+rect 221 592 255 626
+rect 405 592 439 626
+rect 589 592 623 626
+rect 773 592 807 626
+rect 957 592 991 626
+rect 1141 592 1175 626
+rect 1325 592 1359 626
+rect 1509 592 1543 626
+rect 1693 592 1727 626
+rect 1877 592 1911 626
+rect 2061 592 2095 626
+rect 2245 592 2279 626
+rect 2429 592 2463 626
+rect 2613 592 2647 626
+rect 2797 592 2831 626
+rect 2981 592 3015 626
+rect 3165 592 3199 626
+rect 3349 592 3383 626
+rect 3533 592 3567 626
+rect 3717 592 3751 626
+rect 3901 592 3935 626
+rect 4085 592 4119 626
+rect 4269 592 4303 626
+rect 4545 592 4579 626
+rect 4729 592 4763 626
+rect 4913 592 4947 626
+rect 5097 592 5131 626
+rect 5281 592 5315 626
+rect 5465 592 5499 626
+rect 5649 592 5683 626
+rect 5833 592 5867 626
+rect 6017 592 6051 626
+rect 6201 592 6235 626
 << poly >>
 rect 4392 671 4458 687
 rect 4392 637 4408 671
@@ -997,7 +1360,7 @@
 rect 2887 383 2903 417
 rect 2937 383 2953 417
 rect 2887 360 2953 383
-rect 4409 476 4440 621
+rect 4409 433 4440 621
 rect 5099 497 5129 523
 rect 5185 497 5215 523
 rect 5271 497 5331 523
@@ -1008,11 +1371,6 @@
 rect 5791 497 5851 523
 rect 5907 497 5937 523
 rect 5993 497 6023 523
-rect 4409 466 4505 476
-rect 4409 433 4455 466
-rect 4242 432 4455 433
-rect 4489 433 4505 466
-rect 4489 432 4702 433
 rect 3933 417 3999 427
 rect 3933 383 3949 417
 rect 3983 383 3999 417
@@ -1029,7 +1387,7 @@
 rect 3127 330 3759 360
 rect 3815 360 3845 375
 rect 3933 360 3999 383
-rect 4242 403 4702 432
+rect 4242 403 4702 433
 rect 3815 330 3999 360
 rect 4070 335 4100 361
 rect 4156 335 4186 361
@@ -1196,13 +1554,10 @@
 rect 4156 51 4186 123
 rect 4242 93 4272 123
 rect 4328 93 4358 123
-rect 4414 95 4444 123
-rect 4500 95 4530 123
-rect 4414 85 4530 95
+rect 4414 51 4444 123
+rect 4500 51 4530 123
 rect 4586 93 4616 123
 rect 4672 93 4702 123
-rect 4414 51 4455 85
-rect 4489 51 4530 85
 rect 4758 51 4788 123
 rect 4844 108 4874 123
 rect 4954 108 5020 161
@@ -1237,10 +1592,10 @@
 rect 5907 21 5937 47
 rect 5993 21 6023 47
 rect 4414 -82 4455 21
-rect 4401 -98 4468 -82
-rect 4401 -134 4417 -98
-rect 4452 -134 4468 -98
-rect 4401 -150 4468 -134
+rect 4399 -97 4466 -82
+rect 4399 -131 4416 -97
+rect 4450 -131 4466 -97
+rect 4399 -148 4466 -131
 << polycont >>
 rect 4408 637 4442 671
 rect 783 383 817 417
@@ -1251,7 +1606,6 @@
 rect 1023 294 1057 328
 rect 1589 294 1623 328
 rect 2903 383 2937 417
-rect 4455 432 4489 466
 rect 3949 383 3983 417
 rect 4961 383 4995 417
 rect 6127 383 6161 417
@@ -1272,9 +1626,8 @@
 rect 4970 161 5004 195
 rect 5338 225 5372 259
 rect 5750 225 5784 259
-rect 4455 51 4489 85
 rect 6117 134 6151 168
-rect 4417 -134 4452 -98
+rect 4416 -131 4450 -97
 << xpolycontact >>
 rect -333 75 99 357
 rect 239 75 671 357
@@ -1282,9 +1635,81 @@
 rect 99 75 239 357
 << locali >>
 rect 4391 671 4458 687
+rect -331 626 -297 642
+rect -331 561 -297 592
+rect -147 626 -113 642
+rect -147 561 -113 592
+rect 37 626 71 642
+rect 37 561 71 592
+rect 221 626 255 642
+rect 221 561 255 592
+rect 405 626 439 642
+rect 405 561 439 592
+rect 589 626 623 642
+rect 589 561 623 592
+rect 773 626 807 642
+rect 773 561 807 592
+rect 957 626 991 642
+rect 957 561 991 592
+rect 1141 626 1175 642
+rect 1141 561 1175 592
+rect 1325 626 1359 642
+rect 1325 561 1359 592
+rect 1509 626 1543 642
+rect 1509 561 1543 592
+rect 1693 626 1727 642
+rect 1693 561 1727 592
+rect 1877 626 1911 642
+rect 1877 561 1911 592
+rect 2061 626 2095 642
+rect 2061 561 2095 592
+rect 2245 626 2279 642
+rect 2245 561 2279 592
+rect 2429 626 2463 642
+rect 2429 561 2463 592
+rect 2613 626 2647 642
+rect 2613 561 2647 592
+rect 2797 626 2831 642
+rect 2797 561 2831 592
+rect 2981 626 3015 642
+rect 2981 561 3015 592
+rect 3165 626 3199 642
+rect 3165 561 3199 592
+rect 3349 626 3383 642
+rect 3349 561 3383 592
+rect 3533 626 3567 642
+rect 3533 561 3567 592
+rect 3717 626 3751 642
+rect 3717 561 3751 592
+rect 3901 626 3935 642
+rect 3901 561 3935 592
+rect 4085 626 4119 642
+rect 4085 561 4119 592
+rect 4269 626 4303 642
 rect 4391 637 4408 671
 rect 4442 637 4458 671
 rect 4391 621 4458 637
+rect 4545 626 4579 642
+rect 4269 561 4303 592
+rect 4545 561 4579 592
+rect 4729 626 4763 642
+rect 4729 561 4763 592
+rect 4913 626 4947 642
+rect 4913 561 4947 592
+rect 5097 626 5131 642
+rect 5097 561 5131 592
+rect 5281 626 5315 642
+rect 5281 561 5315 592
+rect 5465 626 5499 642
+rect 5465 561 5499 592
+rect 5649 626 5683 642
+rect 5649 561 5683 592
+rect 5833 626 5867 642
+rect 5833 561 5867 592
+rect 6017 626 6051 642
+rect 6017 561 6051 592
+rect 6201 626 6235 642
+rect 6201 561 6235 592
 rect -360 527 -331 561
 rect -297 527 -239 561
 rect -205 527 -147 561
@@ -1423,12 +1848,6 @@
 rect 3632 451 3648 485
 rect 3754 451 3770 485
 rect 3804 451 3820 485
-rect 5054 485 5088 527
-rect 5226 485 5260 527
-rect 5458 485 5492 527
-rect 5630 485 5664 527
-rect 5862 485 5896 527
-rect 6034 485 6068 527
 rect 2903 417 2937 433
 rect 2996 417 3030 451
 rect 3082 417 3116 451
@@ -1507,9 +1926,12 @@
 rect 3684 367 3718 383
 rect 3770 417 3804 451
 rect 3856 417 3890 451
-rect 4439 466 4505 476
-rect 4439 432 4455 466
-rect 4489 432 4505 466
+rect 5054 485 5088 527
+rect 5226 485 5260 527
+rect 5458 485 5492 527
+rect 5630 485 5664 527
+rect 5862 485 5896 527
+rect 6034 485 6068 527
 rect 5124 451 5140 485
 rect 5174 451 5190 485
 rect 5326 451 5342 485
@@ -1643,6 +2065,8 @@
 rect 4541 314 4575 330
 rect 4541 246 4575 280
 rect 4541 192 4575 212
+rect 3974 93 4403 94
+rect 3940 60 4403 93
 rect 4541 94 4575 144
 rect 4627 314 4661 330
 rect 4627 260 4661 280
@@ -1692,11 +2116,6 @@
 rect 5004 168 5088 195
 rect 5004 161 5054 168
 rect 4885 128 4919 144
-rect 3974 93 4403 94
-rect 3940 60 4403 93
-rect 4439 85 4505 94
-rect 4439 51 4455 85
-rect 4489 51 4505 85
 rect 4541 60 4747 94
 rect 5054 100 5088 134
 rect 5140 168 5174 225
@@ -1817,10 +2236,82 @@
 rect 6143 -17 6201 17
 rect 6235 -17 6293 17
 rect 6327 -17 6356 17
-rect 4401 -98 4468 -82
-rect 4401 -134 4417 -98
-rect 4452 -134 4468 -98
-rect 4401 -150 4468 -134
+rect -331 -48 -297 -17
+rect -331 -98 -297 -82
+rect -147 -48 -113 -17
+rect -147 -98 -113 -82
+rect 37 -48 71 -17
+rect 37 -98 71 -82
+rect 221 -48 255 -17
+rect 221 -98 255 -82
+rect 405 -48 439 -17
+rect 405 -98 439 -82
+rect 589 -48 623 -17
+rect 589 -98 623 -82
+rect 773 -48 807 -17
+rect 773 -98 807 -82
+rect 957 -48 991 -17
+rect 957 -98 991 -82
+rect 1141 -48 1175 -17
+rect 1141 -98 1175 -82
+rect 1325 -48 1359 -17
+rect 1325 -98 1359 -82
+rect 1509 -48 1543 -17
+rect 1509 -98 1543 -82
+rect 1693 -48 1727 -17
+rect 1693 -98 1727 -82
+rect 1877 -48 1911 -17
+rect 1877 -98 1911 -82
+rect 2061 -48 2095 -17
+rect 2061 -98 2095 -82
+rect 2245 -48 2279 -17
+rect 2245 -98 2279 -82
+rect 2429 -48 2463 -17
+rect 2429 -98 2463 -82
+rect 2613 -48 2647 -17
+rect 2613 -98 2647 -82
+rect 2797 -48 2831 -17
+rect 2797 -98 2831 -82
+rect 2981 -48 3015 -17
+rect 2981 -98 3015 -82
+rect 3165 -48 3199 -17
+rect 3165 -98 3199 -82
+rect 3349 -48 3383 -17
+rect 3349 -98 3383 -82
+rect 3533 -48 3567 -17
+rect 3533 -98 3567 -82
+rect 3717 -48 3751 -17
+rect 3717 -98 3751 -82
+rect 3901 -48 3935 -17
+rect 3901 -98 3935 -82
+rect 4085 -48 4119 -17
+rect 4085 -98 4119 -82
+rect 4269 -48 4303 -17
+rect 4545 -48 4579 -17
+rect 4269 -98 4303 -82
+rect 4400 -97 4466 -81
+rect 4400 -131 4416 -97
+rect 4450 -131 4466 -97
+rect 4545 -98 4579 -82
+rect 4729 -48 4763 -17
+rect 4729 -98 4763 -82
+rect 4913 -48 4947 -17
+rect 4913 -98 4947 -82
+rect 5097 -48 5131 -17
+rect 5097 -98 5131 -82
+rect 5281 -48 5315 -17
+rect 5281 -98 5315 -82
+rect 5465 -48 5499 -17
+rect 5465 -98 5499 -82
+rect 5649 -48 5683 -17
+rect 5649 -98 5683 -82
+rect 5833 -48 5867 -17
+rect 5833 -98 5867 -82
+rect 6017 -48 6051 -17
+rect 6017 -98 6051 -82
+rect 6201 -48 6235 -17
+rect 6201 -98 6235 -82
+rect 4400 -147 4466 -131
 << viali >>
 rect 4408 637 4442 671
 rect -331 527 -297 561
@@ -2032,7 +2523,6 @@
 rect 6109 -17 6143 17
 rect 6201 -17 6235 17
 rect 6293 -17 6327 17
-rect 4417 -134 4452 -98
 << metal1 >>
 rect 4392 671 4458 687
 rect 4392 637 4408 671
@@ -2440,20 +2930,11 @@
 rect 6235 -17 6293 17
 rect 6327 -17 6356 17
 rect -360 -48 6356 -17
-rect 4401 -98 4468 -82
-rect 4401 -134 4417 -98
-rect 4452 -134 4468 -98
-rect 4401 -150 4468 -134
 << via1 >>
 rect 6296 96 6356 450
 << metal2 >>
 rect 6296 450 6356 460
 rect 6296 86 6356 96
-<< metal4 >>
-rect -543 859 4489 960
-rect -543 747 -442 859
-rect -543 501 -443 747
-rect 4388 718 4489 859
 << labels >>
 flabel metal1 -331 527 -297 561 0 FreeSans 192 0 0 0 VPWR
 port 8 nsew
@@ -2471,8 +2952,8 @@
 port 4 nsew
 flabel viali 6297 162 6331 196 0 FreeSans 192 0 0 0 Iout
 port 4 nsew
-flabel locali 4455 55 4489 89 0 FreeSans 192 0 0 0 Vin2
-port 2 nsew
-flabel nwell 4455 437 4489 471 0 FreeSans 192 0 0 0 Vin1
-port 1 nsew
+flabel metal1 4408 637 4442 671 1 FreeSans 320 0 0 0 Vin1
+port 9 n
+flabel polycont 4416 -131 4450 -97 1 FreeSans 320 0 0 0 Vin2
+port 10 n
 << end >>