Changes to PR #531 as discussed on yesterday's call