integrated Alejandro's changes to the maps