First changes to support unsaved changes.