change some TODO