diff --git a/gds/user_analog_project_wrapper.gds b/gds/user_analog_project_wrapper.gds
index 7dcf3d0..68dd31e 100644
--- a/gds/user_analog_project_wrapper.gds
+++ b/gds/user_analog_project_wrapper.gds
Binary files differ
diff --git a/gds/user_analog_project_wrapper_erased.gds b/gds/user_analog_project_wrapper_erased.gds
index e69de29..c45ff7e 100644
--- a/gds/user_analog_project_wrapper_erased.gds
+++ b/gds/user_analog_project_wrapper_erased.gds
Binary files differ
diff --git a/mag/nmos_substrate.mag b/mag/nmos_substrate.mag
new file mode 100644
index 0000000..f65ec5b
--- /dev/null
+++ b/mag/nmos_substrate.mag
@@ -0,0 +1,25 @@
+magic
+tech sky130A
+timestamp 1621345663
+<< pwell >>
+rect -13 -13 61 61
+<< mvpsubdiff >>
+rect 0 32 48 48
+rect 0 15 15 32
+rect 32 15 48 32
+rect 0 0 48 15
+<< mvpsubdiffcont >>
+rect 15 15 32 32
+<< locali >>
+rect 0 32 48 48
+rect 0 15 15 32
+rect 32 15 48 32
+rect 0 0 48 15
+<< viali >>
+rect 15 15 32 32
+<< metal1 >>
+rect 0 32 48 48
+rect 0 15 15 32
+rect 32 15 48 32
+rect 0 0 48 15
+<< end >>
diff --git a/mag/pmos_substrate.mag b/mag/pmos_substrate.mag
new file mode 100644
index 0000000..588d4c7
--- /dev/null
+++ b/mag/pmos_substrate.mag
@@ -0,0 +1,26 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1621345663
+<< nwell >>
+rect -66 -68 162 162
+<< mvnsubdiff >>
+rect 0 64 96 96
+rect 0 30 31 64
+rect 65 30 96 64
+rect 0 0 96 30
+<< mvnsubdiffcont >>
+rect 31 30 65 64
+<< locali >>
+rect 0 64 96 96
+rect 0 30 31 64
+rect 65 30 96 64
+rect 0 0 96 30
+<< viali >>
+rect 31 30 65 64
+<< metal1 >>
+rect 0 64 96 96
+rect 0 30 31 64
+rect 65 30 96 64
+rect 0 0 96 30
+<< end >>
diff --git a/mag/user_analog_proj_example.mag b/mag/user_analog_proj_example.mag
new file mode 100644
index 0000000..f7ee53c
--- /dev/null
+++ b/mag/user_analog_proj_example.mag
@@ -0,0 +1,203 @@
+magic
+tech sky130A
+timestamp 1633348796
+<< checkpaint >>
+rect -1631 822 -297 895
+rect -1631 -439 655 822
+rect -719 -553 655 -439
+<< nwell >>
+rect -2673 6125 2341 7034
+rect -185 427 86 6125
+rect -192 304 86 427
+rect -192 69 81 304
+rect -286 -136 347 69
+<< pwell >>
+rect -1722 127 -926 366
+<< nmos >>
+rect -1344 207 -1244 307
+<< pmos >>
+rect -27 -97 73 3
+<< ndiff >>
+rect -1544 282 -1344 307
+rect -1544 228 -1536 282
+rect -1482 228 -1344 282
+rect -1544 207 -1344 228
+rect -1244 280 -1044 307
+rect -1244 227 -1118 280
+rect -1064 227 -1044 280
+rect -1244 207 -1044 227
+<< pdiff >>
+rect -123 -19 -27 3
+rect -123 -71 -116 -19
+rect -75 -71 -27 -19
+rect -123 -97 -27 -71
+rect 73 -21 177 3
+rect 73 -73 122 -21
+rect 163 -73 177 -21
+rect 73 -97 177 -73
+<< ndiffc >>
+rect -1536 228 -1482 282
+rect -1118 227 -1064 280
+<< pdiffc >>
+rect -116 -71 -75 -19
+rect 122 -73 163 -21
+<< nsubdiff >>
+rect -545 6554 832 6592
+rect -545 6403 -160 6554
+rect 49 6403 832 6554
+rect -545 6321 832 6403
+<< nsubdiffcont >>
+rect -160 6403 49 6554
+<< poly >>
+rect -1344 307 -1244 385
+rect -1344 -28 -1244 207
+rect -27 3 73 42
+rect -1344 -75 -1313 -28
+rect -1271 -75 -1244 -28
+rect -1344 -115 -1244 -75
+rect -27 -389 73 -97
+rect -27 -441 10 -389
+rect 49 -441 73 -389
+rect -27 -458 73 -441
+<< polycont >>
+rect -1313 -75 -1271 -28
+rect 10 -441 49 -389
+<< xpolycontact >>
+rect -1153 5717 -973 6081
+rect -2355 4764 -2160 5124
+rect 1178 5065 1341 5421
+rect -1175 383 -995 747
+rect 2039 4956 2208 5310
+rect -2355 -482 -2160 -122
+rect 1171 -163 1356 207
+rect 2017 -496 2186 -142
+<< xpolyres >>
+rect -2306 -122 -2271 4764
+rect -1092 747 -1057 5717
+rect 1261 207 1296 5065
+rect 2122 -142 2157 4956
+<< locali >>
+rect -2086 6668 1949 6737
+rect -2086 6358 -1972 6668
+rect -1581 6554 1482 6668
+rect -1581 6403 -160 6554
+rect 49 6403 1482 6554
+rect -1581 6358 1482 6403
+rect -2086 6352 1482 6358
+rect 1855 6352 1949 6668
+rect -2086 6295 1949 6352
+rect -1157 6081 -968 6295
+rect -1157 6067 -1153 6081
+rect -1159 5868 -1153 6067
+rect -2711 5822 -1486 5828
+rect -3412 5664 -1486 5822
+rect -973 6067 -968 6081
+rect -973 5868 -966 6067
+rect -3412 5361 -3311 5664
+rect -2982 5645 -1486 5664
+rect -2982 5361 -1909 5645
+rect -3412 5342 -1909 5361
+rect -1580 5342 -1486 5645
+rect 1614 5462 1880 6295
+rect -3412 5222 -1486 5342
+rect 671 5264 933 5276
+rect -3412 5216 -2187 5222
+rect -2364 5124 -2187 5216
+rect 671 5151 1178 5264
+rect -2364 4925 -2355 5124
+rect -2160 4917 -1542 4943
+rect -2160 4764 -1478 4917
+rect -2344 4752 -1478 4764
+rect -1657 282 -1478 4752
+rect -598 1168 -450 1217
+rect -598 1112 -548 1168
+rect -505 1112 -450 1168
+rect -598 655 -450 1112
+rect 671 655 933 5151
+rect 1614 5329 2183 5462
+rect 1614 5317 1880 5329
+rect 2031 5310 2176 5329
+rect 2031 5127 2039 5310
+rect -830 513 945 655
+rect -1657 228 -1536 282
+rect -1482 228 -1478 282
+rect -1657 168 -1478 228
+rect -1141 280 -1037 383
+rect -1141 227 -1118 280
+rect -1064 227 -1037 280
+rect -1141 211 -1037 227
+rect -1141 177 -1040 211
+rect -1321 9 -68 10
+rect -1365 2 -68 9
+rect 108 2 1171 12
+rect -1365 -19 -55 2
+rect -1365 -28 -116 -19
+rect -1365 -75 -1313 -28
+rect -1271 -71 -116 -28
+rect -75 -71 -55 -19
+rect -1271 -75 -55 -71
+rect -1365 -97 -55 -75
+rect 107 -21 1171 2
+rect 107 -73 122 -21
+rect 163 -73 1171 -21
+rect 107 -97 1171 -73
+rect -1365 -99 -68 -97
+rect 108 -109 1171 -97
+rect -2466 -454 -2355 -360
+rect -2160 -365 -2138 -360
+rect -2160 -368 33 -365
+rect -2160 -389 2017 -368
+rect -2160 -441 10 -389
+rect 49 -441 2017 -389
+rect -2160 -451 2017 -441
+rect -2160 -454 79 -451
+rect -30 -740 79 -454
+rect 2186 -451 2227 -368
+rect -30 -786 2 -740
+rect 57 -786 79 -740
+rect -30 -805 79 -786
+<< viali >>
+rect -1972 6358 -1581 6668
+rect 1482 6352 1855 6668
+rect -3311 5361 -2982 5664
+rect -1909 5342 -1580 5645
+rect -548 1112 -505 1168
+rect 2 -786 57 -740
+<< metal1 >>
+rect -2086 6668 1949 6737
+rect -2086 6358 -1972 6668
+rect -1581 6358 1482 6668
+rect -2086 6352 1482 6358
+rect 1855 6352 1949 6668
+rect -2086 6295 1949 6352
+rect -2711 5822 -1486 5828
+rect -3412 5664 -1486 5822
+rect -3412 5361 -3311 5664
+rect -2982 5645 -1486 5664
+rect -2982 5361 -1909 5645
+rect -3412 5342 -1909 5361
+rect -1580 5342 -1486 5645
+rect -3412 5222 -1486 5342
+rect -3412 5216 -2187 5222
+rect -598 1168 -462 1211
+rect -598 1112 -548 1168
+rect -505 1112 -462 1168
+rect -598 1075 -462 1112
+rect -50 -740 109 -714
+rect -50 -786 2 -740
+rect 57 -786 109 -740
+rect -50 -811 109 -786
+use nmos_substrate  nmos_substrate_0
+timestamp 1621345663
+transform 1 0 -988 0 1 204
+box -13 -13 61 61
+use pmos_substrate  pmos_substrate_0
+timestamp 1621345663
+transform 1 0 -56 0 1 111
+box -33 -34 81 81
+<< labels >>
+rlabel metal1 3 -786 58 -740 1 vin
+rlabel viali -548 1112 -505 1168 1 vout
+rlabel metal1 -255 6390 143 6617 1 vdd
+rlabel metal1 -2648 5354 -2269 5582 1 gnd
+<< end >>
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index 034e559..e6dbe21 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,24 +1,36 @@
 magic
 tech sky130A
