Similar changes to scenario_2