Added factorization option