Changed scanner logic
Changed scanner logic