New
#1
I think that's way too long to extend it until. Extending it to 2 years, or possibly 3 years then fair enough, but an extra 10 years just goes against, like you said, phasing XP out altogether.