Modified stuff.
Fixed conflicts.