new version to use mappingtools library