merging my edits with Sarah's files