added stuff
merge conflicts solved