Updated ToDo and text (no functional change)