diff --git a/gds/user_analog_project_wrapper.gds b/gds/user_analog_project_wrapper.gds
index 60235b4..a455bfc 100644
--- a/gds/user_analog_project_wrapper.gds
+++ b/gds/user_analog_project_wrapper.gds
Binary files differ
diff --git a/netgen/user_analog_project_wrapper.spice b/netgen/user_analog_project_wrapper.spice
index 0f26538..9d103c5 100644
--- a/netgen/user_analog_project_wrapper.spice
+++ b/netgen/user_analog_project_wrapper.spice
@@ -1548,8 +1548,8 @@
 X31 Noise_in a_430_3669# sky130_fd_pr__cap_mim_m3_1 l=3.4e+06u w=4e+06u
 .ends
 
-.subckt noise_virtual noise_D[1] noise_D[2] noise_D[3] noise_D[0] Noise_in VPWR VVDD
-+ VOUT VGND
+.subckt noise_virtual noise_D[1] noise_D[2] noise_D[3] noise_D[0] VVDD VOUT Noise_in
++ VPWR VGND
 Xpmos20_0 VGND VVDD VPWR VPWR pmos20
 Xpmos20_1 VOUT VVDD VPWR VPWR pmos20
 Xpmos20_2 VGND VVDD VPWR VPWR pmos20
@@ -2342,21 +2342,21 @@
 .ends
 
 .subckt TOP w_19531_382583# w_13120_646420# photo_V2_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D5-P-c
-+ w_133616_36416# photo_V2_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D5-P-b w_49012_658344#
-+ w_19531_370583# w_133608_228340# w_133616_339317# w_13120_634420# w_12912_502344#
-+ w_49012_682344# w_49106_550390# w_133896_168596# w_133608_252340# w_19711_334763#
-+ w_19323_72340# w_49012_670344# w_133608_240340# w_19431_202583# w_13300_598600#
-+ photo_V2_1/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D3-P-b w_19431_36416# w_13020_466420#
++ w_133616_36416# photo_V2_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D5-P-b w_133608_228340#
++ w_133616_339317# w_19531_370583# w_49012_658344# w_13120_634420# w_12912_502344#
++ w_49012_682344# w_133896_168596# w_133608_252340# w_49106_550390# w_19323_72340#
++ w_19711_334763# w_49012_670344# w_19431_202583# w_133608_240340# w_13300_598600#
++ w_19431_36416# photo_V2_1/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D3-P-b w_13020_466420#
 + photo_V3_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$2_0/D3-P-b w_133716_216416# w_69508_375241#
-+ photo_V4_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4_0/D5-P-c photo_V2_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D3-P-b
-+ photo_V4_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4_0/D5-P-b w_19423_418507# w_13012_658344#
++ photo_V4_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4_0/D5-P-c w_19423_418507# w_13012_658344#
++ photo_V2_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D3-P-b photo_V4_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4_0/D5-P-b
 + w_133716_204416# w_19517_286553# w_19423_406507# w_13106_550390# w_13012_682344#
-+ w_13012_670344# w_69616_339317# w_101508_375241# w_49120_646420# w_133702_120386#
-+ w_19423_394507# w_49120_634420# w_48912_502344# w_19323_238507# photo_V4_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4_0/D3-P-b
-+ w_101616_339317# photo_V2_1/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D5-P-c w_133508_375241#
-+ w_49300_598600# photo_V2_1/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D5-P-b w_49020_466420#
-+ w_133508_72340# photo_V3_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$2_0/D5-P-c photo_V3_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$2_0/D5-P-b
-+ cascodetestsWithPads_0/cascodetests_N_v2_0/gnd
++ w_13012_670344# w_133702_120386# w_69616_339317# w_101508_375241# w_49120_646420#
++ w_19423_394507# w_49120_634420# w_48912_502344# w_19323_238507# w_101616_339317#
++ photo_V4_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4_0/D3-P-b photo_V2_1/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D5-P-c
++ w_133508_375241# w_49300_598600# photo_V2_1/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D5-P-b
++ w_133508_72340# w_49020_466420# photo_V3_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$2_0/D5-P-c
++ cascodetestsWithPads_0/cascodetests_N_v2_0/gnd photo_V3_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$2_0/D5-P-b
 XTIA_228k_0 TIA_228k_0/Vdd TIA_228k_0/Vout TIA_228k_0/Iin cascodetestsWithPads_0/cascodetests_N_v2_0/gnd
 + TIA_228k
 XTIA_228k_1 TIA_228k_1/Vdd TIA_228k_1/Vout TIA_228k_1/Iin cascodetestsWithPads_0/cascodetests_N_v2_0/gnd
