Using env variables now