Improved scanning.