Update to downsample-capable functions and add