Working on #599 Split upgrade routine