diff --git a/checks/klayout_drc.log b/checks/klayout_drc.log
index 38420d0..ef4df46 100644
--- a/checks/klayout_drc.log
+++ b/checks/klayout_drc.log
@@ -3,61 +3,61 @@
 "_input" in: sky130A_mr.lydrc:89
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:90
-Elapsed: 0.010s
-"_input" in: sky130A_mr.lydrc:91
 Elapsed: 0.000s
+"_input" in: sky130A_mr.lydrc:91
+Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:92
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:93
-Elapsed: 0.010s
-"_input" in: sky130A_mr.lydrc:94
 Elapsed: 0.000s
+"_input" in: sky130A_mr.lydrc:94
+Elapsed: 0.020s
 "_input" in: sky130A_mr.lydrc:95
-Elapsed: 0.010s
+Elapsed: 0.000s
 "_input" in: sky130A_mr.lydrc:96
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:97
-Elapsed: 0.000s
+Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:98
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:99
-Elapsed: 0.010s
+Elapsed: 0.000s
 "_input" in: sky130A_mr.lydrc:100
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:101
-Elapsed: 0.000s
-"_input" in: sky130A_mr.lydrc:102
 Elapsed: 0.010s
+"_input" in: sky130A_mr.lydrc:102
+Elapsed: 0.000s
 "_input" in: sky130A_mr.lydrc:103
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:104
-Elapsed: 0.000s
-"_input" in: sky130A_mr.lydrc:105
 Elapsed: 0.010s
+"_input" in: sky130A_mr.lydrc:105
+Elapsed: 0.000s
 "_input" in: sky130A_mr.lydrc:106
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:107
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:108
-Elapsed: 0.000s
-"_input" in: sky130A_mr.lydrc:110
 Elapsed: 0.010s
+"_input" in: sky130A_mr.lydrc:110
+Elapsed: 0.000s
 "_input" in: sky130A_mr.lydrc:111
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:113
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:114
-Elapsed: 0.000s
-"_input" in: sky130A_mr.lydrc:116
 Elapsed: 0.010s
+"_input" in: sky130A_mr.lydrc:116
+Elapsed: 0.000s
 "_input" in: sky130A_mr.lydrc:117
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:119
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:120
-Elapsed: 0.000s
-"_input" in: sky130A_mr.lydrc:122
 Elapsed: 0.010s
+"_input" in: sky130A_mr.lydrc:122
+Elapsed: 0.000s
 "_input" in: sky130A_mr.lydrc:123
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:125
@@ -75,37 +75,37 @@
 "_input" in: sky130A_mr.lydrc:132
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:133
-Elapsed: 0.010s
-"_input" in: sky130A_mr.lydrc:134
 Elapsed: 0.000s
+"_input" in: sky130A_mr.lydrc:134
+Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:135
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:136
-Elapsed: 0.010s
-"_input" in: sky130A_mr.lydrc:137
 Elapsed: 0.000s
+"_input" in: sky130A_mr.lydrc:137
+Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:138
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:139
-Elapsed: 0.010s
-"_input" in: sky130A_mr.lydrc:140
 Elapsed: 0.000s
+"_input" in: sky130A_mr.lydrc:140
+Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:141
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:142
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:143
-Elapsed: 0.010s
-"_input" in: sky130A_mr.lydrc:144
 Elapsed: 0.000s
+"_input" in: sky130A_mr.lydrc:144
+Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:145
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:146
-Elapsed: 0.010s
-"_input" in: sky130A_mr.lydrc:147
 Elapsed: 0.000s
+"_input" in: sky130A_mr.lydrc:147
+Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:148
-Elapsed: 0.020s
+Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:149
 Elapsed: 0.000s
 "_input" in: sky130A_mr.lydrc:150
@@ -127,17 +127,17 @@
 "_input" in: sky130A_mr.lydrc:158
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:159
-Elapsed: 0.010s
-"_input" in: sky130A_mr.lydrc:160
 Elapsed: 0.000s
-"_input" in: sky130A_mr.lydrc:161
+"_input" in: sky130A_mr.lydrc:160
 Elapsed: 0.010s
+"_input" in: sky130A_mr.lydrc:161
+Elapsed: 0.000s
 "_input" in: sky130A_mr.lydrc:162
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:163
-Elapsed: 0.000s
-"_input" in: sky130A_mr.lydrc:164
 Elapsed: 0.010s
+"_input" in: sky130A_mr.lydrc:164
+Elapsed: 0.000s
 "_input" in: sky130A_mr.lydrc:165
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:166
@@ -157,7 +157,7 @@
 "_input" in: sky130A_mr.lydrc:173
 Elapsed: 0.000s
 "_input" in: sky130A_mr.lydrc:174
