updated/consolidated map