diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java
index d33e09c49..59de8a366 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java
@@ -28,8 +28,9 @@ import java.util.List;
  */
 public class Card31_023 extends AbstractMinion {
     public Card31_023() {
-        super(4, 9, 3, 3, Race.ORC, Culture.GUNDABAD, "Azog", "The Defiler", true);
+        super(4, 9, 3, 3, Race.ORC, Culture.SMAUG, "Azog", "The Defiler", true);
         addKeyword(Keyword.DAMAGE, 1);
+		addKeyword(Keyword.WARG_RIDER);
     }
 
     @Override
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_024.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_024.java
index 8d9be2ecd..c839f9183 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_024.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_024.java
@@ -30,8 +30,9 @@ import java.util.List;
  */
 public class Card31_024 extends AbstractMinion {
     public Card31_024() {
-        super(4, 9, 3, 3, null, Culture.GUNDABAD, "Bolg", "Son of Azog", true);
+        super(4, 9, 3, 3, null, Culture.SMAUG, "Bolg", "Son of Azog", true);
 		addKeyword(Keyword.DAMAGE, 1);
+		addKeyword(Keyword.WARG_RIDER);
     }
 
     @Override
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_025.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_025.java
index d5e9064e6..d5f5010c1 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_025.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_025.java
@@ -36,7 +36,7 @@ import java.util.List;
  */
 public class Card31_025 extends AbstractAttachable {
     public Card31_025() {
-        super(Side.SHADOW, CardType.POSSESSION, 3, Culture.GUNDABAD, PossessionClass.MOUNT, "Savage Warg");
+        super(Side.SHADOW, CardType.POSSESSION, 3, Culture.SMAUG, PossessionClass.MOUNT, "Savage Warg");
     }
 
     @Override
@@ -53,7 +53,7 @@ public class Card31_025 extends AbstractAttachable {
 
     @Override
     protected Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) {
-        return Filters.and(Culture.GUNDABAD,Race.ORC);
+        return Race.ORC;
     }
 	
 	
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_026.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_026.java
index ad889bf26..bdef60a4a 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_026.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_026.java
@@ -40,7 +40,7 @@ import java.util.List;
  */
 public class Card31_026 extends AbstractAttachable {
     public Card31_026() {
-        super(Side.SHADOW, CardType.POSSESSION, 4, Culture.GUNDABAD, PossessionClass.MOUNT, "Threatening Warg");
+        super(Side.SHADOW, CardType.POSSESSION, 4, Culture.SMAUG, PossessionClass.MOUNT, "Threatening Warg");
     }
 
     @Override
@@ -57,7 +57,7 @@ public class Card31_026 extends AbstractAttachable {
 
     @Override
     protected Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) {
-        return Filters.and(Culture.GUNDABAD,Race.ORC);
+        return Keyword.WARG_RIDER;
     }
 	
 	@Override
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java
index cf57fe66d..f5104a9c9 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java
@@ -36,7 +36,7 @@ import java.util.List;
  */
 public class Card31_027 extends AbstractAttachable {
     public Card31_027() {
-        super(Side.SHADOW, CardType.POSSESSION, 2, Culture.GUNDABAD, PossessionClass.MOUNT, "Warg");
+        super(Side.SHADOW, CardType.POSSESSION, 2, Culture.SMAUG, PossessionClass.MOUNT, "Warg");
     }
 
     @Override
@@ -53,7 +53,7 @@ public class Card31_027 extends AbstractAttachable {
 
     @Override
     protected Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) {
-        return Filters.and(Culture.GUNDABAD,Race.ORC);
+        return Keyword.WARG_RIDER);
     }
 	
 	@Override
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_028.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_028.java
index e675adc21..a8410abb1 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_028.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_028.java
@@ -36,7 +36,7 @@ import java.util.List;
  */
 public class Card31_028 extends AbstractAttachable {
     public Card31_028() {
-        super(Side.SHADOW, CardType.POSSESSION, 3, Culture.ISENGARD, PossessionClass.MOUNT, "War-warg");
+        super(Side.SHADOW, CardType.POSSESSION, 3, Culture.SMAUG, PossessionClass.MOUNT, "War-warg");
     }
 
     @Override
@@ -53,7 +53,7 @@ public class Card31_028 extends AbstractAttachable {
 
     @Override
     protected Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) {
-        return Filters.and(Culture.GUNDABAD,Race.ORC);
+        return Keyword.WARG_RIDER;
     }
 	
 	@Override