Fixed convolution, added coherent scattering