Modifications
Removed lat/lon lookups as they're too slow