gateway changes for callbacks