Improve resampling