Before Refactoring
Refactor Resolve