Merged in Juan's map changes.