Changing callback function signature

this now rely on master, so master parameter does'nt exist anymore
inside the callback function