-timestamp 1633288337
+timestamp 1633349385
 << metal1 >>
-rect 8685 337835 16022 340199
-rect 19762 339630 29172 341620
-rect 12054 334364 18396 335787
-rect 17054 316893 22337 332906
+rect 18894 341620 22374 341714
+rect 8685 337835 15077 340199
+rect 18894 339630 29172 341620
+rect 18986 339281 21368 339630
+rect 12054 335780 15077 335787
+rect 12054 334364 18104 335780
+rect 14449 334128 18104 334364
+rect 18288 332271 18925 332485
+rect 21982 332271 22337 332906
+rect 17054 316893 22337 332271
+rect 54413 327404 55676 331800
 rect 50424 327107 52388 327138
 rect 50416 325011 52388 327107
-rect 54413 325034 55676 331800
-rect 61376 326958 63388 327000
-rect 57890 325776 63471 326958
 rect 50416 321578 52184 325011
-rect 50416 320724 58120 321578
+rect 54447 324932 54956 327404
+rect 58645 326807 62007 326909
+rect 58645 325584 63413 326807
+rect 50416 321529 54378 321578
+rect 50416 321427 57361 321529
+rect 50416 320724 57442 321427
 rect 50416 320602 52184 320724
-rect 55295 318305 58506 319261
+rect 53713 320673 57442 320724
+rect 57116 320510 57442 320673
+rect 55295 318305 58506 318747
+rect 60968 318676 63413 325584
 rect 55266 318163 58506 318305
 rect 55266 314701 56526 318163
 rect 59104 315777 60493 315901
