Modified for mananging eps