Finished with the revision of the OSM part