Update the TODO list based on demo