diff --git a/Qwirkle/QwirkleClassLibrary/Game.cs b/Qwirkle/QwirkleClassLibrary/Game.cs
index 412b2b0..21aa5ca 100644
--- a/Qwirkle/QwirkleClassLibrary/Game.cs
+++ b/Qwirkle/QwirkleClassLibrary/Game.cs
@@ -129,28 +129,27 @@ namespace QwirkleClassLibrary
             }
         }
         
-        public bool SwapTiles(Player player)
+        public bool DrawTiles(Player player)
         {
-            if (bag.TilesBag.Count < 6)
+            while(player.Tiles.Count < 6)
             {
-                return false;
-            }
-
-            for (int i = 0; i < player.Tiles.Count; i++)
-            {
-                Random random = new Random();
-                int val = random.Next(0, bag.TilesBag.Count);
+                if (bag.TilesBag.Count == 0)
+                {
+                    return false;
+                }
 
+                int val = RandomNumberGenerator.GetInt32(0, bag.TilesBag.Count);
+                
                 player.AddTileToPlayer(bag.TilesBag[val]);
                 bag.RemoveTileInBag(bag.TilesBag[val]);
             }
-
+            
             return true;
         }
-
-        public bool DrawTile(Player player)
+        
+        public bool SwapTiles(Player player)
         {
-            return true;
+            return false;
         }
     }
 }
\ No newline at end of file
diff --git a/Qwirkle/QwirkleClassLibrary/IPlayer.cs b/Qwirkle/QwirkleClassLibrary/IPlayer.cs
index 0dd494a..48eac76 100644
--- a/Qwirkle/QwirkleClassLibrary/IPlayer.cs
+++ b/Qwirkle/QwirkleClassLibrary/IPlayer.cs
@@ -8,7 +8,7 @@ public interface IPlayer
     
     public bool PlaceTile(Player player, Tile tile, int x, int y);
     
+    public bool DrawTiles(Player player);
+    
     public bool SwapTiles(Player player);
-
-    public bool DrawTile(Player player);
 }
\ No newline at end of file