diff --git a/gds/user_analog_project_wrapper.gds b/gds/user_analog_project_wrapper.gds
index aa052a3..95633a7 100644
--- a/gds/user_analog_project_wrapper.gds
+++ b/gds/user_analog_project_wrapper.gds
Binary files differ
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index 353af81..7e0d06c 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,9 +1,17 @@
 magic
 tech sky130A
-timestamp 1641002375
+timestamp 1641005577
+<< locali >>
+rect 44080 325330 44170 325340
+rect 44080 325310 44090 325330
+rect 44160 325310 44170 325330
+rect 44080 325220 44170 325310
 << viali >>
 rect 275750 337500 275780 337560
 rect 276370 337280 276400 337320
+rect 45110 326150 45140 326180
+rect 45010 326030 45040 326060
+rect 44090 325310 44160 325330
 rect 242300 295600 242600 296200
 rect 248400 295900 248700 296200
 << metal1 >>
@@ -19,6 +27,27 @@
 rect 276360 337280 276370 337320
 rect 276400 337280 289100 337320
 rect 276360 337230 289100 337280
+rect 43290 326550 43510 326570
+rect 43290 326460 43310 326550
+rect 43470 326490 43510 326550
+rect 43470 326460 45050 326490
+rect 43290 326450 43510 326460
+rect 45000 326060 45050 326460
+rect 45100 326410 45150 326420
+rect 45100 326340 45110 326410
+rect 45140 326340 45150 326410
+rect 45100 326180 45150 326340
+rect 45100 326150 45110 326180
+rect 45140 326150 45150 326180
+rect 45100 326140 45150 326150
+rect 45000 326030 45010 326060
+rect 45040 326030 45050 326060
+rect 45000 326020 45050 326030
+rect 43700 325310 43710 325340
+rect 43770 325330 44170 325340
+rect 43770 325310 44090 325330
+rect 44160 325310 44170 325330
+rect 43700 325300 44170 325310
 rect 248200 300400 249500 300500
 rect 248200 300200 248300 300400
 rect 248700 300200 249500 300400
@@ -37,14 +66,59 @@
 rect 284400 338070 284570 338140
 rect 275520 337910 275590 337940
 rect 275510 336500 275580 336530
+rect 43310 326460 43470 326550
+rect 45110 326340 45140 326410
+rect 43710 325310 43770 325340
+rect 45330 325120 45360 325180
+rect 43910 325060 43940 325110
 rect 249300 302500 250300 302700
 rect 248300 300200 248700 300400
 rect 241500 295600 241900 296200
 rect 249200 288500 249800 288700
 << metal2 >>
+rect 9350 351530 9750 351610
 rect 207600 351600 208400 351700
+rect 9350 351280 9450 351530
+rect 9680 351280 9750 351530
+rect 9350 329210 9750 351280
+rect 35450 351550 35810 351600
+rect 35450 351190 35490 351550
+rect 35760 351190 35810 351550
+rect 35450 335700 35810 351190
+rect 61480 351460 61700 351500
+rect 61480 351190 61500 351460
+rect 61660 351190 61700 351460
+rect 35430 335660 37330 335700
+rect 35430 335530 43780 335660
+rect 35430 335510 37330 335530
+rect 9310 326570 9760 329210
+rect 43680 329020 43780 335530
+rect 9310 326550 43510 326570
+rect 9310 326460 43310 326550
+rect 43470 326460 43510 326550
+rect 9310 326450 43510 326460
+rect 43700 325340 43770 329020
+rect 61480 326420 61700 351190
+rect 45100 326410 61700 326420
+rect 45100 326340 45110 326410
+rect 45140 326340 61700 326410
+rect 45100 326320 61700 326340
 rect 207600 351300 207700 351600
 rect 208300 351300 208400 351600
+rect 43700 325310 43710 325340
+rect 43700 325300 43770 325310
+rect 45320 325180 45510 325190
+rect 45320 325120 45330 325180
+rect 45360 325120 45510 325180
+rect 43600 325110 43950 325120
+rect 43600 325060 43620 325110
+rect 43730 325060 43910 325110
+rect 43940 325060 43950 325110
+rect 43600 325050 43950 325060
+rect 45320 324240 45510 325120
+rect 45320 324140 45360 324240
+rect 45490 324140 45510 324240
+rect 45320 323870 45510 324140
 rect 207600 296300 208400 351300
 rect 233500 351400 234200 351500
 rect 233500 351200 233600 351400
@@ -595,7 +669,12 @@
 rect 291034 -400 291090 240
 rect 291625 -400 291681 240
 << via2 >>
+rect 9450 351280 9680 351530
+rect 35490 351190 35760 351550
+rect 61500 351190 61660 351460
 rect 207700 351300 208300 351600
+rect 43620 325060 43730 325110
+rect 45360 324140 45490 324240
 rect 233600 351200 234100 351400
 rect 284420 349220 284560 349440
 rect 288760 340130 289030 340370
@@ -604,9 +683,18 @@
 rect 249300 302900 250300 303200
 rect 279000 276000 280000 277000
 << metal3 >>
