changed stuff
merge