Removed waveform resampling