Use factorized step in the MAT scenario as well.