Fixed up oscillator template