Added Fourier convention
Fixed merge conflict