edits in response to merissa's comments