Updated after feedback on PR.