Update to use a single callback.