diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BantPanorama.java b/Mage.Sets/src/mage/sets/shardsofalara/BantPanorama.java
index 75d58c7839..185a5bbb79 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/BantPanorama.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/BantPanorama.java
@@ -36,13 +36,12 @@ import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
 import mage.abilities.mana.ColorlessManaAbility;
 import mage.cards.CardImpl;
 import mage.filter.Filter.ComparisonScope;
 import mage.filter.FilterCard;
-import mage.filter.common.FilterBasicLandCard;
 import mage.target.common.TargetCardInLibrary;
 
 /**
@@ -67,8 +66,8 @@ public class BantPanorama extends CardImpl<BantPanorama> {
         this.expansionSetCode = "ALA";
 
         this.addAbility(new ColorlessManaAbility());
-        TargetCardInLibrary target = new TargetCardInLibrary(new FilterBasicLandCard());
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true, Outcome.PutLandInPlay), new ManaCostsImpl("{1}"));
+        TargetCardInLibrary target = new TargetCardInLibrary(filter);
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true, Outcome.PutLandInPlay), new GenericManaCost(1));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EsperPanorama.java b/Mage.Sets/src/mage/sets/shardsofalara/EsperPanorama.java
index 85da8d0926..c39a4165db 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/EsperPanorama.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/EsperPanorama.java
@@ -36,13 +36,12 @@ import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
 import mage.abilities.mana.ColorlessManaAbility;
 import mage.cards.CardImpl;
 import mage.filter.Filter.ComparisonScope;
 import mage.filter.FilterCard;
-import mage.filter.common.FilterBasicLandCard;
 import mage.target.common.TargetCardInLibrary;
 
 /**
@@ -67,8 +66,8 @@ public class EsperPanorama extends CardImpl<EsperPanorama> {
         this.expansionSetCode = "ALA";
 
         this.addAbility(new ColorlessManaAbility());
-        TargetCardInLibrary target = new TargetCardInLibrary(new FilterBasicLandCard());
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true, Outcome.PutLandInPlay), new ManaCostsImpl("{1}"));
+        TargetCardInLibrary target = new TargetCardInLibrary(filter);
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true, Outcome.PutLandInPlay), new GenericManaCost(1));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GrixisPanorama.java b/Mage.Sets/src/mage/sets/shardsofalara/GrixisPanorama.java
index 42daf114ae..66d92e307d 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/GrixisPanorama.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/GrixisPanorama.java
@@ -36,13 +36,12 @@ import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
 import mage.abilities.mana.ColorlessManaAbility;
 import mage.cards.CardImpl;
 import mage.filter.Filter.ComparisonScope;
 import mage.filter.FilterCard;
-import mage.filter.common.FilterBasicLandCard;
 import mage.target.common.TargetCardInLibrary;
 
 /**
@@ -67,8 +66,8 @@ public class GrixisPanorama extends CardImpl<GrixisPanorama> {
         this.expansionSetCode = "ALA";
 
         this.addAbility(new ColorlessManaAbility());
-        TargetCardInLibrary target = new TargetCardInLibrary(new FilterBasicLandCard());
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true, Outcome.PutLandInPlay), new ManaCostsImpl("{1}"));
+        TargetCardInLibrary target = new TargetCardInLibrary(filter);
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true, Outcome.PutLandInPlay), new GenericManaCost(1));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JundPanorama.java b/Mage.Sets/src/mage/sets/shardsofalara/JundPanorama.java
index 87149284c1..264840786a 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/JundPanorama.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/JundPanorama.java
@@ -33,13 +33,15 @@ import mage.Constants.CardType;
 import mage.Constants.Outcome;
 import mage.Constants.Rarity;
 import mage.Constants.Zone;
-import mage.abilities.ActivatedAbilityImpl;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
 import mage.abilities.mana.ColorlessManaAbility;
 import mage.cards.CardImpl;
+import mage.filter.Filter;
 import mage.filter.FilterCard;
 import mage.target.common.TargetCardInLibrary;
 
@@ -49,11 +51,26 @@ import mage.target.common.TargetCardInLibrary;
  */
 public class JundPanorama extends CardImpl<JundPanorama> {
 
+     private static final FilterCard filter = new FilterCard("a basic Swamp, Mountain, or Forest card");
+
+    static {
+        filter.getCardType().add(CardType.LAND);
+        filter.getSupertype().add("Basic");
+        filter.getSubtype().add("Swamp");
+        filter.getSubtype().add("Mountain");
+        filter.getSubtype().add("Forest");
+        filter.setScopeSubtype(Filter.ComparisonScope.Any);
+    }
+
 	public JundPanorama(UUID ownerId) {
 		super(ownerId, 225, "Jund Panorama", Rarity.COMMON, new CardType[]{CardType.LAND}, null);
 		this.expansionSetCode = "ALA";
 		this.addAbility(new ColorlessManaAbility());
-		this.addAbility(new JundPanoramaAbility());
+		TargetCardInLibrary target = new TargetCardInLibrary(filter);
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true, Outcome.PutLandInPlay), new GenericManaCost(1));
+        ability.addCost(new TapSourceCost());
+        ability.addCost(new SacrificeSourceCost());
+        this.addAbility(ability);
 	}
 
 	public JundPanorama(final JundPanorama card) {
@@ -66,32 +83,3 @@ public class JundPanorama extends CardImpl<JundPanorama> {
 	}
 
 }
-
-class JundPanoramaAbility extends ActivatedAbilityImpl<JundPanoramaAbility> {
-
-    private static final FilterCard filter = new FilterCard("Swamp, Mountain, or Forest");
-    static {
-        filter.getName().add("Swamp");
-        filter.getName().add("Mountain");
-        filter.getName().add("Forest");
-    }
-	public JundPanoramaAbility() {
-		super(Zone.BATTLEFIELD, null);
-		addCost(new TapSourceCost());
-		addCost(new GenericManaCost(1));
-		addCost(new SacrificeSourceCost());
-		TargetCardInLibrary target = new TargetCardInLibrary(filter);
-		addEffect(new SearchLibraryPutInPlayEffect(target, true, Outcome.PutLandInPlay));
-	}
-
-	public JundPanoramaAbility(final JundPanoramaAbility ability) {
-		super(ability);
-	}
-
-	@Override
-	public JundPanoramaAbility copy() {
-		return new JundPanoramaAbility(this);
-	}
-
-	
-}
\ No newline at end of file