Improve machine scan