Adding switch next