call callback improvements