ENVVAR tweaks maybe?