feat(uti): re-work the callbacks