Wrote some changes.
merge