added charts/maps
merge