Mashing Short Circuit with Amadeus