distance map
merge latest changes