Added waveform generators and temprary noise source