tweaked waveform function, revert claim() tweak.