Changes to use rescale argument.