added check for callbacks..