Daniel Arlitt's pull request