Making changes.

I forgot to create the PR before committing to master. Need to do that.