more scenario upgrades, fixed import error