diff --git a/src/magic/model/MagicAbility.java b/src/magic/model/MagicAbility.java
index f9252fd6fd..563e606657 100644
--- a/src/magic/model/MagicAbility.java
+++ b/src/magic/model/MagicAbility.java
@@ -675,12 +675,12 @@ public enum MagicAbility {
             card.add(ThisDiesTrigger.Afterlife(n));
         }
     },
-    Spectacle("spectacle( |—)" + ARG.COST, 10) {
+    Spectacle("spectacle( |—)" + ARG.MANACOST, 10) {
         @Override
         protected void addAbilityImpl(final MagicAbilityStore card, final Matcher arg) {
             final MagicCardDefinition cardDef = (MagicCardDefinition)card;
-            final List<MagicMatchedCostEvent> matchedCostEvents = MagicRegularCostEvent.buildCast(ARG.cost(arg));
-            card.add(new MagicSpectacleActivation(cardDef, matchedCostEvents));
+            final MagicManaCost manaCost = MagicManaCost.create(ARG.manacost(arg));
+            card.add(new MagicSpectacleActivation(cardDef, manaCost));
         }
     },
 
diff --git a/src/magic/model/event/MagicSpectacleActivation.java b/src/magic/model/event/MagicSpectacleActivation.java
index a25e0e2be7..1c956361ed 100644
--- a/src/magic/model/event/MagicSpectacleActivation.java
+++ b/src/magic/model/event/MagicSpectacleActivation.java
@@ -1,18 +1,16 @@
 package magic.model.event;
 
-import java.util.Collections;
-
+import java.util.Arrays;
 import magic.model.MagicCard;
 import magic.model.MagicCardDefinition;
-import magic.model.MagicGame;
-import magic.model.MagicPayedCost;
+import magic.model.MagicManaCost;
 import magic.model.condition.MagicCondition;
 
 public class MagicSpectacleActivation extends MagicHandCastActivation {
 
-    private final List<MagicMatchedCostEvent> matchedCostEvents;
+    final MagicManaCost cost;
 
-    public MagicSpectacleActivation(final MagicCardDefinition cdef, final List<MagicMatchedCostEvent> aMatchedCostEvents) {
+    public MagicSpectacleActivation(final MagicCardDefinition cdef, final MagicManaCost aCost) {
         super(
             new MagicCondition[]{
                 MagicCondition.CARD_CONDITION,
@@ -21,29 +19,17 @@ public class MagicSpectacleActivation extends MagicHandCastActivation {
             cdef.getActivationHints(),
             "Spectacle"
         );
-        matchedCostEvents = aMatchedCostEvents;
+        cost = aCost;
     }
 
     @Override
     public Iterable<? extends MagicEvent> getCostEvent(final MagicCard source) {
-        return MagicMatchedCostEvent.getCostEvent(matchedCostEvents, source);
-    }
-
-    @Override
-    public MagicEvent getEvent(final MagicCardOnStack cardOnStack,final MagicPayedCost payedCost) {
-        return new MagicEvent(
-            cardOnStack,
-            this,
-            "Put SN onto the battlefield, " +
-            "it gains haste and it's returned from the battlefield to its owner's hand at the beginning of the next end step."
+        return Arrays.asList(
+            MagicPayManaCostEvent.Cast(
+                source,
+                cost
+            ),
+            new MagicEvokeEvent(source)
         );
     }
-
-    @Override
-    public void executeEvent(final MagicGame game, final MagicEvent event) {
-        game.doAction(new PlayCardFromStackAction(
-            event.getCardOnStack(),
-            MagicPlayMod.HASTE, MagicPlayMod.RETURN_AT_END_OF_TURN
-        ));
-    }
 }