Adding switch for s2s