diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 190ded580..5539f7294 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -149,6 +149,16 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Ogre Marauder
+text=Whenever Ogre Marauder attacks, it gains "Ogre Marauder can't be blocked" until end of turn unless defending player sacrifices a creature.
+auto=@combat(attacking) source(this):ability$!name(choose one) if type(creature|mybattlefield)~morethan~0 then choice sacrifice notatarget(creature|mybattlefield) _ choice all(mystored) unblockable ueot!$ opponent
+mana={1}{B}{B}
+type=Creature
+subtype=Ogre Warrior
+power=3
+toughness=1
+[/card]
+[card]
 name=Rakdos Augermage
 abilities=first strike
 auto={T}:name(target opponent) target(opponent) donothing && all(this) transforms((,newability[ability$!name(discard) reject notatarget(*|opponenthand)!$ targetedplayer && ability$!name(discard) reject notatarget(*|opponenthand)!$ controller])) assorcery
diff --git a/projects/mtg/bin/Res/sets/primitives/crappy.txt b/projects/mtg/bin/Res/sets/primitives/crappy.txt
index 3cc2b8fd7..a77944e6d 100644
--- a/projects/mtg/bin/Res/sets/primitives/crappy.txt
+++ b/projects/mtg/bin/Res/sets/primitives/crappy.txt
@@ -1,4 +1,23 @@
 grade=crappy
+##the damage source is unknown but it deals 4 damage
+[card]
+name=Barbarian Bully
+text=Discard a card at random: Barbarian Bully gets +2/+2 until end of turn unless a player has Barbarian Bully deal 4 damage to him or her. Activate this ability only once each turn.
+auto={D}:name(Discard at random) ability$!name(choose one) choice damage:4 controller _ choice all(mystored) 2/2 ueot!$ opponent limit:1
+mana={2}{R}
+type=Creature
+subtype=Human Barbarian
+power=2
+toughness=2
+[/card]
+[card]
+name=Skullscorch
+target=player
+auto=ability$!name(choose one) choice damage:4 controller _ choice discard:2 controller!$ targetedplayer
+text=Target player discards two cards at random unless that player has Skullscorch deal 4 damage to him or her.
+mana={R}{R}
+type=Sorcery
+[/card]
 ##the following are not added becuase they are not choosen discard.
 [card]
 name=Gerrard's Verdict
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 231074c55..f3d980ff7 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -72125,6 +72125,16 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Saprazzan Breaker
+auto={U}:name(deplete) all(this) transforms((,newability[@movedto(land|mygraveyard) from(mylibrary) once:unblockable],newability[deplete:1 controller]))
+text={U}: Put the top card of your library into your graveyard. If that card is a land card, Saprazzan Breaker is unblockable this turn.
+mana={4}{U}
+type=Creature
+subtype=Beast
+power=3
+toughness=3
+[/card]
+[card]
 name=Saprazzan Cove
 auto=tap
 auto={T}:counter(0/0,1,Storage)
@@ -72437,6 +72447,17 @@ mana={1}{U}{U}
 type=Sorcery
 [/card]
 [card]
+name=Savra, Queen of the Golgari
+auto=@sacrificed(creature[black]|mybattlefield):may life:-2 && ability$!sacrifice notatarget(creature|mybattlefield)!$ opponent
+auto=@sacrificed(creature[green]|mybattlefield):may life:2 controller
+text=Whenever you sacrifice a black creature, you may pay 2 life. If you do, each other player sacrifices a creature. -- Whenever you sacrifice a green creature, you may gain 2 life.
+mana={2}{B}{G}
+type=Legendary Creature
+subtype=Elf Shaman
+power=2
+toughness=2
+[/card]
+[card]
 name=Sawback Manticore
 auto={4}:flying
 auto=this(attacking) {1}:damage:2 target(creature[attacking;blocking]) limit:1
diff --git a/projects/mtg/bin/Res/sets/primitives/unsupported.txt b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
index fe29118f0..6b02104c9 100644
--- a/projects/mtg/bin/Res/sets/primitives/unsupported.txt
+++ b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
@@ -989,15 +989,6 @@ mana={5}{W}
 type=Instant
 [/card]
 [card]
-name=Barbarian Bully
-text=Discard a card at random: Barbarian Bully gets +2/+2 until end of turn unless a player has Barbarian Bully deal 4 damage to him or her. Activate this ability only once each turn.
-mana={2}{R}
-type=Creature
-subtype=Human Barbarian
-power=2
-toughness=2
-[/card]
-[card]
 name=Barbed Lightning
 text=Choose one - Barbed Lightning deals 3 damage to target creature; or Barbed Lightning deals 3 damage to target player. -- Entwine {2} (Choose both if you pay the entwine cost.)
 mana={2}{R}
@@ -11983,15 +11974,6 @@ toughness=4
 text=Whenever Ogre Geargrabber attacks, gain control of target Equipment an opponent controls until end of turn. Attach it to Ogre Geargrabber. When you lose control of that Equipment, unattach it.
 [/card]
 [card]
-name=Ogre Marauder
-text=Whenever Ogre Marauder attacks, it gains "Ogre Marauder can't be blocked" until end of turn unless defending player sacrifices a creature.
-mana={1}{B}{B}
-type=Creature
-subtype=Ogre Warrior
-power=3
-toughness=1
-[/card]
-[card]
 name=Ohran Yeti
 text={2}{S}i}: Target snow creature gains first strike until end of turn. ({S}i} can be paid with one mana from a snow permanent.)
 mana={3}{R}
@@ -15058,8 +15040,13 @@ text={2}, {T}: Target creature gains islandwalk until end of turn. When that cre
 mana={4}
 type=Artifact
 [/card]
+#not working, we cant use if "this(..)" then else
 [card]
 name=Sands of Time
