changed all bare maps to nonrecursive version