Better handling of changes.