diff --git a/generate.py b/generate.py
index bb8c4d2..06e34bb 100644
--- a/generate.py
+++ b/generate.py
@@ -872,11 +872,33 @@ def history():
         eachdate = enddate
         while eachdate >= startdate:
             for game in games:
-                if game["initialdate"] == eachdate:
-                    yearlist.append({"date":eachdate,"name":game["name"],"console":game["console"],"action":"Added"})
                 try:
                     if game["firstplayed"] == eachdate:
-                        yearlist.append({"date":eachdate,"name":game["name"],"console":game["console"],"action":"Started"})
+                        try:
+                            if game["beat"] != eachdate:
+                                yearlist.append({"date":eachdate,"name":game["name"],"console":game["console"],"action":"Started"})
+                        except:
+                            try:
+                                if game["completed"] != eachdate:
+                                    yearlist.append({"date":eachdate,"name":game["name"],"console":game["console"],"action":"Started"})
+                            except:
+                                yearlist.append({"date":eachdate,"name":game["name"],"console":game["console"],"action":"Started"})
+                except:
+                    pass
+                if game["initialdate"] == eachdate:
+                    try:
+                        if game["beat"] != eachdate:
+                            yearlist.append({"date":eachdate,"name":game["name"],"console":game["console"],"action":"Added"})
+                    except:
+                        try:
+                            if game["completed"] != eachdate:
+                                yearlist.append({"date":eachdate,"name":game["name"],"console":game["console"],"action":"Added"})
+                        except:
+                            yearlist.append({"date":eachdate,"name":game["name"],"console":game["console"],"action":"Added"})
+                try:
+                    if game["gameplay"] == eachdate:
+                        if game["firstplayed"] != eachdate:
+                            yearlist.append({"date":eachdate,"name":game["name"],"console":game["console"],"action":"Playing"})
                 except:
                     pass
                 try: