Resample now in core module instead of its own module