changed picking city method