Improved the scenario workings.