Improved grid scan