Scenario overhaul