Updated map to reflect new layout.