Take in Andrew's pull request November week 1