change some stuffs