modified the map-final