update simulated map, align map with simulated map
Merge branch 'andrew' into UI