incorporating claire's edits