Reworked map