-rect 8097 351150 10597 352400
-rect 34097 351150 36597 352400
-rect 60097 351150 62597 352400
+rect 8097 351530 10597 352400
+rect 8097 351280 9450 351530
+rect 9680 351280 10597 351530
+rect 8097 351150 10597 351280
+rect 34097 351550 36597 352400
+rect 34097 351190 35490 351550
+rect 35760 351190 36597 351550
+rect 34097 351150 36597 351190
+rect 60097 351460 62597 352400
+rect 60097 351190 61500 351460
+rect 61660 351190 62597 351460
+rect 60097 351150 62597 351190
 rect 82797 351150 85297 352400
 rect 85447 351150 86547 352400
 rect 86697 351150 87797 352400
@@ -643,9 +731,8 @@
 rect 274710 348040 275610 348050
 rect 255275 347500 275610 348040
 rect -400 340121 850 342621
-rect -400 321921 830 324321
-rect -400 316921 830 319321
-rect 255275 307400 256842 347500
+rect 43480 331950 43760 331960
+rect 255275 331950 256842 347500
 rect 260660 347490 275610 347500
 rect 275460 338000 275610 347490
 rect 291150 340400 292400 341492
@@ -657,17 +744,30 @@
 rect 275460 337950 275520 338000
 rect 275580 337950 275610 338000
 rect 275460 337930 275610 337950
-rect 255300 307300 256842 307400
-rect 249200 305900 256842 307300
 rect 275300 336490 275900 336500
 rect 275300 336450 275520 336490
 rect 275570 336450 275900 336490
+rect 43480 330700 256860 331950
+rect 43480 330340 43760 330700
+rect 43490 325110 43750 330340
+rect 43490 325060 43620 325110
+rect 43730 325060 43750 325110
+rect 43490 325050 43750 325060
+rect -400 321921 830 324321
+rect 45300 324240 45970 324260
+rect 45300 324140 45360 324240
+rect 45490 324140 45970 324240
+rect -400 316921 830 319321
+rect 45300 284100 45970 324140
+rect 255275 307400 256842 330700
+rect 255300 307300 256842 307400
+rect 249200 305900 256842 307300
 rect 249200 303200 250400 305900
 rect 249200 302900 249300 303200
 rect 250300 302900 250400 303200
 rect 249200 302600 250400 302900
-rect -400 279721 830 282121
-rect 275300 277800 275900 336450
+rect 45260 284050 66400 284100
+rect 275300 284050 275900 336450
 rect 291170 319892 292400 322292
 rect 291170 314892 292400 317292
 rect 291760 294736 292400 294792
@@ -676,6 +776,10 @@
 rect 291760 292963 292400 293019
 rect 291760 292372 292400 292428
 rect 291760 291781 292400 291837
+rect 45260 282800 276000 284050
+rect 45260 282780 66400 282800
+rect -400 279721 830 282121
+rect 275300 277800 275900 282800
 rect 275300 277700 290300 277800
 rect 275300 277681 291800 277700
 rect -400 274721 830 277121
@@ -858,9 +962,13 @@
 rect 292000 0 292050 352000
 rect -50 -50 292050 0
 use skullfet_inverter_xl  skullfet_inverter_xl_0
-timestamp 1641002375
+timestamp 1641001583
 transform 1 0 239740 0 1 288434
 box 0 0 10700 14400
+use skullfet_nand  skullfet_nand_0
+timestamp 1641004779
+transform 1 0 43808 0 1 324936
+box 0 0 1620 1431
 use skullfet_inverter  skullfet_inverter_0
 timestamp 1640879321
 transform 1 0 275500 0 1 336500
diff --git a/netgen/user_analog_project_wrapper.spice b/netgen/user_analog_project_wrapper.spice
index 7d0947e..c224572 100644
--- a/netgen/user_analog_project_wrapper.spice
+++ b/netgen/user_analog_project_wrapper.spice
@@ -5,6 +5,13 @@
 X1 VGND A Y VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=4.05e+07u l=4e+06u
 .ends
 
+.subckt skullfet_nand A B Y VPWR VGND
+X0 a_459_1161# B VGND VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=4.05e+06u l=540000u
+X1 VPWR A Y VPWR sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=4.05e+06u l=540000u
+X2 Y B VPWR VPWR sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=4.05e+06u l=540000u
+X3 a_459_1161# A Y VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=4.05e+06u l=540000u
+.ends
+
 .subckt skullfet_inverter VGND VPWR Y A
 X0 VGND A Y VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=4.05e+06u l=400000u
 X1 Y A VPWR VPWR sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=4.05e+06u l=400000u
@@ -117,6 +124,7 @@
 + wbs_dat_o[7] wbs_dat_o[8] wbs_dat_o[9] wbs_sel_i[0] wbs_sel_i[1] wbs_sel_i[2] wbs_sel_i[3]
 + wbs_stb_i wbs_we_i
 Xskullfet_inverter_xl_0 vssa1 vdda1 io_analog[3] io_analog[2] skullfet_inverter_xl
+Xskullfet_nand_0 io_analog[7] io_analog[8] io_analog[9] vdda1 vssa1 skullfet_nand
 Xskullfet_inverter_0 vssa1 vdda1 io_analog[1] skullfet_inverter_0/A skullfet_inverter
 .ends