updated with some more.
merge conflict