Lots of updates to scenarios