-Elapsed: 0.010s
+Elapsed: 0.000s
 "_input" in: sky130A_mr.lydrc:175
 Elapsed: 0.010s
 "_input" in: sky130A_mr.lydrc:176
@@ -176,14 +176,14 @@
 "width_check" in: sky130A_mr.lydrc:207
 Elapsed: 0.010s
 "_output" in: sky130A_mr.lydrc:207
-Elapsed: 0.000s
+Elapsed: 0.010s
 nwell
 "width_check" in: sky130A_mr.lydrc:215
-Elapsed: 0.010s
+Elapsed: 0.000s
 "_output" in: sky130A_mr.lydrc:215
 Elapsed: 0.010s
 "isolated_check" in: sky130A_mr.lydrc:216
-Elapsed: 0.000s
+Elapsed: 0.010s
 "_output" in: sky130A_mr.lydrc:216
 Elapsed: 0.010s
 hvtp
@@ -197,9 +197,9 @@
 Elapsed: 0.010s
 htvr
 "width_check" in: sky130A_mr.lydrc:243
-Elapsed: 0.010s
-"_output" in: sky130A_mr.lydrc:243
 Elapsed: 0.000s
+"_output" in: sky130A_mr.lydrc:243
+Elapsed: 0.010s
 "isolated_check" in: sky130A_mr.lydrc:244
 Elapsed: 0.010s
 "_output" in: sky130A_mr.lydrc:244
@@ -211,34 +211,34 @@
 Elapsed: 0.010s
 ncm
 "width_check" in: sky130A_mr.lydrc:261
-Elapsed: 0.010s
-"_output" in: sky130A_mr.lydrc:261
 Elapsed: 0.000s
+"_output" in: sky130A_mr.lydrc:261
+Elapsed: 0.010s
 diff-tap
 "+" in: sky130A_mr.lydrc:270
 Elapsed: 0.010s
 "isolated_check" in: sky130A_mr.lydrc:280
-Elapsed: 0.010s
+Elapsed: 0.000s
 "_output" in: sky130A_mr.lydrc:280
 Elapsed: 0.010s
 tunm
 "width_check" in: sky130A_mr.lydrc:293
 Elapsed: 0.010s
 "_output" in: sky130A_mr.lydrc:293
-Elapsed: 0.010s
+Elapsed: 0.000s
 "isolated_check" in: sky130A_mr.lydrc:294
 Elapsed: 0.000s
 "_output" in: sky130A_mr.lydrc:294
-Elapsed: 0.000s
+Elapsed: 0.010s
 poly
 "width_check" in: sky130A_mr.lydrc:303
 Elapsed: 0.010s
 "_output" in: sky130A_mr.lydrc:303
 Elapsed: 0.010s
 "-" in: sky130A_mr.lydrc:308
-Elapsed: 0.010s
+Elapsed: 0.000s
 "isolated_check" in: sky130A_mr.lydrc:308
-Elapsed: 0.010s
+Elapsed: 0.020s
 "_output" in: sky130A_mr.lydrc:308
 Elapsed: 0.000s
 rpm
@@ -271,12 +271,6 @@
 "with_length" in: sky130A_mr.lydrc:382
 Elapsed: 0.010s
 "_output" in: sky130A_mr.lydrc:382
-Elapsed: 0.000s
-"interacting" in: sky130A_mr.lydrc:383
-Elapsed: 0.020s
-"&" in: sky130A_mr.lydrc:383
-Elapsed: 0.010s
-"&" in: sky130A_mr.lydrc:383
 Elapsed: 0.010s
 "interacting" in: sky130A_mr.lydrc:383
 Elapsed: 0.020s
@@ -284,10 +278,16 @@
 Elapsed: 0.010s
 "&" in: sky130A_mr.lydrc:383
 Elapsed: 0.010s
+"interacting" in: sky130A_mr.lydrc:383
+Elapsed: 0.010s
+"&" in: sky130A_mr.lydrc:383
+Elapsed: 0.010s
+"&" in: sky130A_mr.lydrc:383
+Elapsed: 0.020s
 "edges" in: sky130A_mr.lydrc:383
-Elapsed: 0.010s
-"with_length" in: sky130A_mr.lydrc:383
 Elapsed: 0.000s
+"with_length" in: sky130A_mr.lydrc:383
+Elapsed: 0.010s
 "interacting" in: sky130A_mr.lydrc:383
 Elapsed: 0.010s
 "&" in: sky130A_mr.lydrc:383
@@ -299,25 +299,25 @@
 "with_length" in: sky130A_mr.lydrc:383
 Elapsed: 0.010s
 "|" in: sky130A_mr.lydrc:383
-Elapsed: 0.000s
+Elapsed: 0.010s
 "not_interacting" in: sky130A_mr.lydrc:383
