improvements and updates to edit
Merge conflicts