Updated the update callback
Updated the avatar callback