Updates to scenarios and output