added waveformer