integrated new callback system fixes#13