Revised TODO list (fixed conflict)