fixed providers while continuing to refactor to reduce variability b/w EP and EH