cut down function time of P(W/City) by approx 15 sec