possibly change conventions about where M_EOR lies (never tested)