diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp
index 2da418a94..7db789360 100644
--- a/projects/mtg/src/MTGGameZones.cpp
+++ b/projects/mtg/src/MTGGameZones.cpp
@@ -128,6 +128,7 @@ void MTGPlayerCards::OptimizedHand(Player * who,int amount, int lands, int creat
         Player * p = dynamic_cast<Player*>(who);
         MTGCardInstance * card = NULL;
         MTGGameZone * z = p->game->library;
+        z->shuffle();
 
         int optimizedland = 0;
         int optimizedothercards = 0;
diff --git a/projects/mtg/src/Rules.cpp b/projects/mtg/src/Rules.cpp
index 106e6188b..9d7ed8ae9 100644
--- a/projects/mtg/src/Rules.cpp
+++ b/projects/mtg/src/Rules.cpp
@@ -178,10 +178,7 @@ void Rules::addExtraRules(GameObserver* g)
                 a->canBeInterrupted = false;
                 if (a->oneShot)
                 {
-
-                    if (a->aType == MTGAbility::STANDARD_DRAW && difficultyRating == HARD)
-                        a->resolve();
-                    else if (a->aType != MTGAbility::STANDARD_DRAW)
+                    if (a->aType != MTGAbility::STANDARD_DRAW)
                         a->resolve();
                     else if (p->isAI() && (p->playMode == Player::MODE_AI && p->opponent()->playMode== Player::MODE_AI))
                     {
@@ -211,7 +208,11 @@ void Rules::addExtraRules(GameObserver* g)
                         }
                         else if (difficultyRating == NORMAL)
                         {
-                            hand->OptimizedHand(p,handsize, 1, 0, 2);//give the Ai deck a tiny boost by giving it 1 land and 2 spells under 3 manacost.
+                            hand->OptimizedHand(p,handsize, 2, 0, 2);//give the Ai deck a tiny boost by giving it 1 land and 2 spells under 3 manacost.
+                        }
+                        else if (difficultyRating == HARD)
+                        {
+                            hand->OptimizedHand(p,handsize, 2, 0, 0);//give the Ai deck a tiny boost by giving it 1 land and 2 spells under 3 manacost.
                         }
                         else
                         {