Improve sampler