Add updated resampler code and default to CC resampler