improve scenario launch