change some codes2