Seven-times world champion Lewis Hamilton said on Thursday that he planned to be in Formula One next season, was enjoying this year's title battle and had already been laying the groundwork for 2022.
The 36-year-old, who is out of contract with Mercedes at the end of this year, tested Pirelli's 18-inch 2022 tyre compounds at Imola this month.
Never a big fan of testing, the British driver told reporters ahead of the Portuguese Grand Prix that for once he had volunteered to take part.
"I plan to be here next year, and I want to help Pirelli ... move forward and having a better product," Hamilton said.
"The drivers, all of us, have wished for more performance tyres, and so it was important for me to gauge where the starting point is and what differences [there are] ... so that from a driver's point of view we have more mechanical grip in our tyres.
"I think it was a good test and obviously the first step with the tyres."
Pressed on his plans, Hamilton recognised he was "pretty spontaneous," so they could change, but said he was relishing the battle this season.
The 2020 champion is a point clear of Red Bull's Max Verstappen after two races with the young Dutch driver now a real contender, and possibly even the favourite, for the championship.
"I am enjoying this battle we are having. It is getting more exciting. It has been even more of a challenge," said Hamilton, the sport's only Black driver, who has been outspoken in using his platform to push for racial equality and opportunity.
"I continue to love working with this team, and it's encouraging to see the steps that my team are really making towards becoming more inclusive and more diverse.
"We still have a lot of work to do as a sport. ... I know that being here I have more of a chance of helping change that than not. I don't know how long I will stay, though; we'll see."