diff --git a/Qwirkle/QwirkleClassLibrary/Tiles/TileBag.cs b/Qwirkle/QwirkleClassLibrary/Tiles/TileBag.cs
index e616b4e..fc6381a 100644
--- a/Qwirkle/QwirkleClassLibrary/Tiles/TileBag.cs
+++ b/Qwirkle/QwirkleClassLibrary/Tiles/TileBag.cs
@@ -29,31 +29,17 @@ namespace QwirkleClassLibrary.Tiles
                 throw new ArgumentException(nbSet.ToString());
             }
 
-            // for (int i = 0; i < nbSet; i++)
-            // {
-            //     foreach (Shape s in Enum.GetValues(typeof(Shape)))
-            //     {
-            //         foreach (Color c in Enum.GetValues(typeof(Color)))
-            //         {
-            //             Tile t = new Tile(s, c);
-            //             tiles.Add(t);
-            //         }
-            //     }
-            // }
-            
-            tiles.Add(new Tile(Shape.Round, Color.Red));
-            tiles.Add(new Tile(Shape.Round, Color.Orange));
-            tiles.Add(new Tile(Shape.Round, Color.Yellow));
-            tiles.Add(new Tile(Shape.Round, Color.Green));
-            tiles.Add(new Tile(Shape.Round, Color.Blue));
-            tiles.Add(new Tile(Shape.Round, Color.Purple));
-            
-            tiles.Add(new Tile(Shape.Square, Color.Red));
-            tiles.Add(new Tile(Shape.Square, Color.Orange));
-            tiles.Add(new Tile(Shape.Square, Color.Yellow));
-            tiles.Add(new Tile(Shape.Square, Color.Green));
-            tiles.Add(new Tile(Shape.Square, Color.Blue));
-            tiles.Add(new Tile(Shape.Square, Color.Purple));
+            for (int i = 0; i < nbSet; i++)
+            {
+                foreach (Shape s in Enum.GetValues(typeof(Shape)))
+                {
+                    foreach (Color c in Enum.GetValues(typeof(Color)))
+                    {
+                        Tile t = new Tile(s, c);
+                        tiles.Add(t);
+                    }
+                }
+            }
             
             Init();
         }