Updated downsampling