Lot of fix in the map