move convolution and rebinning back from bumps