Improvments to the change event