Callback restructuring.