changed environment variable / parameter handling