@@ -2446,24 +2446,24 @@
 + TIA_126k
 XcascodetestsWithPads_0 cascodetestsWithPads_0/cascodetests_N_v2_0/gnd cascodetestsWithPads
 Xnoise_virtual_1 noise_virtual_1/noise_D[1] noise_virtual_1/noise_D[2] noise_virtual_1/noise_D[3]
-+ noise_virtual_1/noise_D[0] noise_virtual_1/Noise_in noise_virtual_1/VPWR noise_virtual_1/VVDD
-+ noise_virtual_1/VOUT cascodetestsWithPads_0/cascodetests_N_v2_0/gnd noise_virtual
++ noise_virtual_1/noise_D[0] noise_virtual_1/VVDD noise_virtual_1/VOUT noise_virtual_1/Noise_in
++ noise_virtual_1/VPWR cascodetestsWithPads_0/cascodetests_N_v2_0/gnd noise_virtual
+Xnoise_virtual_0 noise_virtual_0/noise_D[1] noise_virtual_0/noise_D[2] noise_virtual_0/noise_D[3]
++ noise_virtual_0/noise_D[0] noise_virtual_0/VVDD noise_virtual_0/VOUT noise_virtual_0/Noise_in
++ noise_virtual_0/VPWR cascodetestsWithPads_0/cascodetests_N_v2_0/gnd noise_virtual
 XTIA_434k_0 TIA_434k_0/Vdd TIA_434k_0/Vout TIA_434k_0/Iin cascodetestsWithPads_0/cascodetests_N_v2_0/gnd
 + TIA_434k
 XMEMID_0 MEMID_0/Vread MEMID_0/Vwriteplus MEMID_0/Vwriteminus MEMID_0/Vraw MEMID_0/Vamp
 + MEMID_0/Voffset MEMID_0/Vout MEMID_0/Vdd MEMID_0/Vi1 MEMID_0/Vi2 MEMID_0/Vss cascodetestsWithPads_0/cascodetests_N_v2_0/gnd
 + MEMID
-Xnoise_virtual_0 noise_virtual_0/noise_D[1] noise_virtual_0/noise_D[2] noise_virtual_0/noise_D[3]
-+ noise_virtual_0/noise_D[0] noise_virtual_0/Noise_in noise_virtual_0/VPWR noise_virtual_0/VVDD
-+ noise_virtual_0/VOUT cascodetestsWithPads_0/cascodetests_N_v2_0/gnd noise_virtual
-Xnoise_virtual_2 noise_virtual_2/noise_D[1] noise_virtual_2/noise_D[2] noise_virtual_2/noise_D[3]
-+ noise_virtual_2/noise_D[0] noise_virtual_2/Noise_in noise_virtual_2/VPWR noise_virtual_2/VVDD
-+ noise_virtual_2/VOUT cascodetestsWithPads_0/cascodetests_N_v2_0/gnd noise_virtual
 XTIA_434k_1 TIA_434k_1/Vdd TIA_434k_1/Vout TIA_434k_1/Iin cascodetestsWithPads_0/cascodetests_N_v2_0/gnd
 + TIA_434k
 XMEMID_1 MEMID_1/Vread MEMID_1/Vwriteplus MEMID_1/Vwriteminus MEMID_1/Vraw MEMID_1/Vamp
 + MEMID_1/Voffset MEMID_1/Vout MEMID_1/Vdd MEMID_1/Vi1 MEMID_1/Vi2 MEMID_1/Vss cascodetestsWithPads_0/cascodetests_N_v2_0/gnd
 + MEMID
