mod
diff --git a/mag/analogneuron_invopamp_re_15kfeedbck.mag b/mag/analogneuron_invopamp_re_15kfeedbck.mag
index f9017b3..36c51a2 100644
--- a/mag/analogneuron_invopamp_re_15kfeedbck.mag
+++ b/mag/analogneuron_invopamp_re_15kfeedbck.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1628079258
+timestamp 1628105024
<< pwell >>
rect 10446 320 10450 334
<< locali >>
@@ -10,7 +10,6 @@
rect 2527 1125 2561 1131
rect 2479 1012 2561 1125
rect 2190 978 2561 1012
-rect 4392 878 6400 1768
rect 8149 200 8369 234
rect 8165 173 8369 200
rect 8335 102 8369 173
@@ -33,37 +32,21 @@
rect 2250 1432 2456 1450
rect 2250 1132 2272 1432
rect 2386 1270 2456 1432
-rect 4246 1943 4300 1992
-rect 4429 1943 4483 1989
-rect 4623 1943 4677 1981
-rect 4823 1943 4877 1991
-rect 5011 1943 5065 1969
-rect 5207 1943 5261 1963
-rect 5387 1943 5441 1985
-rect 5583 1943 5637 1975
-rect 5779 1943 5833 1965
-rect 5975 1943 6029 1967
-rect 6155 1943 6209 1975
-rect 6355 1970 6409 1971
-rect 6551 1970 6605 1981
-rect 6260 1943 6610 1970
-rect 6739 1943 6793 1973
-rect 4246 1930 6793 1943
rect 3956 1378 4044 1384
-rect 4246 1378 4300 1930
-rect 4429 1378 4483 1930
-rect 4623 1378 4677 1930
-rect 4823 1378 4877 1930
-rect 5011 1378 5065 1930
-rect 5207 1378 5261 1930
-rect 5387 1378 5441 1930
-rect 5583 1378 5637 1930
-rect 5779 1378 5833 1930
-rect 5975 1378 6029 1930
-rect 6155 1378 6209 1930
-rect 6355 1378 6409 1930
-rect 6551 1378 6605 1930
-rect 6739 1378 6793 1930
+rect 4246 1378 4300 1992
+rect 4429 1378 4483 1989
+rect 4623 1378 4677 1981
+rect 4823 1378 4877 1969
+rect 5011 1378 5065 1969
+rect 5207 1378 5261 1963
+rect 5387 1378 5441 1985
+rect 5583 1378 5637 1963
+rect 5779 1378 5833 1965
+rect 5975 1378 6029 1967
+rect 6155 1378 6209 1969
+rect 6355 1378 6409 1969
+rect 6551 1378 6605 1977
+rect 6739 1378 6793 1973
rect 7754 1491 7948 1492
rect 8260 1491 8443 1493
rect 7754 1474 8443 1491
@@ -76,35 +59,19 @@
rect 2386 1132 2412 1182
rect 2250 1114 2412 1132
rect 224 726 352 1108
-rect 4042 806 4094 1236
-rect 4234 806 4300 1242
-rect 4429 806 4483 1242
-rect 4614 806 4677 1242
-rect 4806 1204 4858 1242
-rect 4806 806 4857 1204
-rect 5004 806 5056 1242
-rect 5196 806 5248 1242
-rect 5388 806 5440 1242
-rect 5580 806 5632 1242
-rect 5776 806 5828 1242
-rect 5964 806 6016 1242
-rect 6160 806 6212 1242
-rect 6344 806 6396 1242
-rect 4042 774 6396 806
-rect 4042 744 4094 774
-rect 4234 744 4286 774
-rect 4430 744 4482 774
-rect 4614 759 4677 774
-rect 4614 744 4666 759
-rect 4806 744 4858 774
-rect 5004 744 5056 774
-rect 5196 744 5248 774
-rect 5388 744 5440 774
-rect 5580 744 5632 774
-rect 5776 744 5828 774
-rect 5964 744 6016 774
-rect 6160 744 6212 774
-rect 6344 744 6396 774
+rect 4042 744 4094 1236
+rect 4234 744 4286 1242
+rect 4430 744 4482 1242
+rect 4614 744 4666 1242
+rect 4806 744 4858 1242
+rect 5004 744 5056 1242
+rect 5196 744 5248 1242
+rect 5388 744 5440 1242
+rect 5580 744 5632 1242
+rect 5776 744 5828 1242
+rect 5964 744 6016 1242
+rect 6160 744 6212 1242
+rect 6344 744 6396 1242
rect 8260 936 8443 1453
rect 8260 898 8444 936
rect -762 710 352 726
@@ -170,7 +137,7 @@
rect 6702 -5 8240 51
rect 6702 -8 6888 -5
rect 0 -56 156 -46
-rect 240 -234 10900 -92
+rect 94 -234 10724 -104
<< via2 >>
rect 4108 1626 8208 1742
rect 2270 1132 2272 1430
@@ -193,8 +160,8 @@
rect 3902 1383 4044 1384
rect 3902 1378 6834 1383
rect 3902 1362 3968 1378
-rect 3708 1266 3968 1362
-rect 3902 1242 3968 1266
+rect 3726 1268 3968 1362
+rect 3902 1242 3968 1268
rect 6824 1242 6834 1378
rect 3902 1237 6834 1242
rect 3902 1236 4044 1237
@@ -214,42 +181,30 @@
rect -10 238 166 243
rect -10 -46 0 238
rect 156 -46 166 238
-rect 6912 230 7960 386
-rect -10 -51 166 -46
-rect 6902 -48 6912 230
-rect 7948 -30 7960 230
rect 10518 232 10702 262
+rect 6926 194 7020 198
+rect 6918 44 6928 194
+rect 7020 44 7030 194
+rect 6926 40 7020 44
+rect -10 -51 166 -46
rect 10518 -30 10540 232
rect 10668 -30 10702 232
-rect 7948 -48 7958 -30
rect 10518 -72 10702 -30
<< via3 >>
rect 0 -46 156 238
-rect 6912 -48 7948 230
+rect 6928 44 7020 194
rect 10540 -30 10668 232
<< metal4 >>
rect -15 238 10686 244
rect -15 -46 0 238
rect 156 232 10686 238
-rect 156 230 10540 232
-rect 156 -46 6912 230
-rect -15 -48 6912 -46
-rect 7948 -30 10540 230
+rect 156 194 10540 232
+rect 156 44 6928 194
+rect 7020 44 10540 194
+rect 156 -30 10540 44
rect 10668 -30 10686 232
-rect 7948 -48 10686 -30
-rect -15 -54 10686 -48
-use sky130_fd_pr__res_xhigh_po_0p35_NZHUVC sky130_fd_pr__res_xhigh_po_0p35_NZHUVC_2
-timestamp 1627748178
-transform 0 1 -840 -1 0 93
-box -37 -508 37 508
-use sky130_fd_pr__res_xhigh_po_0p35_NZHUVC sky130_fd_pr__res_xhigh_po_0p35_NZHUVC_1
-timestamp 1627748178
-transform 0 1 -844 -1 0 423
-box -37 -508 37 508
-use sky130_fd_pr__res_xhigh_po_0p35_NZHUVC sky130_fd_pr__res_xhigh_po_0p35_NZHUVC_0
-timestamp 1627748178
-transform 0 1 -842 -1 0 741
-box -37 -508 37 508
+rect 156 -46 10686 -30
+rect -15 -54 10686 -46
use Stage1_inv Stage1_inv_0
timestamp 1627987662
transform 1 0 362 0 1 1178
@@ -258,25 +213,39 @@
timestamp 1627987662
transform -1 0 10370 0 1 1184
box -166 -1292 1986 1598
-use biasnmos biasnmos_0
-timestamp 1627800883
-transform 1 0 2416 0 1 90
-box -106 -320 4260 833
-use Stage2_inv Stage2_inv_1
-timestamp 1628045315
-transform -1 0 8210 0 1 224
-box -102 -170 1308 1530
-use Stage2_inv Stage2_inv_0
-timestamp 1628045315
-transform 1 0 2512 0 1 1150
-box -102 -170 1308 1530
use biaspmos biaspmos_0
timestamp 1627991837
transform 1 0 4116 0 1 3370
box -52 -1706 4314 -516
+use Stage2_inv Stage2_inv_0
+timestamp 1628045315
+transform 1 0 2512 0 1 1150
+box -102 -170 1308 1530
+use Stage2_inv Stage2_inv_1
+timestamp 1628045315
+transform -1 0 8210 0 1 224
+box -102 -170 1308 1530
+use biasnmos biasnmos_0
+timestamp 1627800883
+transform 1 0 2416 0 1 90
+box -106 -320 4260 833
+use sky130_fd_pr__res_xhigh_po_0p35_NZHUVC sky130_fd_pr__res_xhigh_po_0p35_NZHUVC_0
+timestamp 1627748178
+transform 0 1 -842 -1 0 741
+box -37 -508 37 508
+use sky130_fd_pr__res_xhigh_po_0p35_NZHUVC sky130_fd_pr__res_xhigh_po_0p35_NZHUVC_1
+timestamp 1627748178
+transform 0 1 -844 -1 0 423
+box -37 -508 37 508
+use sky130_fd_pr__res_xhigh_po_0p35_NZHUVC sky130_fd_pr__res_xhigh_po_0p35_NZHUVC_2
+timestamp 1627748178
+transform 0 1 -840 -1 0 93
+box -37 -508 37 508
<< labels >>
rlabel metal1 10448 716 10622 1604 1 in2
port 4 n
+rlabel metal2 110 -220 10712 -114 1 GND
+port 2 n
rlabel metal2 78 2790 10680 2896 1 VDD
port 1 n
rlabel metal1 126 728 222 1632 1 in1
@@ -285,6 +254,4 @@
port 7 n
rlabel metal3 10526 -62 10694 254 1 out
port 8 n
-rlabel metal2 254 -222 10880 -110 1 GND
-port 9 n
<< end >>
diff --git a/mag/neuron_s.mag b/mag/neuron_s.mag
index c9403c7..bf174bb 100644
--- a/mag/neuron_s.mag
+++ b/mag/neuron_s.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1628080429
+timestamp 1628105024
<< metal1 >>
rect -6183 4348 -4726 4674
rect -6176 1604 -4518 1896
@@ -52,22 +52,22 @@
rect 436 1265 1152 1270
rect 11886 190 13048 498
rect -3039 -1845 -711 -1755
-use aninv_ aninv__2
+use analogneuron_invopamp_re_15kfeedbck analogneuron_invopamp_re_15kfeedbck_0
+timestamp 1628105024
+transform 1 0 1354 0 1 234
+box -1354 -234 10724 2910
+use aninv_ aninv__0
timestamp 1628080314
-transform -1 0 -2858 0 1 -1981
+transform -1 0 -2858 0 1 3671
box -63 -721 1952 1584
use aninv_ aninv__1
timestamp 1628080314
transform -1 0 -2858 0 1 899
box -63 -721 1952 1584
-use aninv_ aninv__0
+use aninv_ aninv__2
timestamp 1628080314
-transform -1 0 -2858 0 1 3671
+transform -1 0 -2858 0 1 -1981
box -63 -721 1952 1584
-use analogneuron_invopamp_re_15kfeedbck analogneuron_invopamp_re_15kfeedbck_0
-timestamp 1628079258
-transform 1 0 1354 0 1 234
-box -1354 -234 10900 2910
<< labels >>
rlabel metal3 12386 200 13016 482 1 Out
port 1 n
