Edit - safe-buffer