TODOS geupdated