integrating map
updating database
modified zipcodes index
fixing conflixts