Added callback, upgraded to 1.0