Updating so that you can clearly specify your waveform range