Yes. The longer we put off any sort of fundamental upgrades, the more unlikely an upgrade in the future becomes and the more likely another abandon/remake becomes.