added stuff
merge