Updated files per requested PR changes.