changed to env variables