Tweaked so that the script can pick up overrides from the environment