Refactored long range scans