stuff
merge
added options