Changed: SoundGenerator