SoundUpdater changes from recent branch merge, but still TODO