Merged w/ SPICE sim