partial resolution refactor