SoundSystem: rework