updated vallejo copy w/city's edits