Redid #90, since scenarios were badly covered.