change to non-recursive mappings