zoom edits
merged