Callbacks now called once per token