merge with amy's edits a bit