Waveform generates faster, new def options