Added some custom changes from an old repo.