updated todo, please read