Added a better scan