Changed order of waveform