Ported changes to exp/alt_poiss logics