Callback refactor
Callback refactor