More updates for getting callback code working 2