diff --git a/res/cardsfolder/fledgling_djinn.txt b/res/cardsfolder/fledgling_djinn.txt
index 24d6878ae74..7290ff0daf3 100644
--- a/res/cardsfolder/fledgling_djinn.txt
+++ b/res/cardsfolder/fledgling_djinn.txt
@@ -1,9 +1,11 @@
 Name:Fledgling Djinn
 ManaCost:1 B
 Types:Creature Djinn
-Text:At the beginning of your upkeep, Fledgling Djinn deals 1 damage to you.
+Text:no text
 PT:2/2
 K:Flying
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals 1 damage to you.
+SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Defined$ You | NumDmg$ 1
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/wl/en-us/card4457.jpg
 SetInfo:WTH|Common|http://magiccards.info/scans/en/wl/11.jpg
diff --git a/res/cardsfolder/juzam_djinn.txt b/res/cardsfolder/juzam_djinn.txt
index 0e86a3f8aac..0b9fcef1ea3 100644
--- a/res/cardsfolder/juzam_djinn.txt
+++ b/res/cardsfolder/juzam_djinn.txt
@@ -1,8 +1,10 @@
 Name:Juzam Djinn
 ManaCost:2 B B
 Types:Creature Djinn
-Text:At the beginning of your upkeep, Juzam Djinn deals 1 damage to you.
+Text:no text
 PT:5/5
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals 1 damage to you.
+SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Defined$ You | NumDmg$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/an/en-us/card922.jpg
 SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/9.jpg
diff --git a/res/cardsfolder/nettletooth_djinn.txt b/res/cardsfolder/nettletooth_djinn.txt
index 966cbc56aae..bcea29e833a 100644
--- a/res/cardsfolder/nettletooth_djinn.txt
+++ b/res/cardsfolder/nettletooth_djinn.txt
@@ -1,8 +1,10 @@
 Name:Nettletooth Djinn
 ManaCost:3 G
 Types:Creature Djinn
-Text:At the beginning of your upkeep, Nettletooth Djinn deals 1 damage to you.
+Text:no text
 PT:4/4
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals 1 damage to you.
+SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Defined$ You | NumDmg$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nettletooth_djinn.jpg
 SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/130.jpg
diff --git a/res/cardsfolder/serendib_efreet.txt b/res/cardsfolder/serendib_efreet.txt
index 6a55dd1dcc0..034db82c604 100644
--- a/res/cardsfolder/serendib_efreet.txt
+++ b/res/cardsfolder/serendib_efreet.txt
@@ -1,9 +1,11 @@
 Name:Serendib Efreet
 ManaCost:2 U
 Types:Creature Efreet
-Text:At the beginning of your upkeep, Serendib Efreet deals 1 damage to you.
+Text:no text
 PT:3/4
 K:Flying
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals 1 damage to you.
+SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Defined$ You | NumDmg$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/an/en-us/card939.jpg
 SetInfo:3ED|Rare|http://magiccards.info/scans/en/rv/79.jpg
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index 42d6fabb80b..5835b7a094e 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -93,9 +93,9 @@ public class GameActionUtil {
 		
 		upkeep_Oversold_Cemetery();
 		upkeep_Nether_Spirit();
-		upkeep_Nettletooth_Djinn();
-		upkeep_Fledgling_Djinn();
-		upkeep_Juzam_Djinn();
+		//upkeep_Nettletooth_Djinn();
+		//upkeep_Fledgling_Djinn();
+		//upkeep_Juzam_Djinn();
 		upkeep_Grinning_Demon();
 		upkeep_Moroii();
 		upkeep_Vampire_Lacerator();
@@ -8929,7 +8929,8 @@ public class GameActionUtil {
 			AllZone.Stack.add(ability);
 		}// for
 	}// upkeep_Dragon_Broodmother()
-
+	
+	/*
 	private static void upkeep_Serendib_Efreet() {
 		final Player player = AllZone.Phase.getPlayerTurn();
 		PlayerZone playZone = AllZone.getZone(Constant.Zone.Battlefield, player);
@@ -8954,7 +8955,7 @@ public class GameActionUtil {
 			AllZone.Stack.add(ability);
 		}// for
 	}// upkeep_Serendib_Efreet()
-
+	
 	private static void upkeep_Nettletooth_Djinn() {
 		final Player player = AllZone.Phase.getPlayerTurn();
 		PlayerZone playZone = AllZone.getZone(Constant.Zone.Battlefield, player);
@@ -8979,6 +8980,7 @@ public class GameActionUtil {
 			AllZone.Stack.add(ability);
 		}// for
 	}// upkeep_Nettletooth_Djinn()
+	*/
 	
 	private static void draw_Howling_Mine(Player player) {
 		CardList list = AllZoneUtil.getCardsInPlay("Howling Mine");
@@ -9522,7 +9524,8 @@ public class GameActionUtil {
 			}
 		}// for
 	}// upkeep_Grinning_Demon()
-
+	
+	/*
 	private static void upkeep_Juzam_Djinn() {
 		final Player player = AllZone.Phase.getPlayerTurn();
 		CardList list = AllZoneUtil.getPlayerCardsInPlay(player, "Juzam Djinn");
@@ -9569,6 +9572,7 @@ public class GameActionUtil {
 			AllZone.Stack.add(ability);
 		}// for
 	}// upkeep_Fledgling_Djinn()
+	*/
 	
     private static void upkeep_Creakwood_Liege() {
         final Player player = AllZone.Phase.getPlayerTurn();