Todo list revised ...