New callback parameters, and less miscalls