More changes to enviornment parameter swithcing