COrrection to get from Env vars rather than props