added other oscillators back