+Xnoise_virtual_2 noise_virtual_2/noise_D[1] noise_virtual_2/noise_D[2] noise_virtual_2/noise_D[3]
++ noise_virtual_2/noise_D[0] noise_virtual_2/VVDD noise_virtual_2/VOUT noise_virtual_2/Noise_in
++ noise_virtual_2/VPWR cascodetestsWithPads_0/cascodetests_N_v2_0/gnd noise_virtual
 Xphoto_V2_1 w_19531_370583# w_19531_382583# w_19323_238507# photo_V2_1/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D5-P-c
 + photo_V2_1/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D5-P-b w_19711_334763# w_19517_286553#
 + w_19423_418507# w_19423_406507# w_19423_394507# photo_V2_1/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D3-P-b
@@ -2472,9 +2472,6 @@
 + photo_V2_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D5-P-b w_133896_168596# w_133702_120386#
 + w_133608_252340# w_133608_240340# w_133608_228340# photo_V2_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D3-P-b
 + w_133616_36416# cascodetestsWithPads_0/cascodetests_N_v2_0/gnd photo_V2
-Xnoise_virtual_3 noise_virtual_3/noise_D[1] noise_virtual_3/noise_D[2] noise_virtual_3/noise_D[3]
-+ noise_virtual_3/noise_D[0] noise_virtual_3/Noise_in noise_virtual_3/VPWR noise_virtual_3/VVDD
-+ noise_virtual_3/VOUT cascodetestsWithPads_0/cascodetests_N_v2_0/gnd noise_virtual
 XTIA_644k_0 TIA_644k_0/Vdd TIA_644k_0/Vout TIA_644k_0/Iin cascodetestsWithPads_0/cascodetests_N_v2_0/gnd
 + TIA_644k
 XsurfaceTestArray_0 surfaceTestArray
@@ -2484,52 +2481,52 @@
 + MPW7_GWU_0/G_1 MPW7_GWU_0/TE cascodetestsWithPads_0/cascodetests_N_v2_0/gnd MPW7_GWU_0/DIODE_2
 + MPW7_GWU_0/DIODE_1 MPW7_GWU
 XsurfaceTestArray_1 surfaceTestArray
-XsurfaceTestArray_2 surfaceTestArray
 .ends
 
