Patched SoundHandler modified_scheduling into master