Added SetWaveform