Upgrade functionality restored, still needs polish.