removed hardcoding of city name