TO AMEND
Work on the architecture of Scenario