Just for my understanding - the sim_2p_comp_ad requires new unconditionally in this PR?