Merge SoundFactory changes