Do upgrade first