updated for testing / env variables