integrating Emily's comments