adding edits from analysis machine
merging