change some name and add comment