Upgrade refactoring, CURRENTLY BROKEN