Now using environment variables