updated maps and entities
merge