ucallback cleaned up a bit