got rid of city==