Fix the map
WIP Headings