Switching to ENV variables