-.subckt user_analog_project_wrapper 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[1] wbs_adr_i[2] 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[1]
-+ wbs_dat_i[2] wbs_dat_i[3] wbs_dat_i[4] wbs_dat_i[5] wbs_dat_i[6] wbs_dat_i[7] wbs_dat_i[8]
-+ wbs_dat_i[9] wbs_dat_o[0] wbs_dat_o[10] wbs_dat_o[11] wbs_dat_o[12] wbs_dat_o[13]
-+ wbs_dat_o[14] wbs_dat_o[15] wbs_dat_o[16] wbs_dat_o[1] wbs_dat_o[2] 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 wbs_dat_i[17] wbs_dat_i[18]
-+ wbs_dat_i[19] wbs_adr_i[18] 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_adr_i[19] wbs_dat_i[30] wbs_dat_i[31] la_oenb[0] 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] la_oenb[1] wbs_adr_i[30] wbs_adr_i[31] la_oenb[2] wbs_dat_o[17]
-+ wbs_dat_o[18] wbs_dat_o[19] la_oenb[3] wbs_dat_o[20] wbs_dat_o[21] wbs_dat_o[22]
-+ wbs_dat_o[23] wbs_dat_o[24] wbs_dat_o[25] wbs_dat_o[26] wbs_dat_o[27] wbs_dat_o[28]
-+ wbs_dat_o[29] la_oenb[4] wbs_dat_o[30] wbs_dat_o[31] la_oenb[5] la_data_in[0] la_data_in[1]
-+ la_data_in[2] la_data_in[3] la_data_in[4] la_data_in[5] la_data_out[0] la_data_out[1]
-+ la_data_out[2] la_data_out[3] la_data_out[4] la_data_out[5] la_data_in[23] la_data_in[24]
-+ la_data_in[25] la_oenb[6] la_oenb[7] la_oenb[8] la_oenb[9] la_data_in[26] la_data_in[11]
-+ la_data_in[12] la_data_in[13] la_data_in[14] la_data_in[6] la_data_in[7] la_data_in[8]
-+ la_data_in[9] la_data_in[15] la_data_out[10] la_data_out[11] la_data_out[12] la_data_out[13]
-+ la_data_out[14] la_data_out[15] la_data_out[16] la_data_out[17] la_data_out[18]
-+ la_data_out[19] la_data_in[16] la_data_out[20] la_data_out[21] la_data_out[22] la_data_out[23]
-+ la_data_out[24] la_data_out[25] la_data_in[17] la_data_in[18] la_data_in[19] la_data_in[10]
-+ la_data_out[6] la_data_out[7] la_data_out[8] la_data_out[9] la_data_in[20] la_oenb[10]
-+ la_oenb[11] la_oenb[12] la_oenb[13] la_oenb[14] la_oenb[15] la_oenb[16] la_oenb[17]
-+ la_oenb[18] la_oenb[19] la_data_in[21] la_oenb[20] la_oenb[21] la_oenb[22] la_oenb[23]
-+ la_oenb[24] la_oenb[25] la_data_in[22] la_data_in[39] la_oenb[45] la_data_in[40]
-+ la_data_out[26] la_data_out[27] la_data_out[28] la_data_out[29] la_data_in[41] la_data_out[30]
-+ la_data_out[31] la_data_out[32] la_data_out[33] la_data_out[34] la_data_out[35]
-+ la_data_out[36] la_data_out[37] la_data_out[38] la_data_out[39] la_data_in[42] la_data_out[40]
-+ la_data_out[41] la_data_out[42] la_data_out[43] la_data_out[44] la_data_out[45]
-+ la_data_out[46] la_data_in[43] la_data_in[44] la_data_in[45] la_data_in[46] la_oenb[46]
-+ la_oenb[38] la_oenb[39] la_oenb[37] la_oenb[40] la_oenb[41] la_oenb[42] la_oenb[43]
-+ la_data_in[27] la_data_in[28] la_data_in[29] la_oenb[44] la_data_in[30] la_data_in[31]
-+ la_data_in[32] la_data_in[33] la_data_in[34] la_data_in[35] la_data_in[36] la_data_in[37]
-+ la_oenb[26] la_oenb[27] la_oenb[28] la_oenb[29] la_data_in[38] la_oenb[30] la_oenb[31]
-+ la_oenb[32] la_oenb[33] la_oenb[34] la_oenb[35] la_oenb[36] la_oenb[47] la_oenb[48]
-+ la_oenb[49] la_oenb[50] la_oenb[51] la_oenb[52] la_oenb[53] la_oenb[54] la_oenb[55]
-+ la_oenb[56] la_oenb[57] la_oenb[58] la_oenb[59] la_oenb[60] la_oenb[61] la_oenb[62]
-+ la_oenb[63] la_oenb[64] la_oenb[65] la_oenb[66] la_data_in[47] la_data_in[48] la_data_in[49]
+.subckt user_analog_project_wrapper io_analog[4] io_analog[5] io_analog[6] 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[1] wbs_adr_i[2]
++ 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[1] wbs_dat_i[2] wbs_dat_i[3] wbs_dat_i[4]
++ wbs_dat_i[5] wbs_dat_i[6] wbs_dat_i[7] wbs_dat_i[8] wbs_dat_i[9] wbs_dat_o[0] wbs_dat_o[10]
++ wbs_dat_o[11] wbs_dat_o[12] wbs_dat_o[13] wbs_dat_o[14] wbs_dat_o[15] wbs_dat_o[16]
++ wbs_dat_o[1] wbs_dat_o[2] 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 wbs_dat_i[17] wbs_dat_i[18] wbs_dat_i[19] wbs_adr_i[18] 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_adr_i[19] wbs_dat_i[30] wbs_dat_i[31] la_oenb[0]
++ 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] la_oenb[1] wbs_adr_i[30]
++ wbs_adr_i[31] la_oenb[2] wbs_dat_o[17] wbs_dat_o[18] wbs_dat_o[19] la_oenb[3] wbs_dat_o[20]
++ wbs_dat_o[21] wbs_dat_o[22] wbs_dat_o[23] wbs_dat_o[24] wbs_dat_o[25] wbs_dat_o[26]
++ wbs_dat_o[27] wbs_dat_o[28] wbs_dat_o[29] la_oenb[4] wbs_dat_o[30] wbs_dat_o[31]
++ la_oenb[5] la_data_in[0] la_data_in[1] la_data_in[2] la_data_in[3] la_data_in[4]
++ la_data_in[5] la_data_out[0] la_data_out[1] la_data_out[2] la_data_out[3] la_data_out[4]
++ la_data_out[5] la_data_in[23] la_data_in[24] la_data_in[25] la_oenb[6] la_oenb[7]
++ la_oenb[8] la_oenb[9] la_data_in[26] la_data_in[11] la_data_in[12] la_data_in[13]
++ la_data_in[14] la_data_in[6] la_data_in[7] la_data_in[8] la_data_in[9] la_data_in[15]
++ la_data_out[10] la_data_out[11] la_data_out[12] la_data_out[13] la_data_out[14]
++ la_data_out[15] la_data_out[16] la_data_out[17] la_data_out[18] la_data_out[19]
++ la_data_in[16] la_data_out[20] la_data_out[21] la_data_out[22] la_data_out[23] la_data_out[24]
++ la_data_out[25] la_data_in[17] la_data_in[18] la_data_in[19] la_data_in[10] la_data_out[6]
++ la_data_out[7] la_data_out[8] la_data_out[9] la_data_in[20] la_oenb[10] la_oenb[11]
++ la_oenb[12] la_oenb[13] la_oenb[14] la_oenb[15] la_oenb[16] la_oenb[17] la_oenb[18]
++ la_oenb[19] la_data_in[21] la_oenb[20] la_oenb[21] la_oenb[22] la_oenb[23] la_oenb[24]
++ la_oenb[25] la_data_in[22] la_data_in[39] la_oenb[45] la_data_in[40] la_data_out[26]
++ la_data_out[27] la_data_out[28] la_data_out[29] la_data_in[41] la_data_out[30] la_data_out[31]
++ la_data_out[32] la_data_out[33] la_data_out[34] la_data_out[35] la_data_out[36]
++ la_data_out[37] la_data_out[38] la_data_out[39] la_data_in[42] la_data_out[40] la_data_out[41]
++ la_data_out[42] la_data_out[43] la_data_out[44] la_data_out[45] la_data_out[46]
++ la_data_in[43] la_data_in[44] la_data_in[45] la_data_in[46] la_oenb[46] la_oenb[38]
++ la_oenb[39] la_oenb[37] la_oenb[40] la_oenb[41] la_oenb[42] la_oenb[43] la_data_in[27]
++ la_data_in[28] la_data_in[29] la_oenb[44] la_data_in[30] la_data_in[31] la_data_in[32]
++ la_data_in[33] la_data_in[34] la_data_in[35] la_data_in[36] la_data_in[37] la_oenb[26]
++ la_oenb[27] la_oenb[28] la_oenb[29] la_data_in[38] la_oenb[30] la_oenb[31] la_oenb[32]
++ la_oenb[33] la_oenb[34] la_oenb[35] la_oenb[36] la_oenb[47] la_oenb[48] la_oenb[49]
++ la_oenb[50] la_oenb[51] la_oenb[52] la_oenb[53] la_oenb[54] la_oenb[55] la_oenb[56]
++ la_oenb[57] la_oenb[58] la_oenb[59] la_oenb[60] la_oenb[61] la_oenb[62] la_oenb[63]
++ la_oenb[64] la_oenb[65] la_oenb[66] la_data_in[47] la_data_in[48] la_data_in[49]
 + la_data_in[50] la_data_in[51] la_data_in[52] la_data_in[53] la_data_in[54] la_data_in[55]
 + la_data_in[56] la_data_in[57] la_data_in[58] la_data_in[59] la_data_in[60] la_data_in[61]
 + la_data_in[62] la_data_in[63] la_data_out[47] la_data_out[48] la_data_out[49] la_data_in[64]
