changing to env vars