Updated callbacks to use .call()