merging in Annie edits