added environment switcher