Refactorization Complete MF!