removed rpr; improved the resolve method a little bit. works now but a refactoring is probably wise