Refactored RDFVP (without norming)