Updates to Alex's PR #901