changes for callbacks