New patch!
Collapsed oscillator section a bit.