Fixed FFT and did further opt