Updated Waveforms

First button press