TODO list got shorter