Incorporate feedback from @juliemr