Second Commit

Change callback type to id