updated with Erica's edits