Pull request to merge in Dan's changes