TODO and Text changes