Consolidated scenarios

by Baptiste Schoehn