[Resolver] .
[Resolver] Implemented improved IFTI feature; Now fixing regressions