Adding a few more changes to this.