Convolution now vectorized. Should be slightly faster