Updated Waveforms