Added dummy to handle recurrence, and fix "done".