[#66300368] updated with feedback from Sarah