Rearranged upgrade order