Update from osm_demo
Update from osm_msos