added edir for re-entry