added extra_optional_leaves