Adding switch to