Map rework