Update following @annashipman comments