Adding waveform tools