Trying to fix the maps. Not yet.