Improved scanning