added more ENV variables