Modified some things.
Fixed conflict.