Minor Callback code added