changed keys to env vars