fixing all the callbacks for true streaming