Updated MusicHandler