Factorization performance improved