Extract function
Fix city limit