change some things and structures