work:made edits per Jeremy's instruction