Additions and tweaks to scenarios