Waveform Expanded Version