changes from edits branch applied