Hopefully fixed the map issues.
Following closer to the docs.