added switch statement instead, for city clicks