updated per Allison comments