don't use options.leaf any more