Added epsy feature