+auto=phasealter(remove,untap,controller)
+auto=phasealter(remove,untap,opponent)
+auto=@each my upkeep:all(*[-enchantment;-planeswalker]|mybattlefield) transforms((,newability[if this(tapped) then untap else tap]))
+auto=@each opponent upkeep:all(*[-enchantment;-planeswalker]|opponentbattlefield) transforms((,newability[if this(tapped) then untap else tap]))
 text=Each player skips his or her untap step. -- At the beginning of each player's upkeep, that player simultaneously untaps each tapped artifact, creature, and land he or she controls and taps each untapped artifact, creature, and land he or she controls.
 mana={4}
 type=Artifact
@@ -15087,15 +15074,6 @@ mana={U}
 type=Instant
 [/card]
 [card]
-name=Saprazzan Breaker
-text={U}: Put the top card of your library into your graveyard. If that card is a land card, Saprazzan Breaker is unblockable this turn.
-mana={4}{U}
-type=Creature
-subtype=Beast
-power=3
-toughness=3
-[/card]
-[card]
 name=Saproling Burst
 text=Fading 7 (This enchantment enters the battlefield with seven fade counters on it. At the beginning of your upkeep, remove a fade counter from it. If you can't, sacrifice it.) -- Remove a fade counter from Saproling Burst: Put a green Saproling creature token onto the battlefield. It has "This creature's power and toughness are each equal to the number of fade counters on Saproling Burst." -- When Saproling Burst leaves the battlefield, destroy all tokens put onto the battlefield with Saproling Burst. They can't be regenerated.
 mana={4}{G}
@@ -15163,15 +15141,6 @@ type=Instant
 text=Choose one Target player gains 2{1/2} life; or prevent the next 2{1/2} damage that would be dealt to target creature this turn. Gotcha Whenever an opponent says "Save" or "Life," you may say "Gotcha" If you do, return Save Life from your graveyard to your hand.
 [/card]
 [card]
-name=Savra, Queen of the Golgari
-text=Whenever you sacrifice a black creature, you may pay 2 life. If you do, each other player sacrifices a creature. -- Whenever you sacrifice a green creature, you may gain 2 life.
-mana={2}{B}{G}
-type=Legendary Creature
-subtype=Elf Shaman
-power=2
-toughness=2
-[/card]
-[card]
 name=Scalpelexis
 text=Flying (This creature can't be blocked except by creatures with flying or reach.) -- Whenever Scalpelexis deals combat damage to a player, that player exiles the top four cards of his or her library. If two or more of those cards have the same name, repeat this process.
 mana={4}{U}
@@ -16229,12 +16198,6 @@ toughness=1
 text=Haste Whenever Skullbriar, the Walking Grave deals combat damage to a player, put a +1/+1 counter on it. Counters remain on Skullbriar as it moves to any zone other than a player's hand or library.
 [/card]
 [card]
-name=Skullscorch
-text=Target player discards two cards at random unless that player has Skullscorch deal 4 damage to him or her.
-mana={R}{R}
-type=Sorcery
-[/card]
-[card]
 name=Skyship Weatherlight
 text=When Skyship Weatherlight enters the battlefield, search your library for any number of artifact and/or creature cards and exile them. Then shuffle your library. -- {4}, {T}: Choose a card at random that was exiled with Skyship Weatherlight. Put that card into its owner's hand.
 mana={4}
diff --git a/projects/mtg/bin/Res/test/Mortician_Beetle.txt b/projects/mtg/bin/Res/test/Mortician_Beetle.txt
new file mode 100644
index 000000000..9cc72d812
--- /dev/null
+++ b/projects/mtg/bin/Res/test/Mortician_Beetle.txt
@@ -0,0 +1,29 @@
+#Testing Mortician Beetle vs Phyrexian Denouncer
+[INIT]
+combatattackers
+[PLAYER1]
+inplay:209108
+life:20
+[PLAYER2]
+inplay:209126
+life:20
+[DO]
+209108
+next
+209126
+choice 1
+209108
+next
+choice 0
+next
+next
+eot
+[ASSERT]
+untap
+[PLAYER1]
+inplay:209108
+life:20
+[PLAYER2]
+graveyard:209126
+life:19
+[END]
diff --git a/projects/mtg/bin/Res/test/Savra_Queen_of_the_Golgari.txt b/projects/mtg/bin/Res/test/Savra_Queen_of_the_Golgari.txt
new file mode 100644
index 000000000..1ea05e352
--- /dev/null
+++ b/projects/mtg/bin/Res/test/Savra_Queen_of_the_Golgari.txt
@@ -0,0 +1,28 @@
+#Testing Savra, Queen of the Golgari vs Thraximundar
+[INIT]
+combatattackers
+[PLAYER1]
+inplay:180595
+life:20
+[PLAYER2]
+inplay:89113
+life:20
+[DO]
+180595
+next
+choice 0
+89113
+choice 0
+choice 0
+choice 0
+180595
+eot
+[ASSERT]
+untap
+[PLAYER1]
+graveyard:180595
+life:20
+[PLAYER2]
+graveyard:89113
+life:20
+[END]
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 22c18bfba..257c3e339 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -468,6 +468,7 @@ Morph#2.txt
 Morph#3.txt
 Morph#4.txt
 Morph#5.txt
+Mortician_Beetle.txt
 mortuary.txt
 Multicolor.txt
 nantuko_husk.txt
@@ -560,6 +561,7 @@ sacred_foundry_i275.txt
 safehold_duo.txt
 safe passage.txt
 samite_healer.txt
+Savra_Queen_of_the_Golgari.txt
 scourge_of_kher_ridges.txt
 scourge_of_kher_ridges2.txt
 scourglass.txt