Change to fewer scenarios