Waveforms

Lines 66, 277, 288, and 294 waveforms