refactored geo