upgraded operation of RDF, need to speed this up