Additional changes

* Update brand new file with more edits.