partial revision - starting with OSM - pt