better integrating Emily's changes