Added MusicManager / Removed MusicMaker