Adding Joe's updates to the repo.