change some stuff
merge