-rect 61376 315777 63388 325776
+rect 61376 315777 63388 318676
 rect 59104 315756 63388 315777
 rect 59011 314387 63388 315756
 rect 59114 313557 63388 314387
@@ -720,8 +732,8 @@
 rect 121 280581 609 281184
 rect 155 108386 501 108870
 << metal5 >>
-rect 8871 351632 10297 352002
 rect 34053 351758 37396 351997
+rect 8871 351632 10297 351669
 rect 8871 351157 9557 351632
 rect 10138 351157 10297 351632
 rect 8871 345454 10297 351157
@@ -810,17 +822,18 @@
 rect 33870 107733 60974 107914
 rect 59061 107587 60974 107733
 << comment >>
-rect -50 352000 292050 352050
+rect -50 352000 8680 352050
+rect 10325 352000 292050 352050
 rect -50 0 0 352000
 rect 292000 0 292050 352000
 rect -50 -50 292050 0
-use spamp  spamp_1
-timestamp 1629117458
-transform 1 0 18869 0 1 333599
+use user_analog_proj_example  user_analog_proj_example_1
+timestamp 1633348796
+transform 1 0 18489 0 1 333082
 box -3412 -811 2341 7034
-use spamp  spamp_0
-timestamp 1629117458
-transform 1 0 58460 0 1 319969
+use user_analog_proj_example  user_analog_proj_example_0
+timestamp 1633348796
+transform 1 0 57790 0 1 319558
 box -3412 -811 2341 7034
 << labels >>
 flabel metal3 s 291760 134615 292400 134671 0 FreeSans 560 0 0 0 gpio_analog[0]
@@ -2180,5 +2193,5 @@
 flabel metal2 s 3217 -400 3273 240 0 FreeSans 560 90 0 0 wbs_we_i
 port 677 nsew signal input
 << properties >>
-string FIXED_BBOX 0 0 584000 704000
+string FIXED_BBOX 0 0 1168000 1408000
 << end >>