-Elapsed: 0.020s
+Elapsed: 0.010s
 "_output" in: sky130A_mr.lydrc:383
 Elapsed: 0.010s
 "|" in: sky130A_mr.lydrc:411
-Elapsed: 0.000s
+Elapsed: 0.010s
 "&" in: sky130A_mr.lydrc:411
-Elapsed: 0.020s
+Elapsed: 0.010s
 "separation_check" in: sky130A_mr.lydrc:411
 Elapsed: 0.010s
 "_output" in: sky130A_mr.lydrc:411
-Elapsed: 0.000s
+Elapsed: 0.010s
 vpp
 capm
 "width_check" in: sky130A_mr.lydrc:445
 Elapsed: 0.010s
 "_output" in: sky130A_mr.lydrc:445
-Elapsed: 0.010s
+Elapsed: 0.000s
 "isolated_check" in: sky130A_mr.lydrc:446
 Elapsed: 0.010s
 "_output" in: sky130A_mr.lydrc:446
@@ -331,11 +331,11 @@
 "enclosing_check" in: sky130A_mr.lydrc:448
 Elapsed: 0.010s
 "_output" in: sky130A_mr.lydrc:448
-Elapsed: 0.000s
+Elapsed: 0.010s
 "enclosing_check" in: sky130A_mr.lydrc:449
 Elapsed: 0.010s
 "_output" in: sky130A_mr.lydrc:449
-Elapsed: 0.010s
+Elapsed: 0.000s
 "separation_check" in: sky130A_mr.lydrc:450
 Elapsed: 0.010s
 "_output" in: sky130A_mr.lydrc:450
@@ -343,7 +343,7 @@
 FEOL section
 hvi
 "width_check" in: sky130A_mr.lydrc:766
-Elapsed: 0.000s
+Elapsed: 0.010s
 "_output" in: sky130A_mr.lydrc:766
 Elapsed: 0.010s
 hvntm
diff --git a/checks/magic_drc.log b/checks/magic_drc.log
index 488bbba..16a5193 100644
--- a/checks/magic_drc.log
+++ b/checks/magic_drc.log
@@ -6,9 +6,9 @@
 Processing system .magicrc file
 Sourcing design .magicrc for technology sky130A ...
 2 Magic internal units = 1 Lambda
-Could not find file '/home/lss/skywater/open_pdks/sky130/sky130A//sky130A/libs.tech/magic/sky130A.tech' in any of these directories:
+Could not find file '/home/lss/Documents/open_pdks/sky130/sky130A//sky130A/libs.tech/magic/sky130A.tech' in any of these directories:
          . /build/lib/magic/sys /build/lib/magic/sys/current
-Error parsing ".magicrc": couldn't read file "/home/lss/skywater/open_pdks/sky130/sky130A//sky130A/libs.tech/magic/sky130A.tcl": no such file or directory
+Error parsing ".magicrc": couldn't read file "/home/lss/Documents/open_pdks/sky130/sky130A//sky130A/libs.tech/magic/sky130A.tcl": no such file or directory
 Bad local startup file ".magicrc", continuing without.
 Scaled tech values by 2 / 1 to match internal grid scaling
 Loading "/usr/local/bin/drc_checks/magic_drc_check.tcl" from command line.
diff --git a/checks/met_min_ca_density_check.log b/checks/met_min_ca_density_check.log
index a137a07..d9dc432 100644
--- a/checks/met_min_ca_density_check.log
+++ b/checks/met_min_ca_density_check.log
@@ -1,5 +1,5 @@
 li1_ca_density is 0.9999715325391112
-m1_ca_density is 0.9999388794729724
+m1_ca_density is 0.9999389613242333
 m2_ca_density is 0.9997191108149128
 m3_ca_density is 0.9890867026020587
 m4_ca_density is 0.9985556218477584
diff --git a/checks/user_analog_project_wrapper_klayout_drc.xml b/checks/user_analog_project_wrapper_klayout_drc.xml
index 5922ce5..f0fe3ba 100644
--- a/checks/user_analog_project_wrapper_klayout_drc.xml
+++ b/checks/user_analog_project_wrapper_klayout_drc.xml
@@ -226,12 +226,12 @@
    </references>
   </cell>
   <cell>
-   <name>sky130_fd_pr__res_xhigh_po_0p35_NZHUVC</name>
+   <name>sky130_fd_pr__res_xhigh_po_0p35_NMF79C</name>
    <variant/>
    <references>
     <ref>
      <parent>user_analog_project_wrapper</parent>
-     <trans>m45 *1 2489.02,3371.035</trans>
+     <trans>m45 *1 2489.01,3371.065</trans>
     </ref>
    </references>
   </cell>
