added more scenarios for upgrade