started modifying callback structure
this affects issue #17