Callbacks working and fixing tracking issue