@@ -2568,47 +2565,46 @@
 + la_data_in[113] user_irq[1] la_data_in[114] user_irq[2] la_data_out[111] la_data_out[112]
 + la_data_out[109] la_data_in[109] la_data_out[113] la_data_in[110] la_data_out[114]
 + la_oenb[108] la_data_out[115] la_data_out[116] la_data_in[111] la_data_out[117]
-+ la_data_in[115] la_data_out[118] la_data_out[119] io_analog[4] io_analog[5] io_analog[6]
-+ gpio_analog[2] gpio_analog[3] gpio_analog[4] gpio_analog[5] gpio_analog[6] gpio_noesd[2]
-+ gpio_noesd[3] gpio_noesd[4] gpio_noesd[5] gpio_noesd[6] io_analog[0] io_analog[1]
-+ io_analog[2] io_analog[3] io_clamp_high[0] io_clamp_low[0] io_in[10] io_in[11] io_in[12]
-+ io_in[13] io_in[9] io_in_3v3[10] io_in_3v3[11] io_in_3v3[12] io_in_3v3[13] io_in_3v3[9]
-+ io_oeb[10] io_oeb[11] io_oeb[12] io_oeb[13] io_oeb[9] io_out[10] io_out[11] io_out[12]
-+ io_out[13] io_out[9] vccd1 vdda1 vssa1 io_in[16] io_in[17] gpio_analog[9] gpio_noesd[10]
-+ io_analog[7] io_in_3v3[14] io_in_3v3[15] io_in_3v3[16] io_in_3v3[17] io_analog[8]
-+ io_analog[9] gpio_noesd[7] io_oeb[14] io_oeb[15] io_oeb[16] io_oeb[17] gpio_noesd[8]
-+ io_clamp_high[1] io_clamp_high[2] gpio_noesd[9] io_clamp_low[1] io_out[14] io_out[15]
-+ io_out[16] io_out[17] io_clamp_low[2] gpio_analog[10] io_analog[10] vccd2 gpio_analog[7]
-+ gpio_analog[8] io_in[14] io_in[15] vssa2 io_in_3v3[24] io_in_3v3[25] io_in_3v3[26]
-+ gpio_analog[16] gpio_analog[17] gpio_analog[11] gpio_analog[12] gpio_noesd[11] io_in[18]
-+ io_in[19] io_in[20] io_in[21] io_oeb[18] io_oeb[19] io_oeb[20] io_oeb[21] io_oeb[22]
-+ io_oeb[23] io_oeb[24] io_oeb[25] io_oeb[26] io_in[22] io_in[23] io_in[24] io_in[25]
-+ io_in[26] gpio_noesd[12] gpio_noesd[13] gpio_noesd[14] gpio_noesd[15] io_out[18]
-+ io_out[19] io_out[20] io_out[21] io_out[22] io_out[23] io_out[24] io_out[25] io_out[26]
-+ gpio_noesd[16] gpio_noesd[17] gpio_analog[13] gpio_analog[14] gpio_analog[15] io_in_3v3[18]
-+ io_in_3v3[19] vdda2 io_in_3v3[20] io_in_3v3[21] io_in_3v3[22] io_in_3v3[23] vssd2
-+ io_in_3v3[6] io_in_3v3[7] io_in_3v3[8] io_in[1] io_oeb[0] gpio_noesd[0] io_in[2]
-+ io_in[3] io_in[4] io_in[5] io_out[1] io_in[6] io_in_3v3[1] io_in[7] io_in[8] gpio_analog[0]
-+ io_oeb[1] io_in_3v3[0] io_out[2] io_out[3] io_out[4] io_out[5] io_out[6] io_out[7]
-+ io_out[8] gpio_analog[1] gpio_noesd[1] io_in[0] io_in_3v3[2] io_in_3v3[3] io_in_3v3[4]
-+ io_oeb[2] io_oeb[3] io_oeb[4] io_oeb[5] io_oeb[6] io_oeb[7] io_oeb[8] vssd1 io_in_3v3[5]
-+ io_out[0]
++ la_data_in[115] la_data_out[118] la_data_out[119] gpio_analog[2] gpio_analog[3]
++ gpio_analog[4] gpio_analog[5] gpio_analog[6] gpio_noesd[2] gpio_noesd[3] gpio_noesd[4]
++ gpio_noesd[5] gpio_noesd[6] io_analog[0] io_analog[1] io_analog[2] io_analog[3]
++ io_clamp_high[0] io_clamp_low[0] io_in[10] io_in[11] io_in[12] io_in[13] io_in[9]
++ io_in_3v3[10] io_in_3v3[11] io_in_3v3[12] io_in_3v3[13] io_in_3v3[9] io_oeb[10]
++ io_oeb[11] io_oeb[12] io_oeb[13] io_oeb[9] io_out[10] io_out[11] io_out[12] io_out[13]
++ io_out[9] vccd1 vdda1 vssa1 io_in[16] io_in[17] gpio_analog[9] gpio_noesd[10] io_analog[7]
++ io_in_3v3[14] io_in_3v3[15] io_in_3v3[16] io_in_3v3[17] io_analog[8] io_analog[9]
++ gpio_noesd[7] io_oeb[14] io_oeb[15] io_oeb[16] io_oeb[17] gpio_noesd[8] io_clamp_high[1]
++ io_clamp_high[2] gpio_noesd[9] io_clamp_low[1] io_out[14] io_out[15] io_out[16]
++ io_out[17] io_clamp_low[2] gpio_analog[10] io_analog[10] vccd2 gpio_analog[7] gpio_analog[8]
++ io_in[14] io_in[15] vssa2 io_in_3v3[24] io_in_3v3[25] io_in_3v3[26] gpio_analog[16]
++ gpio_analog[17] gpio_analog[11] gpio_analog[12] gpio_noesd[11] io_in[18] io_in[19]
++ io_in[20] io_in[21] io_oeb[18] io_oeb[19] io_oeb[20] io_oeb[21] io_oeb[22] io_oeb[23]
++ io_oeb[24] io_oeb[25] io_oeb[26] io_in[22] io_in[23] io_in[24] io_in[25] io_in[26]
++ gpio_noesd[12] gpio_noesd[13] gpio_noesd[14] gpio_noesd[15] io_out[18] io_out[19]
++ io_out[20] io_out[21] io_out[22] io_out[23] io_out[24] io_out[25] io_out[26] gpio_noesd[16]
++ gpio_noesd[17] gpio_analog[13] gpio_analog[14] gpio_analog[15] io_in_3v3[18] io_in_3v3[19]
++ vdda2 io_in_3v3[20] io_in_3v3[21] io_in_3v3[22] io_in_3v3[23] vssd2 io_in_3v3[6]
++ io_in_3v3[7] io_in_3v3[8] io_in[1] io_oeb[0] gpio_noesd[0] io_in[2] io_in[3] io_in[4]
++ io_in[5] io_out[1] io_in[6] io_in_3v3[1] io_in[7] io_in[8] gpio_analog[0] io_oeb[1]
++ io_in_3v3[0] io_out[2] io_out[3] io_out[4] io_out[5] io_out[6] io_out[7] io_out[8]
++ gpio_analog[1] gpio_noesd[1] io_in[0] io_in_3v3[2] io_in_3v3[3] io_in_3v3[4] io_oeb[2]
++ io_oeb[3] io_oeb[4] io_oeb[5] io_oeb[6] io_oeb[7] io_oeb[8] vssd1 io_in_3v3[5] io_out[0]
 XTOP_0 w_19531_382583# w_13120_646420# TOP_0/photo_V2_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D5-P-c