@@ -245,95 +245,95 @@
    <multiplicity>1</multiplicity>
    <image/>
    <values>
-    <value>edge-pair: (6.423,0.9;7.96,0.9)/(8.717,-0.12;7.18,-0.12)</value>
+    <value>edge-pair: (6.407,0.88;7.96,0.88)/(8.743,-0.12;7.19,-0.12)</value>
    </values>
   </item>
   <item>
    <tags/>
    <category>'licon.1'</category>
-   <cell>sky130_fd_pr__res_xhigh_po_0p35_NZHUVC</cell>
+   <cell>sky130_fd_pr__res_xhigh_po_0p35_NMF79C</cell>
    <visited>false</visited>
    <multiplicity>1</multiplicity>
    <image/>
    <values>
-    <value>edge: (-0.095,0.46;-0.095,2.46)</value>
+    <value>edge: (-0.095,0.51;-0.095,2.51)</value>
    </values>
   </item>
   <item>
    <tags/>
    <category>'licon.1'</category>
-   <cell>sky130_fd_pr__res_xhigh_po_0p35_NZHUVC</cell>
+   <cell>sky130_fd_pr__res_xhigh_po_0p35_NMF79C</cell>
    <visited>false</visited>
    <multiplicity>1</multiplicity>
    <image/>
    <values>
-    <value>edge: (-0.095,2.46;0.095,2.46)</value>
+    <value>edge: (-0.095,2.51;0.095,2.51)</value>
    </values>
   </item>
   <item>
    <tags/>
    <category>'licon.1'</category>
-   <cell>sky130_fd_pr__res_xhigh_po_0p35_NZHUVC</cell>
+   <cell>sky130_fd_pr__res_xhigh_po_0p35_NMF79C</cell>
    <visited>false</visited>
    <multiplicity>1</multiplicity>
    <image/>
    <values>
-    <value>edge: (0.095,2.46;0.095,0.46)</value>
+    <value>edge: (0.095,2.51;0.095,0.51)</value>
    </values>
   </item>
   <item>
    <tags/>
    <category>'licon.1'</category>
-   <cell>sky130_fd_pr__res_xhigh_po_0p35_NZHUVC</cell>
+   <cell>sky130_fd_pr__res_xhigh_po_0p35_NMF79C</cell>
    <visited>false</visited>
    <multiplicity>1</multiplicity>
    <image/>
    <values>
-    <value>edge: (0.095,0.46;-0.095,0.46)</value>
+    <value>edge: (0.095,0.51;-0.095,0.51)</value>
    </values>
   </item>
   <item>
    <tags/>
    <category>'licon.1'</category>
-   <cell>sky130_fd_pr__res_xhigh_po_0p35_NZHUVC</cell>
+   <cell>sky130_fd_pr__res_xhigh_po_0p35_NMF79C</cell>
    <visited>false</visited>
    <multiplicity>1</multiplicity>
    <image/>
    <values>
-    <value>edge: (-0.095,-2.46;-0.095,-0.46)</value>
+    <value>edge: (-0.095,-2.51;-0.095,-0.51)</value>
    </values>
   </item>
   <item>
    <tags/>
    <category>'licon.1'</category>
-   <cell>sky130_fd_pr__res_xhigh_po_0p35_NZHUVC</cell>
+   <cell>sky130_fd_pr__res_xhigh_po_0p35_NMF79C</cell>
    <visited>false</visited>
    <multiplicity>1</multiplicity>
    <image/>
    <values>
-    <value>edge: (-0.095,-0.46;0.095,-0.46)</value>
+    <value>edge: (-0.095,-0.51;0.095,-0.51)</value>
    </values>
   </item>
   <item>
    <tags/>
    <category>'licon.1'</category>
-   <cell>sky130_fd_pr__res_xhigh_po_0p35_NZHUVC</cell>
+   <cell>sky130_fd_pr__res_xhigh_po_0p35_NMF79C</cell>
    <visited>false</visited>
    <multiplicity>1</multiplicity>
    <image/>
    <values>
-    <value>edge: (0.095,-0.46;0.095,-2.46)</value>
+    <value>edge: (0.095,-0.51;0.095,-2.51)</value>
    </values>
   </item>
   <item>
    <tags/>
    <category>'licon.1'</category>
-   <cell>sky130_fd_pr__res_xhigh_po_0p35_NZHUVC</cell>
+   <cell>sky130_fd_pr__res_xhigh_po_0p35_NMF79C</cell>
    <visited>false</visited>
    <multiplicity>1</multiplicity>
    <image/>
    <values>
-    <value>edge: (0.095,-2.46;-0.095,-2.46)</value>
+    <value>edge: (0.095,-2.51;-0.095,-2.51)</value>
    </values>
   </item>
  </items>
