added saving of content_diff
refactoring
refactoring