added oscillator and parameters