Changes in the callback functions