refactored geography