incorporating claire's text edits