Made several changes.
Commit after merge conflict