Waveform working - need to add listener