Update from osm_demo