start re-working the waveform