new version of resolve