Removed hardcoded callback