minor changes to callback, merge