diff --git a/daily-todo.py b/daily-todo.py
index 7ab8dc2..0c661d6 100644
--- a/daily-todo.py
+++ b/daily-todo.py
@@ -121,28 +121,15 @@ with DAVClient(
         else:
             scheduled.append(event)
 
-    should_do = shuffle_with_priority(should_do)
-    want_to_do = shuffle_with_priority(want_to_do)
-
-    while len(must_do) < 2:
-        if should_do:
-            must_do.append(should_do.pop(0))
-        elif want_to_do:
-            must_do.append(want_to_do.pop(0))
-        else:
-            break  # No remaining tasks
-
-    while len(should_do) < 3:
-        if want_to_do:
-            should_do.append(want_to_do.pop(0))
-        else:
-            break  # No remaining tasks
+    should_want = shuffle_with_priority(should_do) + shuffle_with_priority(want_to_do)
 
     categories = {
         "Must do": must_do,
-        "Should do": should_do[:3],
-        "Want to do": want_to_do[:3],
+        "Should do": should_want[:3],
+        "Want to do": should_want[3:6],
     }
+    if len(should_want) > 6:
+        categories["Leftover"] = sould_want[7:]
 
 with p:
     log.debug("Printing output")