Several changes to reduce the number of change events