minor logical restructuring of scenarios