fixed callback support
fixed merge conflicts