Changes to allow choosing sound.