TODO and DONE updated