resolver rewritten to use shrinkwrap