Use separate modulator functions only for the waveform