Updated TODO
Edited description