combined the linear functions
added an oscilator function