Removed requirement for a callback