Zach's edits