Beta test of using switch for sessions