-+ w_133616_36416# TOP_0/photo_V2_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D5-P-b w_49012_658344#
-+ w_19531_370583# w_133608_228340# w_133616_339317# w_13120_634420# w_12912_502344#
-+ w_49012_682344# w_49106_550390# w_133896_168596# w_133608_252340# w_19711_334763#
-+ w_19323_72340# w_49012_670344# w_133608_240340# w_19431_202583# w_13300_598600#
-+ TOP_0/photo_V2_1/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D3-P-b w_19431_36416# w_13020_466420#
++ w_133616_36416# TOP_0/photo_V2_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D5-P-b w_133608_228340#
++ w_133616_339317# w_19531_370583# w_49012_658344# w_13120_634420# w_12912_502344#
++ w_49012_682344# w_133896_168596# w_133608_252340# w_49106_550390# w_19323_72340#
++ w_19711_334763# w_49012_670344# w_19431_202583# w_133608_240340# w_13300_598600#
++ w_19431_36416# TOP_0/photo_V2_1/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D3-P-b w_13020_466420#
 + TOP_0/photo_V3_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$2_0/D3-P-b w_133716_216416#
-+ w_69508_375241# TOP_0/photo_V4_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4_0/D5-P-c TOP_0/photo_V2_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D3-P-b
-+ TOP_0/photo_V4_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4_0/D5-P-b w_19423_418507# w_13012_658344#
++ w_69508_375241# TOP_0/photo_V4_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4_0/D5-P-c w_19423_418507#
++ w_13012_658344# TOP_0/photo_V2_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D3-P-b TOP_0/photo_V4_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4_0/D5-P-b
 + w_133716_204416# w_19517_286553# w_19423_406507# w_13106_550390# w_13012_682344#
