It's not directly comparable, however the two year upgrade is what they really want people to do - after all it was pretty definitive that they were degrading experience as a trade off on the battery issue.