Better control of the scenarios