add two variables to download_by_city
refractoring