Waveforms fixed