diff --git a/uno.py b/uno.py
index 331fd87ede992296ca6b3e3898818dc42d203f9f..30d7b8c9c8779d49c8d6ec76c37c276b8bd761f8 100644
--- a/uno.py
+++ b/uno.py
@@ -58,17 +58,18 @@ if not DEBUG:
 
 #cards
 
-for color in COLORS:
-    for n in range(0, 20):
-        CARDS.append((str(n % 10), color))
-    for n in range(0, 2):
-        CARDS.append(("+2", color))
-    CARDS.append(["C", "NEUTRAL"])
-    CARDS.append(["+4", "NEUTRAL"])
-    CARDS.append(("R", color))
-    for n in range(0, 2):
-        CARDS.append(("X", color))
-    CARDS.append(("Marvin", color))
+for i in range(0, 64):
+    for color in COLORS:
+        for n in range(0, 20):
+            CARDS.append((str(n % 10), color))
+        for n in range(0, 2):
+            CARDS.append(("+2", color))
+        CARDS.append(["C", "NEUTRAL"])
+        CARDS.append(["+4", "NEUTRAL"])
+        CARDS.append(("R", color))
+        for n in range(0, 2):
+            CARDS.append(("X", color))
+        CARDS.append(("Marvin", color))
 #players
 p = input("Player: ")
 while p != "":
@@ -77,7 +78,7 @@ while p != "":
 #get cards
 random.seed(int(hashlib.md5(input("Enter something: ").encode()).hexdigest(), 16))
 random.shuffle(CARDS)
-#random.shuffle(PLAYERS)
+random.shuffle(PLAYERS)
 
 PCARDS = {}
 
@@ -107,8 +108,8 @@ while len(PLAYERS) > 1:
             continue
         os.system("clear")
         print_stack()
-        for player in PLAYERS:
-            if len(PCARDS[player]) == 1:
+        for player_ in PLAYERS:
+            if len(PCARDS[player_]) == 1 and player_ != player:
                 print(CLEAR + "{} hat UNO!".format(player))
         input(CLEAR + player + " ist dran. Gib das Handy weiter und drücke Enter")
         print("0) Eine Karte ziehen")