More robust sampler and cleaner scanning process.