updated to not depend on environment variables