fixing callbacks
improvement on tracker