Updating TODO list with some suggestions