More changes to enviornment variable based parameter switching