control stuff
merge changes