Corrected TODO list