erics commit

pull request brianscommit