move to new resolver