Added all waveforms.