added waveforms