change mappings to be non recursive
updates
update