Added attempt at adding the ability to callback