Improvements to scenario