-+ w_13012_670344# w_69616_339317# w_101508_375241# w_49120_646420# w_133702_120386#
-+ w_19423_394507# w_49120_634420# w_48912_502344# w_19323_238507# TOP_0/photo_V4_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4_0/D3-P-b
-+ w_101616_339317# TOP_0/photo_V2_1/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D5-P-c
++ w_13012_670344# w_133702_120386# w_69616_339317# w_101508_375241# w_49120_646420#
++ w_19423_394507# w_49120_634420# w_48912_502344# w_19323_238507# w_101616_339317#
++ TOP_0/photo_V4_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4_0/D3-P-b TOP_0/photo_V2_1/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D5-P-c
 + w_133508_375241# w_49300_598600# TOP_0/photo_V2_1/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$3_0/D5-P-b
-+ w_49020_466420# w_133508_72340# TOP_0/photo_V3_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$2_0/D5-P-c
-+ TOP_0/photo_V3_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$2_0/D5-P-b TOP_0/cascodetestsWithPads_0/cascodetests_N_v2_0/gnd
++ w_133508_72340# w_49020_466420# TOP_0/photo_V3_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$2_0/D5-P-c
++ TOP_0/cascodetestsWithPads_0/cascodetests_N_v2_0/gnd TOP_0/photo_V3_0/sky130_fd_pr__nfet_01v8_lvt_D7LUG4$2_0/D5-P-b
 + TOP
 .ends