Why have you changed away from instance variables?  This used to be stored in `@scenario` so we wouldn't have to save it off and pass it back in.