Adding switch to SCenario 1