changed frequency and apmplitude
merge