Changes from Sam's repo.