added other stuff
merge