Mashing Amadeus with Short Circuit