new exceptions and new edits