Improve scan