Scenarios

refactoring of scenarios