Improvement all the all ready EPIC (fail)