diff --git a/daily-todo.py b/daily-todo.py
index 0c661d6..efb7239 100644
--- a/daily-todo.py
+++ b/daily-todo.py
@@ -93,10 +93,7 @@ with DAVClient(
         task.expand_rrule(yesterday, next_week)
         due = coerce_date(due)
 
-        try:
-            start = coerce_date(task.icalendar_component.get("dtstart").dt or yesterday)
-        except:
-            start = yesterday
+        start = coerce_date(task.icalendar_component.get("dtstart").dt or yesterday)
 
         if today < start:
             continue
@@ -121,15 +118,28 @@ with DAVClient(
         else:
             scheduled.append(event)
 
-    should_want = shuffle_with_priority(should_do) + shuffle_with_priority(want_to_do)
+    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
 
     categories = {
         "Must do": must_do,
-        "Should do": should_want[:3],
-        "Want to do": should_want[3:6],
+        "Should do": should_do[:3],
+        "Want to do": want_to_do[:3],
     }
-    if len(should_want) > 6:
-        categories["Leftover"] = sould_want[7:]
 
 with p:
     log.debug("Printing output")