some more changes to upgrade scenario