diff --git a/gds/user_analog_project_wrapper.gds.gz b/gds/user_analog_project_wrapper.gds.gz
index c8d0b36..ceb4b00 100644
--- a/gds/user_analog_project_wrapper.gds.gz
+++ b/gds/user_analog_project_wrapper.gds.gz
Binary files differ
diff --git a/mag/analogneuron_invopamp_re_15kfeedbck.mag b/mag/analogneuron_invopamp_re_15kfeedbck.mag
index 36c51a2..b3642dd 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 1628105024
+timestamp 1628375466
 << pwell >>
 rect 10446 320 10450 334
 << locali >>
@@ -205,6 +205,18 @@
 rect 10668 -30 10686 232
 rect 156 -46 10686 -30
 rect -15 -54 10686 -46
+use sky130_fd_pr__res_xhigh_po_0p35_NMF79C  sky130_fd_pr__res_xhigh_po_0p35_NMF79C_2
+timestamp 1628375466
+transform 0 1 -840 -1 0 753
+box -37 -518 37 518
+use sky130_fd_pr__res_xhigh_po_0p35_NMF79C  sky130_fd_pr__res_xhigh_po_0p35_NMF79C_1
+timestamp 1628375466
+transform 0 1 -840 -1 0 417
+box -37 -518 37 518
+use sky130_fd_pr__res_xhigh_po_0p35_NMF79C  sky130_fd_pr__res_xhigh_po_0p35_NMF79C_0
+timestamp 1628375466
+transform 0 1 -842 -1 0 87
+box -37 -518 37 518
 use Stage1_inv  Stage1_inv_0
 timestamp 1627987662
 transform 1 0 362 0 1 1178
@@ -229,18 +241,6 @@
 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
diff --git a/mag/aninv_.mag b/mag/aninv_.mag
index 81a6519..ccc40e9 100644
--- a/mag/aninv_.mag
+++ b/mag/aninv_.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1628141510
+timestamp 1628375762
 << poly >>
 rect 1196 371 1226 429
 rect 1143 367 1226 371
@@ -41,19 +41,20 @@
 rect 506 340 1548 386
 rect 324 140 334 208
 rect 766 140 776 208
-rect 1425 173 1548 340
+rect 1425 153 1548 340
+rect 1425 152 1705 153
 rect 334 20 762 140
-rect 1425 103 1546 173
-rect 1648 152 1705 153
-rect 1648 103 1798 152
-rect 1425 101 1798 103
-rect 964 1 1798 101
+rect 1425 90 1798 152
+rect 974 74 1798 90
+rect 974 14 1796 74
+rect 1396 8 1796 14
+rect 1486 6 1666 8
 rect 244 -294 296 -230
 rect 448 -242 458 -190
 rect 776 -242 786 -190
 rect 944 -340 954 -280
 rect 1272 -340 1282 -280
-rect 1486 -318 1574 1
+rect 1486 -318 1574 6
 rect 448 -430 458 -378
 rect 776 -430 786 -378
 rect 1380 -398 1574 -318
@@ -156,6 +157,10 @@
 rect 1272 -340 1282 -280
 rect 944 -345 1282 -340
 rect 954 -346 1210 -345
+use sky130_fd_pr__res_high_po_0p35_4HD3S6  sky130_fd_pr__res_high_po_0p35_4HD3S6_0
+timestamp 1628375762
+transform 0 1 866 -1 0 49
+box -37 -532 37 532
 use sky130_fd_pr__nfet_01v8_XG2GE7  sky130_fd_pr__nfet_01v8_XG2GE7_0
 timestamp 1628080314
 transform 0 1 838 -1 0 -309
@@ -164,10 +169,6 @@
 timestamp 1628080314
 transform 1 0 875 0 1 859
 box -551 -649 551 649
-use sky130_fd_pr__res_high_po_0p35_C72MAQ  sky130_fd_pr__res_high_po_0p35_C72MAQ_0
-timestamp 1628058135
-transform 0 1 864 -1 0 53
-box -37 -532 37 532
 use sky130_fd_pr__res_high_po_0p69_7JPRER  sky130_fd_pr__res_high_po_0p69_7JPRER_0
 timestamp 1628069922
 transform 1 0 1719 0 1 543
diff --git a/mag/neuron_s.mag b/mag/neuron_s.mag
index a66004f..d1785b0 100644
--- a/mag/neuron_s.mag
+++ b/mag/neuron_s.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1628141510
+timestamp 1628374894
 << metal1 >>
 rect -6183 4348 -4726 4674
 rect -6176 1604 -4518 1896
