diff --git a/solver.py b/solver.py
index f171e09..bf078a0 100644
--- a/solver.py
+++ b/solver.py
@@ -18,7 +18,7 @@ while True:
                 nocontain.append(i[1])
                 print("\033[47;97m {} ".format(i[1]), end="")
             elif i[0] == "y":
-                contains.append(i[1])
+                contains.append((i[1], count))
                 print("\033[103;97m {} ".format(i[1]), end="")
             elif i[0] == "g":
                 defcontains.append((i[1], count))
@@ -37,17 +37,21 @@ while True:
                     req = [item[0] for item in defcontains if item[1] == counter][0]
                 except:
                     req = None
+                nothere = [item[0] for item in contains if item[1] == counter]
                 if req != None:
                     if req == j:
                         counter += 1
                         continue
                     else:
                         status = 0
+                for k in nothere:
+                    if k == j:
+                        status = 0
                 if j in nocontain:
                     status = 0
                 counter += 1
             for j in contains:
-                if not j in i:
+                if not j[0] in i:
                     status = 0
             if status == 1:
                 buf.append(i)