Cleaned up resampled