Factorization Update

Added: Factorization
Updated: Enderio, MFR