Fixing the callback issues....