After some thought, maybe we should move this inside of the callback itself.