EI: Improved S7's map