Improved location-based scanning.