Improve pd waveforms