updated TODO and comment