Not needed, and causes issues.
Add a more general callback method.
todo