smaller changes to prepare waveforms