- small refactor improves performance 2x
reinstate callback