Propagated the callback-split some further