Code modernized to music-suite 1.8