ajout improvements and modif scenario