@@ -10,25 +10,6 @@
 rect 1142 1270 1162 1736
 rect 442 1210 1162 1270
 rect 11910 1040 12486 1410
-rect 0 1010 436 1020
-rect 0 942 438 1010
-rect 588 1004 1070 1034
-rect 588 952 600 1004
-rect 1008 952 1070 1004
-rect 0 936 436 942
-rect 588 934 1070 952
-rect 10 702 430 740
-rect -2 616 432 702
-rect 584 686 1020 698
-rect 584 630 596 686
-rect 1008 630 1020 686
-rect 584 618 1020 630
-rect 8 364 438 370
-rect 8 294 440 364
-rect 590 354 1030 362
-rect 590 300 596 354
-rect 1014 300 1030 354
-rect 590 288 1030 300
 rect -6200 -1284 -4518 -992
 << via1 >>
 rect 446 1270 1142 1736
@@ -71,22 +52,22 @@
 rect 436 1265 1152 1270
 rect 11886 190 13048 498
 rect -3039 -1845 -711 -1755
-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 1628141510
-transform -1 0 -2858 0 1 3671
-box -63 -721 1952 1584
-use aninv_  aninv__1
-timestamp 1628141510
-transform -1 0 -2858 0 1 899
-box -63 -721 1952 1584
 use aninv_  aninv__2
-timestamp 1628141510
+timestamp 1628374894
 transform -1 0 -2858 0 1 -1981
 box -63 -721 1952 1584
+use aninv_  aninv__1
+timestamp 1628374894
+transform -1 0 -2858 0 1 899
+box -63 -721 1952 1584
+use aninv_  aninv__0
+timestamp 1628374894
+transform -1 0 -2858 0 1 3671
+box -63 -721 1952 1584
+use analogneuron_invopamp_re_15kfeedbck  analogneuron_invopamp_re_15kfeedbck_0
+timestamp 1628374894
+transform 1 0 1354 0 1 234
+box -1354 -234 10724 2910
 << labels >>
 rlabel metal3 12386 200 13016 482 1 Out
 port 1 n
