added more upgrade scenarios