Both. I was referring to the final chapters before Naruto becomes Hokage.