diff --git a/netgen/user_analog_project_wrapper.spice b/netgen/user_analog_project_wrapper.spice
index 01fa34f..e7ab755 100644
--- a/netgen/user_analog_project_wrapper.spice
+++ b/netgen/user_analog_project_wrapper.spice
@@ -1,4 +1,4 @@
-* NGSPICE file created from user_analog_project_wrapper.ext - technology: sky130A
+* NGSPICE file created from user_analog_project_wrapper_v2.ext - technology: sky130A
 
 .subckt io_clamp vdd vss
 X0 vdd w_125568_n131312# sky130_fd_pr__diode_pd2nw_05v5 area=1e+16p
@@ -10930,13 +10930,13 @@
 + la_oenb[85] la_oenb[86] la_oenb[87] la_oenb[88] la_oenb[89] la_oenb[8] la_oenb[90]
 + la_oenb[91] la_oenb[92] la_oenb[93] la_oenb[94] la_oenb[95] la_oenb[96] la_oenb[97]
 + la_oenb[98] la_oenb[99] la_oenb[9] user_clock2 user_irq[0] user_irq[1] user_irq[2]
-+ vccd1 vccd2 vdda1 vssa1 vssd2 wb_clk_i wb_rst_i wbs_ack_o wbs_adr_i[0] wbs_adr_i[10]
-+ wbs_adr_i[11] wbs_adr_i[12] wbs_adr_i[13] wbs_adr_i[14] wbs_adr_i[15] wbs_adr_i[16]
-+ wbs_adr_i[17] wbs_adr_i[18] wbs_adr_i[19] wbs_adr_i[1] wbs_adr_i[20] wbs_adr_i[21]
-+ wbs_adr_i[22] wbs_adr_i[23] wbs_adr_i[24] wbs_adr_i[25] wbs_adr_i[26] wbs_adr_i[27]
-+ wbs_adr_i[28] wbs_adr_i[29] wbs_adr_i[2] wbs_adr_i[30] wbs_adr_i[31] wbs_adr_i[3]
-+ wbs_adr_i[4] wbs_adr_i[5] wbs_adr_i[6] wbs_adr_i[7] wbs_adr_i[8] wbs_adr_i[9] wbs_cyc_i
-+ wbs_dat_i[0] wbs_dat_i[10] wbs_dat_i[11] wbs_dat_i[12] wbs_dat_i[13] wbs_dat_i[14]
++ vccd1 vccd2 vdda1 vdda2 vssa1 vssa2 vssd1 vssd2 wb_clk_i wb_rst_i wbs_ack_o wbs_adr_i[0]
++ wbs_adr_i[10] wbs_adr_i[11] wbs_adr_i[12] wbs_adr_i[13] wbs_adr_i[14] wbs_adr_i[15]
++ wbs_adr_i[16] wbs_adr_i[17] wbs_adr_i[18] wbs_adr_i[19] wbs_adr_i[1] wbs_adr_i[20]
++ wbs_adr_i[21] wbs_adr_i[22] wbs_adr_i[23] wbs_adr_i[24] wbs_adr_i[25] wbs_adr_i[26]
++ wbs_adr_i[27] wbs_adr_i[28] wbs_adr_i[29] wbs_adr_i[2] wbs_adr_i[30] wbs_adr_i[31]
++ wbs_adr_i[3] wbs_adr_i[4] wbs_adr_i[5] wbs_adr_i[6] wbs_adr_i[7] wbs_adr_i[8] wbs_adr_i[9]
++ wbs_cyc_i wbs_dat_i[0] wbs_dat_i[10] wbs_dat_i[11] wbs_dat_i[12] wbs_dat_i[13] wbs_dat_i[14]
 + wbs_dat_i[15] wbs_dat_i[16] wbs_dat_i[17] wbs_dat_i[18] wbs_dat_i[19] wbs_dat_i[1]
 + wbs_dat_i[20] wbs_dat_i[21] wbs_dat_i[22] wbs_dat_i[23] wbs_dat_i[24] wbs_dat_i[25]
 + wbs_dat_i[26] wbs_dat_i[27] wbs_dat_i[28] wbs_dat_i[29] wbs_dat_i[2] wbs_dat_i[30]
