Adjusted calculations on scenario simulation to the new structure.