diff --git a/mag/sky130_fd_pr__res_high_po_0p35_4HD3S6.mag b/mag/sky130_fd_pr__res_high_po_0p35_4HD3S6.mag
new file mode 100644
index 0000000..78ce693
--- /dev/null
+++ b/mag/sky130_fd_pr__res_high_po_0p35_4HD3S6.mag
@@ -0,0 +1,28 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1628375762
+<< xpolycontact >>
+rect -35 100 35 532
+rect -35 -532 35 -100
+<< ppolyres >>
+rect -35 -100 35 100
+<< viali >>
+rect -19 117 19 514
+rect -19 -514 19 -117
+<< metal1 >>
+rect -25 514 25 526
+rect -25 117 -19 514
+rect 19 117 25 514
+rect -25 105 25 117
+rect -25 -117 25 -105
+rect -25 -514 -19 -117
+rect 19 -514 25 -117
+rect -25 -526 25 -514
+<< res0p35 >>
+rect -37 -102 37 102
+<< properties >>
+string gencell sky130_fd_pr__res_high_po_0p35
+string parameters w 0.350 l 1 m 1 nx 1 wmin 0.350 lmin 0.50 rho 319.8 val 1.023k dummy 0 dw 0.0 term 19.188 sterm 0.0 caplen 0 guard 0 glc 0 grc 0 gtc 0 gbc 0 compatible {sky130_fd_pr__res_high_po_0p35  sky130_fd_pr__res_high_po_0p69 sky130_fd_pr__res_high_po_1p41  sky130_fd_pr__res_high_po_2p85 sky130_fd_pr__res_high_po_5p73} full_metal 0 wmax 0.350 vias 1 n_guard 0 hv_guard 0 viagb 0 viagt 0 viagl 0 viagr 0
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__res_high_po_0p35_T7K8VD.mag b/mag/sky130_fd_pr__res_high_po_0p35_T7K8VD.mag
new file mode 100644
index 0000000..9eaf64f
--- /dev/null
+++ b/mag/sky130_fd_pr__res_high_po_0p35_T7K8VD.mag
@@ -0,0 +1,54 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1628375762
+<< pwell >>
+rect -201 -698 201 698
+<< psubdiff >>
+rect -165 628 -69 662
+rect 69 628 165 662
+rect -165 566 -131 628
+rect 131 566 165 628
+rect -165 -628 -131 -566
+rect 131 -628 165 -566
+rect -165 -662 -69 -628
+rect 69 -662 165 -628
+<< psubdiffcont >>
+rect -69 628 69 662
+rect -165 -566 -131 566
+rect 131 -566 165 566
+rect -69 -662 69 -628
+<< xpolycontact >>
+rect -35 100 35 532
+rect -35 -532 35 -100
+<< ppolyres >>
+rect -35 -100 35 100
+<< locali >>
+rect -165 628 -69 662
+rect 69 628 165 662
+rect -165 566 -131 628
+rect 131 566 165 628
+rect -165 -628 -131 -566
+rect 131 -628 165 -566
+rect -165 -662 -69 -628
+rect 69 -662 165 -628
+<< viali >>
+rect -19 117 19 514
+rect -19 -514 19 -117
+<< metal1 >>
+rect -25 514 25 526
+rect -25 117 -19 514
+rect 19 117 25 514
+rect -25 105 25 117
+rect -25 -117 25 -105
+rect -25 -514 -19 -117
+rect 19 -514 25 -117
+rect -25 -526 25 -514
+<< res0p35 >>
+rect -37 -102 37 102
+<< properties >>
+string gencell sky130_fd_pr__res_high_po_0p35
+string FIXED_BBOX -148 -645 148 645
+string parameters w 0.350 l 1 m 1 nx 1 wmin 0.350 lmin 0.50 rho 319.8 val 1.023k dummy 0 dw 0.0 term 19.188 sterm 0.0 caplen 0 guard 1 glc 1 grc 1 gtc 1 gbc 1 compatible {sky130_fd_pr__res_high_po_0p35  sky130_fd_pr__res_high_po_0p69 sky130_fd_pr__res_high_po_1p41  sky130_fd_pr__res_high_po_2p85 sky130_fd_pr__res_high_po_5p73} full_metal 1 wmax 0.350 vias 1 n_guard 0 hv_guard 0 viagb 0 viagt 0 viagl 0 viagr 0
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__res_high_po_0p69_K3B957.mag b/mag/sky130_fd_pr__res_high_po_0p69_K3B957.mag
new file mode 100644
index 0000000..933b680
--- /dev/null
+++ b/mag/sky130_fd_pr__res_high_po_0p69_K3B957.mag
@@ -0,0 +1,28 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1628283727
+<< xpolycontact >>
+rect -69 96 69 528
+rect -69 -528 69 -96
+<< ppolyres >>
+rect -69 -96 69 96
+<< viali >>
+rect -53 113 53 510
+rect -53 -510 53 -113
+<< metal1 >>
+rect -59 510 59 522
+rect -59 113 -53 510
+rect 53 113 59 510
+rect -59 101 59 113
+rect -59 -113 59 -101
+rect -59 -510 -53 -113
+rect 53 -510 59 -113
+rect -59 -522 59 -510
+<< res0p69 >>
+rect -71 -98 71 98
+<< properties >>
+string gencell sky130_fd_pr__res_high_po_0p69
+string parameters w 0.690 l .96 m 1 nx 1 wmin 0.690 lmin 0.50 rho 319.8 val 500.556 dummy 0 dw 0.0 term 19.188 sterm 0.0 caplen 0 guard 0 glc 0 grc 0 gtc 0 gbc 0 compatible {sky130_fd_pr__res_high_po_0p35  sky130_fd_pr__res_high_po_0p69 sky130_fd_pr__res_high_po_1p41  sky130_fd_pr__res_high_po_2p85 sky130_fd_pr__res_high_po_5p73} full_metal 0 wmax 0.690 n_guard 0 hv_guard 0 vias 1 viagb 0 viagt 0 viagl 0 viagr 0
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__res_high_po_0p69_PM62L5.mag b/mag/sky130_fd_pr__res_high_po_0p69_PM62L5.mag
new file mode 100644
index 0000000..1cd7a1f
--- /dev/null
+++ b/mag/sky130_fd_pr__res_high_po_0p69_PM62L5.mag
@@ -0,0 +1,28 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1628375762
+<< xpolycontact >>
+rect -69 210 69 642
+rect -69 -642 69 -210
+<< ppolyres >>
+rect -69 -210 69 210
+<< viali >>
+rect -53 227 53 624
+rect -53 -624 53 -227
+<< metal1 >>
+rect -59 624 59 636
+rect -59 227 -53 624
+rect 53 227 59 624
+rect -59 215 59 227
+rect -59 -227 59 -215
+rect -59 -624 -53 -227
+rect 53 -624 59 -227
+rect -59 -636 59 -624
+<< res0p69 >>
+rect -71 -212 71 212
+<< properties >>
+string gencell sky130_fd_pr__res_high_po_0p69
+string parameters w 0.690 l 2.1 m 1 nx 1 wmin 0.690 lmin 0.50 rho 319.8 val 1.028k dummy 0 dw 0.0 term 19.188 sterm 0.0 caplen 0 guard 0 glc 0 grc 0 gtc 0 gbc 0 compatible {sky130_fd_pr__res_high_po_0p35  sky130_fd_pr__res_high_po_0p69 sky130_fd_pr__res_high_po_1p41  sky130_fd_pr__res_high_po_2p85 sky130_fd_pr__res_high_po_5p73} full_metal 0 wmax 0.690 n_guard 0 hv_guard 0 vias 1 viagb 0 viagt 0 viagl 0 viagr 0
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__res_xhigh_po_0p35_JM5TW9.mag b/mag/sky130_fd_pr__res_xhigh_po_0p35_JM5TW9.mag
new file mode 100644
index 0000000..0c1aa9a
--- /dev/null
+++ b/mag/sky130_fd_pr__res_xhigh_po_0p35_JM5TW9.mag
@@ -0,0 +1,28 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1628374894
+<< xpolycontact >>
+rect -35 100 35 532
+rect -35 -532 35 -100
+<< xpolyres >>
+rect -35 -100 35 100
+<< viali >>
+rect -19 117 19 514
+rect -19 -514 19 -117
+<< metal1 >>
+rect -25 514 25 526
+rect -25 117 -19 514
+rect 19 117 25 514
+rect -25 105 25 117
+rect -25 -117 25 -105
+rect -25 -514 -19 -117
+rect 19 -514 25 -117
+rect -25 -526 25 -514
+<< res0p35 >>
+rect -37 -102 37 102
+<< properties >>
+string gencell sky130_fd_pr__res_xhigh_po_0p35
+string parameters w 0.350 l 1 m 1 nx 1 wmin 0.350 lmin 0.50 rho 2000 val 5.823k dummy 0 dw 0.0 term 19.188 sterm 0.0 caplen 0 wmax 0.350 guard 0 glc 0 grc 0 gtc 0 gbc 0 compatible {sky130_fd_pr__res_xhigh_po_0p35  sky130_fd_pr__res_xhigh_po_0p69 sky130_fd_pr__res_xhigh_po_1p41  sky130_fd_pr__res_xhigh_po_2p85 sky130_fd_pr__res_xhigh_po_5p73} full_metal 0 n_guard 0 hv_guard 0 vias 1 viagb 0 viagt 0 viagl 0 viagr 0
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__res_xhigh_po_0p35_NMF79C.mag b/mag/sky130_fd_pr__res_xhigh_po_0p35_NMF79C.mag
new file mode 100644
index 0000000..7c25444
--- /dev/null
+++ b/mag/sky130_fd_pr__res_xhigh_po_0p35_NMF79C.mag
@@ -0,0 +1,28 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1628375466
+<< xpolycontact >>
+rect -35 86 35 518
+rect -35 -518 35 -86
+<< xpolyres >>
+rect -35 -86 35 86
+<< viali >>
+rect -19 103 19 500
+rect -19 -500 19 -103
+<< metal1 >>
+rect -25 500 25 512
+rect -25 103 -19 500
+rect 19 103 25 500
+rect -25 91 25 103
+rect -25 -103 25 -91
+rect -25 -500 -19 -103
+rect 19 -500 25 -103
+rect -25 -512 25 -500
+<< res0p35 >>
+rect -37 -88 37 88
+<< properties >>
+string gencell sky130_fd_pr__res_xhigh_po_0p35
+string parameters w 0.350 l 0.86 m 1 nx 1 wmin 0.350 lmin 0.50 rho 2000 val 5.023k dummy 0 dw 0.0 term 19.188 sterm 0.0 caplen 0 wmax 0.350 guard 0 glc 0 grc 0 gtc 0 gbc 0 compatible {sky130_fd_pr__res_xhigh_po_0p35  sky130_fd_pr__res_xhigh_po_0p69 sky130_fd_pr__res_xhigh_po_1p41  sky130_fd_pr__res_xhigh_po_2p85 sky130_fd_pr__res_xhigh_po_5p73} full_metal 0 n_guard 0 hv_guard 0 vias 1 viagb 0 viagt 0 viagl 0 viagr 0
+string library sky130
+<< end >>
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index 640da11..5fed399 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,8 +1,13 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1628083528
+timestamp 1628375353
 << metal1 >>
+rect 492634 676556 492968 676558
+rect 492634 676512 493046 676556
+rect 492634 676424 493048 676512
+rect 492644 676378 493048 676424
+rect 492644 676372 492978 676378
 rect 483170 675810 491654 675818
 rect 483166 675530 483176 675810
 rect 483960 675530 491654 675810
@@ -839,7 +844,7 @@
 rect 584000 0 584100 704000
 rect -100 -100 584100 0
 use neuron_s  neuron_s_0
-timestamp 1628080429
+timestamp 1628374894
 transform 1 0 497290 0 -1 674534
 box -6200 -3042 13048 5990
 << labels >>