@@ -10948,24 +10948,27 @@
 + wbs_dat_o[30] wbs_dat_o[31] wbs_dat_o[3] wbs_dat_o[4] wbs_dat_o[5] wbs_dat_o[6]
 + 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
-Xio_clamp_1 vdda1 vssd2 io_clamp
-Xio_clamp_0 vccd2 vssd2 io_clamp
+Xio_clamp_0 io_analog[5] vssa2 io_clamp
+Xio_clamp_1 vdda2 vssa2 io_clamp
 XClass_D_post_0 Class_D_post_0/vp_p io_analog[6] gpio_analog[14] io_analog[8] io_analog[9]
-+ io_analog[10] vdda1 gpio_analog[15] io_analog[2] Class_D_post_0/vn_p vccd2 Class_D_post_0/vn_n
-+ io_analog[4] io_analog[1] vssd2 io_analog[0] Class_D_post_0/vp_n vssd2 vssd2 vssd2
-+ Class_D_post
-XESD_0 vccd2 io_analog[6] vssd2 vssd2 ESD
-XESD_1 vccd2 io_analog[4] vssd2 vssd2 ESD
-XESD_2 vdda1 io_analog[10] vssd2 vssd2 ESD
-XESD_3 vdda1 io_analog[1] vssd2 vssd2 ESD
-XESD_4 vdda1 io_analog[0] vssd2 vssd2 ESD
-XESD_5 vdda1 io_analog[8] vssd2 vssd2 ESD
-XESD_6 vdda1 io_analog[2] vssd2 vssd2 ESD
-XESD_7 vdda1 io_analog[9] vssd2 vssd2 ESD
-R0 io_analog[6] io_analog[7] 0.000000
-R1 vssd2 vssa1 0.000000
-R2 vccd2 vccd1 0.000000
-R3 vccd2 io_analog[5] 0.000000
-R4 io_analog[4] io_analog[3] 0.000000
++ io_analog[10] vdda2 gpio_analog[15] io_analog[2] Class_D_post_0/vn_p io_analog[5]
++ Class_D_post_0/vn_n io_analog[4] io_analog[1] vssa2 io_analog[0] Class_D_post_0/vp_n
++ vssa2 vssa2 vssa2 Class_D_post
+XESD_0 io_analog[5] io_analog[6] vssa2 vssa2 ESD
+XESD_1 io_analog[5] io_analog[4] vssa2 vssa2 ESD
+XESD_2 vdda2 io_analog[10] vssa2 vssa2 ESD
+XESD_3 vdda1 io_analog[1] vssa2 vssa2 ESD
+XESD_4 vdda1 io_analog[0] vssa2 vssa2 ESD
+XESD_6 vdda2 io_analog[2] vssa2 vssa2 ESD
+XESD_5 vdda2 io_analog[8] vssa2 vssa2 ESD
+XESD_7 vdda2 io_analog[9] vssa2 vssa2 ESD
+R0 vssd2 vssa2 sky130_fd_pr__res_generic_m3 w=7.4e+07u l=2.055e+07u
+R1 vccd2 io_analog[5] sky130_fd_pr__res_generic_m5 w=7.42e+07u l=1.885e+07u
+R2 io_analog[5] vccd1 sky130_fd_pr__res_generic_m5 w=7.42e+07u l=1.77e+07u
+R3 vdda2 vdda1 sky130_fd_pr__res_generic_m5 w=7.4e+07u l=1.005e+07u
+R4 vssa2 vssa1 sky130_fd_pr__res_generic_m4 w=7.4e+07u l=1.68e+07u
+R5 vssa2 vssd1 sky130_fd_pr__res_generic_m4 w=7.815e+07u l=1.755e+07u
+R6 io_analog[6] io_analog[7] sky130_fd_pr__res_generic_m3 w=2.505e+07u l=7.55e+06u
+R7 io_analog[4] io_analog[3] sky130_fd_pr__res_generic_m3 w=2.505e+07u l=3.7e+06u
 .ends