edited esaf issue